Merge pull request #36 from MadCat34/evol/psr4

Evol/psr4

Module.php

@@ -1,116 +1,7 @@
 <?php
-
-declare(strict_types=1);
-
-namespace LmcUser;
-
-use Laminas\Hydrator\ClassMethodsHydrator;
-use Laminas\ModuleManager\Feature\ConfigProviderInterface;
-use Laminas\ModuleManager\Feature\ControllerPluginProviderInterface;
-use Laminas\ModuleManager\Feature\ControllerProviderInterface;
-use Laminas\ModuleManager\Feature\ServiceProviderInterface;
-use Laminas\ModuleManager\Feature\ViewHelperProviderInterface;
-
 /**
- * Class Module
+ * This file is placed here for compatibility with Laminas's ModuleManager.
+ * It allows usage of this module even without composer.
+ * The original Module.php is in 'src/' in order to respect PSR-4
  */
-class Module implements
-    ConfigProviderInterface,
-    ControllerPluginProviderInterface,
-    ControllerProviderInterface,
-    ServiceProviderInterface,
-    ViewHelperProviderInterface
-{
-    public const LMC_USER_SESSION_STORAGE_NAMESPACE = 'LmcUserNamespace';
-
-    /**
-     * {@inheritDoc}
-     * @see \Laminas\ModuleManager\Feature\ConfigProviderInterface::getConfig()
-     */
-    public function getConfig()
-    {
-        return include __DIR__ . '/config/module.config.php';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Laminas\ModuleManager\Feature\ControllerPluginProviderInterface::getControllerPluginConfig()
-     */
-    public function getControllerPluginConfig()
-    {
-        return [
-            'factories' => [
-                'lmcUserAuthentication' => Factory\Controller\Plugin\LmcUserAuthentication::class,
-            ],
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Laminas\ModuleManager\Feature\ControllerProviderInterface::getControllerConfig()
-     */
-    public function getControllerConfig()
-    {
-        return [
-            'factories' => [
-                'lmcuser' => Factory\Controller\UserControllerFactory::class,
-            ],
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Laminas\ModuleManager\Feature\ViewHelperProviderInterface::getViewHelperConfig()
-     */
-    public function getViewHelperConfig()
-    {
-        return [
-            'factories' => [
-                'lmcUserDisplayName' => Factory\View\Helper\LmcUserDisplayName::class,
-                'lmcUserIdentity' => Factory\View\Helper\LmcUserIdentity::class,
-                'lmcUserLoginWidget' => Factory\View\Helper\LmcUserLoginWidget::class,
-            ],
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Laminas\ModuleManager\Feature\ServiceProviderInterface::getServiceConfig()
-     */
-    public function getServiceConfig()
-    {
-        return [
-            'aliases' => [
-                'lmcuser_laminas_db_adapter' => \Laminas\Db\Adapter\Adapter::class,
-                'lmcuser_register_form_hydrator' => 'lmcuser_user_hydrator',
-                'lmcuser_base_hydrator' => 'lmcuser_default_hydrator',
-            ],
-            'invokables' => [
-                'lmcuser_default_hydrator' => ClassMethodsHydrator::class,
-            ],
-            'factories' => [
-                'lmcuser_redirect_callback' => Factory\Controller\RedirectCallbackFactory::class,
-                'lmcuser_module_options' => Factory\Options\ModuleOptions::class,
-                Authentication\Adapter\AdapterChain::class => Authentication\Adapter\AdapterChainServiceFactory::class,
-
-                // We alias this one because it's LmcUser's instance of
-                // Laminas\Authentication\AuthenticationService. We don't want to
-                // hog the FQCN service alias for a Laminas\* class.
-                'lmcuser_auth_service' => Factory\AuthenticationService::class,
-
-                'lmcuser_user_hydrator' => Factory\UserHydrator::class,
-                'lmcuser_user_mapper' => Factory\Mapper\User::class,
-
-                'lmcuser_login_form' => Factory\Form\Login::class,
-                'lmcuser_register_form' => Factory\Form\Register::class,
-                'lmcuser_change_password_form' => Factory\Form\ChangePassword::class,
-                'lmcuser_change_email_form' => Factory\Form\ChangeEmail::class,
-
-                Authentication\Adapter\Db::class => Factory\Authentication\Adapter\DbFactory::class,
-                Authentication\Storage\Db::class => Factory\Authentication\Storage\DbFactory::class,
-
-                'lmcuser_user_service' => Factory\Service\UserFactory::class,
-            ],
-        ];
-    }
-}
+require_once __DIR__ . '/src/Module.php';

composer.json

@@ -56,18 +56,20 @@
         "laminas/laminas-captcha" : "Laminas\\Captcha if you want to use the captcha component"
     },
     "autoload": {
-        "psr-0": {
-            "LmcUser": "src/"
-        },
-        "classmap": [
-            "./Module.php"
-        ]
+        "psr-4": {
+            "LmcUser\\": "src/"
+        }
     },
     "autoload-dev": {
-        "psr-0": {
-            "LmcUserTest": "tests/"
+        "psr-4": {
+            "LmcUserTest\\": "tests/"
         }
     },
+    "extra": {
+        "laminas": {
+            "module": "LmcUser"
+    }
+  },
     "scripts": {
       "check": [
         "@cs-check",

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
+<phpunit bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
@@ -10,7 +10,7 @@
          backupGlobals="false"
 >
     <testsuite name="LmcUser Test Suite">
-        <directory>./tests/LmcUserTest</directory>
+        <directory>./tests</directory>
     </testsuite>
 
     <php>

src/Module.php

@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LmcUser;
+
+use Laminas\Hydrator\ClassMethodsHydrator;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
+use Laminas\ModuleManager\Feature\ControllerPluginProviderInterface;
+use Laminas\ModuleManager\Feature\ControllerProviderInterface;
+use Laminas\ModuleManager\Feature\ServiceProviderInterface;
+use Laminas\ModuleManager\Feature\ViewHelperProviderInterface;
+
+/**
+ * Class Module
+ */
+class Module implements
+    ConfigProviderInterface,
+    ControllerPluginProviderInterface,
+    ControllerProviderInterface,
+    ServiceProviderInterface,
+    ViewHelperProviderInterface
+{
+    public const LMC_USER_SESSION_STORAGE_NAMESPACE = 'LmcUserNamespace';
+
+    /**
+     * {@inheritDoc}
+     * @see \Laminas\ModuleManager\Feature\ConfigProviderInterface::getConfig()
+     */
+    public function getConfig()
+    {
+        return include __DIR__ . '/../config/module.config.php';
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Laminas\ModuleManager\Feature\ControllerPluginProviderInterface::getControllerPluginConfig()
+     */
+    public function getControllerPluginConfig()
+    {
+        return [
+            'factories' => [
+                'lmcUserAuthentication' => Factory\Controller\Plugin\LmcUserAuthentication::class,
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Laminas\ModuleManager\Feature\ControllerProviderInterface::getControllerConfig()
+     */
+    public function getControllerConfig()
+    {
+        return [
+            'factories' => [
+                'lmcuser' => Factory\Controller\UserControllerFactory::class,
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Laminas\ModuleManager\Feature\ViewHelperProviderInterface::getViewHelperConfig()
+     */
+    public function getViewHelperConfig()
+    {
+        return [
+            'factories' => [
+                'lmcUserDisplayName' => Factory\View\Helper\LmcUserDisplayName::class,
+                'lmcUserIdentity' => Factory\View\Helper\LmcUserIdentity::class,
+                'lmcUserLoginWidget' => Factory\View\Helper\LmcUserLoginWidget::class,
+            ],
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \Laminas\ModuleManager\Feature\ServiceProviderInterface::getServiceConfig()
+     */
+    public function getServiceConfig()
+    {
+        return [
+            'aliases' => [
+                'lmcuser_laminas_db_adapter' => \Laminas\Db\Adapter\Adapter::class,
+                'lmcuser_register_form_hydrator' => 'lmcuser_user_hydrator',
+                'lmcuser_base_hydrator' => 'lmcuser_default_hydrator',
+            ],
+            'invokables' => [
+                'lmcuser_default_hydrator' => ClassMethodsHydrator::class,
+            ],
+            'factories' => [
+                'lmcuser_redirect_callback' => Factory\Controller\RedirectCallbackFactory::class,
+                'lmcuser_module_options' => Factory\Options\ModuleOptions::class,
+                Authentication\Adapter\AdapterChain::class => Authentication\Adapter\AdapterChainServiceFactory::class,
+
+                // We alias this one because it's LmcUser's instance of
+                // Laminas\Authentication\AuthenticationService. We don't want to
+                // hog the FQCN service alias for a Laminas\* class.
+                'lmcuser_auth_service' => Factory\AuthenticationService::class,
+
+                'lmcuser_user_hydrator' => Factory\UserHydrator::class,
+                'lmcuser_user_mapper' => Factory\Mapper\User::class,
+
+                'lmcuser_login_form' => Factory\Form\Login::class,
+                'lmcuser_register_form' => Factory\Form\Register::class,
+                'lmcuser_change_password_form' => Factory\Form\ChangePassword::class,
+                'lmcuser_change_email_form' => Factory\Form\ChangeEmail::class,
+
+                Authentication\Adapter\Db::class => Factory\Authentication\Adapter\DbFactory::class,
+                Authentication\Storage\Db::class => Factory\Authentication\Storage\DbFactory::class,
+
+                'lmcuser_user_service' => Factory\Service\UserFactory::class,
+            ],
+        ];
+    }
+}

tests/LmcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php → tests/Authentication/Adapter/AdapterChainServiceFactoryTest.php

@@ -59,7 +59,7 @@ protected function setUp():void
 
         $this->serviceLocator->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(array($this,'helperServiceLocator')));
+            ->willReturnCallback(array($this,'helperServiceLocator'));
 
         $this->eventManager = $this->createMock('Laminas\EventManager\EventManager');
 
@@ -89,7 +89,7 @@ public function testCreateService()
 
         $this->options->expects($this->once())
             ->method('getAuthAdapters')
-            ->will($this->returnValue($adapterNames));
+            ->willReturn($adapterNames);
 
         $adapterChain = $this->factory->__invoke($this->serviceLocator, 'LmcUser\Authentication\Adapter\AdapterChain');