Merge pull request #39 from samsonasik/apply-php80

Apply PHP 8.0 Syntax and constructor promotion
laminas · Oct 28, 2022 · fb0a2c3 · fb0a2c3
2 parents b9f883e + 6f957eb
commit fb0a2c3
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 61 deletions.
diff --git a/src/Listener/LocatorRegistrationListener.php b/src/Listener/LocatorRegistrationListener.php
@@ -57,7 +57,7 @@ public function onLoadModules(ModuleEvent $e)
         $events->attach(
             Application::class,
             ModuleManager::EVENT_BOOTSTRAP,
-            function (MvcEvent $e) use ($moduleManager) {
+            static function (MvcEvent $e) use ($moduleManager): void {
                 $moduleClassName      = $moduleManager::class;
                 $moduleClassNameArray = explode('\\', $moduleClassName);
                 $moduleClassNameAlias = end($moduleClassNameArray);

diff --git a/src/Listener/ServiceListener.php b/src/Listener/ServiceListener.php
@@ -34,13 +34,6 @@ class ServiceListener implements ServiceListenerInterface
     /** @var callable[] */
     protected $listeners = [];
 
-    /**
-     * Default service manager used to fulfill other SMs that need to be lazy loaded
-     *
-     * @var ServiceManager
-     */
-    protected $defaultServiceManager;
-
     /**
      * Default service configuration for the application service manager.
      *
@@ -52,10 +45,13 @@ class ServiceListener implements ServiceListenerInterface
     protected $serviceManagers = [];
 
     /** @param null|array $configuration */
-    public function __construct(ServiceManager $serviceManager, $configuration = null)
-    {
-        $this->defaultServiceManager = $serviceManager;
-
+    public function __construct(
+        /**
+         * Default service manager used to fulfill other SMs that need to be lazy loaded
+         */
+        protected ServiceManager $defaultServiceManager,
+        $configuration = null
+    ) {
         if ($configuration !== null) {
             $this->setDefaultServiceConfig($configuration);
         }

diff --git a/src/ModuleManager.php b/src/ModuleManager.php
@@ -173,9 +173,7 @@ public function loadModule($module)
     protected function loadModuleByName(ModuleEvent $event)
     {
         $event->setName(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE);
-        $result = $this->getEventManager()->triggerEventUntil(function ($r) {
-            return is_object($r);
-        }, $event);
+        $result = $this->getEventManager()->triggerEventUntil(static fn($r): bool => is_object($r), $event);
 
         $module = $result->last();
         if (! is_object($module)) {

diff --git a/test/Listener/LocatorRegistrationListenerTest.php b/test/Listener/LocatorRegistrationListenerTest.php
@@ -109,7 +109,7 @@ public function testModuleClassIsRegisteredWithDiAndInjectedWithSharedInstances(
     {
         $module  = null;
         $locator = $this->serviceManager;
-        $locator->setFactory('Foo\Bar', function ($s) {
+        $locator->setFactory('Foo\Bar', static function ($s): Bar {
             $module  = $s->get(Module::class);
             $manager = $s->get(ModuleManager::class);
             return new Bar($module, $manager);
@@ -118,7 +118,7 @@ public function testModuleClassIsRegisteredWithDiAndInjectedWithSharedInstances(
         $locatorRegistrationListener = new LocatorRegistrationListener();
         $events                      = $this->moduleManager->getEventManager();
         $locatorRegistrationListener->attach($events);
-        $events->attach(ModuleEvent::EVENT_LOAD_MODULE, function (ModuleEvent $e) use (&$module) {
+        $events->attach(ModuleEvent::EVENT_LOAD_MODULE, static function (ModuleEvent $e) use (&$module): void {
             $module = $e->getModule();
         }, -1000);
         $this->moduleManager->loadModules();

diff --git a/test/Listener/ServiceListenerTest.php b/test/Listener/ServiceListenerTest.php
@@ -74,10 +74,10 @@ public function getServiceConfig(): array
         // @codingStandardsIgnoreStart
         return [
             'invokables' => [
-                __CLASS__ => __CLASS__
+                self::class => self::class
             ],
             'factories' => [
-                'foo' => static function () {},
+                'foo' => static function (): void {},
             ],
             'abstract_factories' => [
                 new TestAsset\SampleAbstractFactory(),
@@ -362,9 +362,7 @@ public function testListenerCanOverrideServicesInServiceManagers(): void
     {
         $services = new ServiceManager();
         $services->setService('config', []);
-        $services->setFactory('foo', static function ($services) {
-            return $services;
-        });
+        $services->setFactory('foo', static fn($services) => $services);
         $listener = new ServiceListener($services);
         $listener->addServiceManager(
             $services,
@@ -378,9 +376,7 @@ public function testListenerCanOverrideServicesInServiceManagers(): void
                 'config' => ['foo' => 'bar'],
             ],
             'factories' => [
-                'foo' => static function () {
-                    return new stdClass();
-                },
+                'foo' => static fn(): stdClass => new stdClass(),
             ],
         ]);
 
@@ -422,7 +418,7 @@ public function testOnLoadModulesPostShouldNotRaiseExceptionIfNamedServiceManage
         try {
             $listener->onLoadModulesPost($event);
             self::assertFalse($services->has('UndefinedPluginManager'));
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             self::fail('Exception should not be raised when encountering unknown plugin manager services');
         }
     }

diff --git a/test/Listener/TestAsset/CustomPluginDuckTypeProviderModule.php b/test/Listener/TestAsset/CustomPluginDuckTypeProviderModule.php
@@ -6,13 +6,8 @@
 
 class CustomPluginDuckTypeProviderModule
 {
-    /** @var mixed */
-    public $config;
-
-    /** @param mixed $config */
-    public function __construct($config)
+    public function __construct(public mixed $config)
     {
-        $this->config = $config;
     }
 
     /** @return mixed */

diff --git a/test/Listener/TestAsset/CustomPluginManager.php b/test/Listener/TestAsset/CustomPluginManager.php
@@ -20,8 +20,7 @@ public function validate($plugin): void
         }
     }
 
-    /** @param mixed $plugin */
-    public function validatePlugin($plugin): void
+    public function validatePlugin(mixed $plugin): void
     {
         $this->validate($plugin);
     }

diff --git a/test/Listener/TestAsset/CustomPluginManagerFactory.php b/test/Listener/TestAsset/CustomPluginManagerFactory.php
@@ -36,8 +36,6 @@ public function createService(ServiceLocatorInterface $container)
 
     /**
      * Provide options to use during instantiation (v2).
-     *
-     * @param array $options
      */
     public function setCreationOptions(array $options): void
     {

diff --git a/test/Listener/TestAsset/CustomPluginProviderModule.php b/test/Listener/TestAsset/CustomPluginProviderModule.php
@@ -6,13 +6,8 @@
 
 class CustomPluginProviderModule implements CustomPluginProviderInterface
 {
-    /** @var mixed */
-    public $config;
-
-    /** @param mixed $config */
-    public function __construct($config)
+    public function __construct(public mixed $config)
     {
-        $this->config = $config;
     }
 
     /** @return mixed */

diff --git a/test/Listener/TestAsset/ServiceProviderModule.php b/test/Listener/TestAsset/ServiceProviderModule.php
@@ -6,13 +6,8 @@
 
 class ServiceProviderModule
 {
-    /** @var mixed */
-    public $config;
-
-    /** @param mixed $config */
-    public function __construct($config)
+    public function __construct(public mixed $config)
     {
-        $this->config = $config;
     }
 
     /** @return mixed */

diff --git a/test/Listener/_files/good/merge3.php b/test/Listener/_files/good/merge3.php
@@ -3,7 +3,5 @@
 declare(strict_types=1);
 
 return [
-    'toUpper' => function (string $input) {
-        return strtoupper($input);
-    },
+    'toUpper' => static fn(string $input): string => strtoupper($input),
 ];
diff --git a/test/ModuleManagerTest.php b/test/ModuleManagerTest.php
@@ -164,7 +164,7 @@ public function testModuleIsMarkedAsLoadedWhenLoadModuleEventIsTriggered(): void
         $moduleManager = new ModuleManager(['BarModule'], $this->events);
         $events        = $this->events;
         $this->defaultListeners->attach($events);
-        $events->attach(ModuleEvent::EVENT_LOAD_MODULE, function (ModuleEvent $e) use ($test) {
+        $events->attach(ModuleEvent::EVENT_LOAD_MODULE, static function (ModuleEvent $e) use ($test): void {
             $test->modules = $e->getTarget()->getLoadedModules(false);
         });
 

diff --git a/test/TestAsset/ListenerTestModule/src/Foo/Bar.php b/test/TestAsset/ListenerTestModule/src/Foo/Bar.php
@@ -9,15 +9,7 @@
 
 class Bar
 {
-    /** @var Module */
-    public $module;
-
-    /** @var ModuleManager */
-    public $moduleManager;
-
-    public function __construct(Module $module, ModuleManager $moduleManager)
+    public function __construct(public Module $module, public ModuleManager $moduleManager)
     {
-        $this->module        = $module;
-        $this->moduleManager = $moduleManager;
     }
 }