Skip to content
This repository has been archived by the owner on Feb 6, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/plugin-manager-validation' of https://github.com…
Browse files Browse the repository at this point in the history
…/EvanDotPro/zf2 into hotfix/plugins-should-validate
  • Loading branch information
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/AbstractPluginManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ abstract class AbstractPluginManager extends ServiceManager
public function __construct(ConfigurationInterface $configuration = null)
{
parent::__construct($configuration);
$this->addInitializer(array($this, 'validatePlugin'), true);
$self = $this;
$this->addInitializer(function ($instance) use ($self) {
if ($instance instanceof ServiceManagerAwareInterface) {
Expand Down Expand Up @@ -113,6 +112,7 @@ public function get($name, $options = array(), $usePeeringServiceManagers = true
$this->creationOptions = $options;
$instance = parent::get($name, $usePeeringServiceManagers);
$this->creationOptions = null;
$this->validatePlugin($instance);
return $instance;
}

Expand Down

0 comments on commit 4bd5c7f

Please sign in to comment.