Eliminate VuFindPluginInitializer. (#1069)

- Implementing a setPluginManager method no longer triggers auto-injection.
vufind-org · Nov 1, 2017 · 26ba981 · 26ba981
1 parent 3b5edef
commit 26ba981
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 62 deletions.
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
@@ -304,14 +304,14 @@
                     'choiceauth' => 'VuFind\Auth\Factory::getChoiceAuth',
                     'facebook' => 'VuFind\Auth\Factory::getFacebook',
                     'ils' => 'VuFind\Auth\Factory::getILS',
+                    'multiauth' => 'VuFind\Auth\Factory::getMultiAuth',
                     'multiils' => 'VuFind\Auth\Factory::getMultiILS',
                     'shibboleth' => 'VuFind\Auth\Factory::getShibboleth'
                 ],
                 'invokables' => [
                     'cas' => 'VuFind\Auth\CAS',
                     'database' => 'VuFind\Auth\Database',
                     'ldap' => 'VuFind\Auth\LDAP',
-                    'multiauth' => 'VuFind\Auth\MultiAuth',
                     'sip2' => 'VuFind\Auth\SIP2',
                 ],
                 'aliases' => [

diff --git a/module/VuFind/src/VuFind/Auth/Factory.php b/module/VuFind/src/VuFind/Auth/Factory.php
@@ -54,7 +54,9 @@ public static function getChoiceAuth(ServiceManager $sm)
         $container = new \Zend\Session\Container(
             'ChoiceAuth', $sm->getServiceLocator()->get('VuFind\SessionManager')
         );
-        return new ChoiceAuth($container);
+        $auth = new ChoiceAuth($container);
+        $auth->setPluginManager($sm);
+        return $auth;
     }
 
     /**
@@ -154,6 +156,20 @@ public static function getManager(ServiceManager $sm)
         return $manager;
     }
 
+    /**
+     * Construct the MultiAuth plugin.
+     *
+     * @param ServiceManager $sm Service manager.
+     *
+     * @return MultiAuth
+     */
+    public static function getMultiAuth(ServiceManager $sm)
+    {
+        $auth = new MultiAuth();
+        $auth->setPluginManager($sm);
+        return $auth;
+    }
+
     /**
      * Construct the MultiILS plugin.
      *

diff --git a/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php b/module/VuFind/src/VuFind/ServiceManager/AbstractPluginManager.php
@@ -57,7 +57,7 @@ public function __construct($configOrContainerInstance = null,
     ) {
         parent::__construct($configOrContainerInstance, $v3config);
         $this->addInitializer(
-            'VuFind\ServiceManager\VuFindPluginInitializer', false
+            'VuFind\ServiceManager\ZendPluginInitializer', false
         );
     }
 

diff --git a/module/VuFind/src/VuFind/ServiceManager/VuFindPluginInitializer.php b/module/VuFind/src/VuFind/ServiceManager/VuFindPluginInitializer.php
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php
@@ -53,7 +53,9 @@ public function getAuthObject($config = null)
         if (null === $config) {
             $config = $this->getAuthConfig();
         }
-        $obj = clone $this->getAuthManager()->get('MultiAuth');
+        $manager = $this->getAuthManager();
+        $obj = clone $manager->get('MultiAuth');
+        $obj->setPluginManager($manager);
         $obj->setConfig($config);
         return $obj;
     }