Merge pull request #13 from Saeven/feature/laminas-update

Feature/laminas update
Saeven · Jun 18, 2021 · f50ab04 · f50ab04
2 parents 34ec8ee + 0913be2
commit f50ab04
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/bundle/Spec/CirclicalAutoWire/Controller/ControllerWithParameters.php b/bundle/Spec/CirclicalAutoWire/Controller/ControllerWithParameters.php
@@ -5,8 +5,8 @@
 use Spec\CirclicalAutoWire\Form\DummyForm;
 use Spec\CirclicalAutoWire\Model\DummyObject;
 use Laminas\EventManager\EventManager;
-use Laminas\Form\FormElementManager\FormElementManagerV3Polyfill;
 use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Form\FormElementManager;
 
 /**
  * Class ControllerWithParameters
@@ -18,16 +18,20 @@ class ControllerWithParameters extends AbstractActionController
      * ControllerWithParameters constructor.
      *
      * @param DummyObject                  $dummyObject
-     * @param FormElementManagerV3Polyfill $formManager
+     * @param FormElementManager           $formManager
      * @param DummyForm                    $form               This should invoke the FormElementManager
      * @param array                        $config             This is a magic name that conjures the ZF config
      * @param                              $formElementManager Magic parameter that injects the FormElementManager
-     * @param                              $serviceLocator     Should inject the container (bad, but here by popular demand)
      * @param EventManager                 $eventManager       Should inject an application event manager, lazy shorthand
      */
-    public function __construct(DummyObject $dummyObject, FormElementManagerV3Polyfill $formManager, DummyForm $form, array $config, $formElementManager, $serviceLocator, EventManager $eventManager)
-    {
-
+    public function __construct(
+        DummyObject $dummyObject,
+        FormElementManager $formManager,
+        DummyForm $form,
+        array $config,
+        FormElementManager $formElementManager,
+        EventManager $eventManager
+    ) {
     }
 
 }
diff --git a/bundle/Spec/CirclicalAutoWire/Factory/Controller/ReflectionFactorySpec.php b/bundle/Spec/CirclicalAutoWire/Factory/Controller/ReflectionFactorySpec.php
@@ -10,8 +10,8 @@
 use Spec\CirclicalAutoWire\Form\DummyForm;
 use Spec\CirclicalAutoWire\Model\DummyObject;
 use Laminas\EventManager\EventManager;
-use Laminas\Form\FormElementManager\FormElementManagerV3Polyfill;
 use Laminas\Mvc\Application;
+use Laminas\Form\FormElementManager;
 
 class ReflectionFactorySpec extends ObjectBehavior
 {
@@ -30,8 +30,14 @@ function it_only_creates_controllers(ContainerInterface $interface)
         $this->canCreate($interface, 'SuperFactory')->shouldBe(false);
     }
 
-    function it_can_create_controllers_through_reflection(ContainerInterface $interface, DummyObject $dummyObject, FormElementManagerV3Polyfill $formManager, DummyForm $form, EventManager $eventManager, Application $application)
-    {
+    function it_can_create_controllers_through_reflection(
+        ContainerInterface $interface,
+        DummyObject $dummyObject,
+        FormElementManager $formManager,
+        DummyForm $form,
+        EventManager $eventManager,
+        Application $application
+    ) {
         $formManager->get(DummyForm::class)->willReturn($form);
         $interface->get(DummyObject::class)->willReturn($dummyObject);
         $interface->get('FormElementManager')->willReturn($formManager);

diff --git a/src/CirclicalAutoWire/Factory/Controller/ReflectionFactory.php b/src/CirclicalAutoWire/Factory/Controller/ReflectionFactory.php
@@ -2,10 +2,9 @@
 
 namespace CirclicalAutoWire\Factory\Controller;
 
-use CirclicalAutoWire\Model\ApplicationEventManager;
 use Interop\Container\ContainerInterface;
 use Laminas\EventManager\EventManager;
-use Laminas\Form\FormElementManager\FormElementManagerV3Polyfill;
+use Laminas\Form\FormElementManager;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
 use Laminas\Validator\ValidatorPluginManager;
 
@@ -16,10 +15,10 @@ final class ReflectionFactory implements AbstractFactoryInterface
      * These aliases work to substitute class names with SM types that are buried in ZF.
      * @var array
      */
-    private static $aliases = [
+    private static array $aliases = [
 
         ValidatorPluginManager::class => 'ValidatorManager',
-        FormElementManagerV3Polyfill::class => 'FormElementManager',
+        FormElementManager::class => 'FormElementManager',
 
         /* using strings since they're not required by package composer */
         'ZfcTwig\View\TwigRenderer' => 'TemplateRenderer',
@@ -28,7 +27,7 @@ final class ReflectionFactory implements AbstractFactoryInterface
 
     public function canCreate(ContainerInterface $container, $requestedName)
     {
-        return substr($requestedName, -10) == 'Controller';
+        return substr($requestedName, -10) === 'Controller';
     }
 
     /**
@@ -74,12 +73,6 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
                             echo $exception->getMessage();
                             die(__CLASS__ . " couldn't create an instance of <b>$className</b> to satisfy the constructor for <b>$requestedName</b> at param $parameter.");
                         }
-                    } else {
-                        if ($parameter->getName() === 'formElementManager') {
-                            $parameterInstances[] = $parentLocator->get('FormElementManager');
-                        } elseif ($parameter->getName() === 'serviceLocator') {
-                            $parameterInstances[] = $container;
-                        }
                     }
                 }