Big, big work

- Upgrading main packages. - Upgrading PHPUnit and fixing most of the tests to run with it. - Making tests compliant to PSR12.
rarog · Mar 26, 2020 · 87e28df · 87e28df
1 parent cc1d94e
commit 87e28df
Show file tree

Hide file tree

Showing 39 changed files with 1,998 additions and 1,484 deletions.
diff --git a/composer.json b/composer.json
@@ -1,65 +1,70 @@
 {
-    "name": "zf-commons/zfc-user",
-    "description": "A generic user registration and authentication module for ZF3/Laminas. Supports Laminas\\Db and Doctrine2.",
-    "type": "library",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2"
-    ],
-    "homepage": "https://github.com/ZF-Commons/ZfcUser",
-    "authors": [
-        {
-            "name": "Evan Coury",
-            "email": "[email protected]",
-            "homepage": "http://blog.evan.pro/"
-        },
-        {
-            "name": "Kyle Spraggs",
-            "email": "[email protected]",
-            "homepage": "http://www.spiffyjr.me/"
-        }
-    ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.1.x-dev"
-        }
-    },
-    "require": {
-        "php": "^5.5|^7.0",
-        "laminas/laminas-authentication": "^2.5",
-        "laminas/laminas-crypt": "^3.0",
-        "laminas/laminas-form": "^2.9",
-        "laminas/laminas-inputfilter": "^2.7",
-        "laminas/laminas-loader": "^2.5",
-        "laminas/laminas-modulemanager": "^2.7",
-        "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-servicemanager": "^3.0",
-        "laminas/laminas-stdlib": "^3.0",
-        "laminas/laminas-validator": "^2.8",
-        "laminas/laminas-db": "^2.8",
-        "laminas/laminas-view": "^2.8",
-        "laminas/laminas-session": "^2.7",
-        "laminas/laminas-http": "^2.5",
-        "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
-        "laminas/laminas-i18n": "^2.7",
-        "laminas/laminas-mvc-plugin-prg": "^1.0",
-        "laminas/laminas-hydrator": "^2.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": ">=3.7,<4",
-        "phpmd/phpmd": "1.4.*",
-        "squizlabs/php_codesniffer": "1.4.*",
-        "laminas/laminas-captcha": "^2.6"
-    },
-    "suggest": {
-        "laminas/laminas-captcha": "Laminas\\Captcha if you want to use the captcha component"
-    },
-    "autoload": {
-        "psr-0": {
-            "ZfcUser": "src/"
-        },
-        "classmap": [
-            "./Module.php"
-        ]
-    }
+	"name" : "rarog/laminas-user",
+	"description" : "A generic user registration and authentication module for ZF3/Laminas. Supports Laminas\\Db and Doctrine2.",
+	"type" : "library",
+	"license" : "BSD-3-Clause",
+	"keywords" : [
+		"laminas",
+                "user",
+                "authentication"
+	],
+	"homepage" : "https://github.com/rarog/laminas-user",
+	"authors" : [{
+			"name" : "Evan Coury",
+			"email" : "[email protected]",
+			"homepage" : "http://blog.evan.pro/"
+		}, {
+			"name" : "Kyle Spraggs",
+			"email" : "[email protected]",
+			"homepage" : "http://www.spiffyjr.me/"
+		}
+	],
+	"extra" : {
+		"branch-alias" : {
+			"dev-master" : "4.0-dev"
+		}
+	},
+	"require" : {
+		"php" : "^7.2",
+		"laminas/laminas-authentication" : "^2.5",
+		"laminas/laminas-crypt" : "^3.0",
+		"laminas/laminas-form" : "^2.9",
+		"laminas/laminas-inputfilter" : "^2.7",
+		"laminas/laminas-loader" : "^2.5",
+		"laminas/laminas-modulemanager" : "^2.7",
+		"laminas/laminas-mvc" : "^3.0",
+		"laminas/laminas-servicemanager" : "^3.0",
+		"laminas/laminas-stdlib" : "^3.0",
+		"laminas/laminas-validator" : "^2.8",
+		"laminas/laminas-db" : "^2.8",
+		"laminas/laminas-view" : "^2.8",
+		"laminas/laminas-session" : "^2.7",
+		"laminas/laminas-http" : "^2.5",
+		"laminas/laminas-mvc-plugin-flashmessenger" : "^1.0",
+		"laminas/laminas-i18n" : "^2.7",
+		"laminas/laminas-mvc-plugin-prg" : "^1.0",
+		"laminas/laminas-hydrator" : "^3.0"
+	},
+	"require-dev" : {
+		"phpunit/phpunit" : "^8.0 || ^9.0",
+		"phpmd/phpmd" : "1.4.*",
+		"squizlabs/php_codesniffer" : "^3.0",
+		"laminas/laminas-captcha" : "^2.6"
+	},
+	"suggest" : {
+		"laminas/laminas-captcha" : "Laminas\\Captcha if you want to use the captcha component"
+	},
+	"autoload" : {
+		"psr-0" : {
+			"ZfcUser" : "src/"
+		},
+		"classmap" : [
+			"./Module.php"
+		]
+	},
+	"scripts" : {
+		"cs-check" : "phpcs",
+		"cs-fix" : "phpcbf",
+		"test" : "phpunit"
+	}
 }
diff --git a/tests/phpunit.xml → phpunit.xml b/tests/phpunit.xml → phpunit.xml
@@ -1,16 +1,19 @@
-<phpunit bootstrap="./bootstrap.php"
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="phpunit.xsd"
+         bootstrap="./tests/bootstrap.php"
          colors="true"
+         convertDeprecationsToExceptions="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          verbose="true"
          stopOnFailure="false"
          processIsolation="false"
          backupGlobals="false"
-         syntaxCheck="true"
 >
     <testsuite name="ZfcUser Test Suite">
-        <directory>./ZfcUserTest</directory>
+        <directory>./tests/ZfcUserTest</directory>
     </testsuite>
 
     <php>
@@ -27,12 +30,12 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">../src</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 
     <logging>
         <log type="coverage-text" target="php://stdout"/>
-        <log type="coverage-clover" target="../build/logs/clover.xml"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
 </phpunit>
diff --git a/src/ZfcUser/Mapper/AbstractDbMapper.php b/src/ZfcUser/Mapper/AbstractDbMapper.php
@@ -7,11 +7,12 @@
 use Laminas\Db\Sql\Select;
 use Laminas\Db\Sql\Sql;
 use Laminas\Db\Sql\TableIdentifier;
-use Laminas\Hydrator\HydratorInterface;
 use Laminas\Hydrator\ClassMethods;
+use Laminas\Hydrator\ClassMethodsHydrator;
+use Laminas\Hydrator\HydratorInterface;
+use ZfcUser\Db\Adapter\MasterSlaveAdapterInterface;
 use ZfcUser\Entity\UserInterface as UserEntityInterface;
 use ZfcUser\EventManager\EventProvider;
-use ZfcUser\Db\Adapter\MasterSlaveAdapterInterface;
 
 abstract class AbstractDbMapper extends EventProvider
 {
@@ -79,7 +80,7 @@ protected function initialize()
             throw new \Exception('No db adapter present');
         }
         if (!$this->hydrator instanceof HydratorInterface) {
-            $this->hydrator = new ClassMethods;
+            $this->hydrator = new ClassMethodsHydrator();
         }
         if (!is_object($this->entityPrototype)) {
             throw new \Exception('No entity prototype set');

diff --git a/src/ZfcUser/Mapper/UserHydrator.php b/src/ZfcUser/Mapper/UserHydrator.php
@@ -2,10 +2,10 @@
 
 namespace ZfcUser\Mapper;
 
-use Laminas\Hydrator\ClassMethods;
+use Laminas\Hydrator\ClassMethodsHydrator;
 use ZfcUser\Entity\UserInterface as UserEntityInterface;
 
-class UserHydrator extends ClassMethods
+class UserHydrator extends ClassMethodsHydrator
 {
     /**
      * Extract values from an object
@@ -14,7 +14,7 @@ class UserHydrator extends ClassMethods
      * @return array
      * @throws Exception\InvalidArgumentException
      */
-    public function extract($object)
+    public function extract(object $object): array
     {
         if (!$object instanceof UserEntityInterface) {
             throw new Exception\InvalidArgumentException('$object must be an instance of ZfcUser\Entity\UserInterface');

diff --git a/tests/ZfcUserTest/Authentication/Adapter/AbstractAdapterTest.php b/tests/ZfcUserTest/Authentication/Adapter/AbstractAdapterTest.php
@@ -2,9 +2,12 @@
 
 namespace ZfcUserTest\Authentication\Adapter;
 
+use Laminas\Authentication\Storage\Session;
+use PHPUnit\Framework\TestCase;
 use ZfcUserTest\Authentication\Adapter\TestAsset\AbstractAdapterExtension;
+use ZfcUser\Authentication\Adapter\AbstractAdapter;
 
-class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
+class AbstractAdapterTest extends TestCase
 {
     /**
      * The object to be tested.
@@ -13,49 +16,62 @@ class AbstractAdapterTest extends \PHPUnit_Framework_TestCase
      */
     protected $adapter;
 
-    public function setUp()
+    /**
+     * {@inheritDoc}
+     * @see \PHPUnit\Framework\TestCase::setUp()
+     */
+    protected function setUp(): void
     {
         $this->adapter = new AbstractAdapterExtension();
     }
 
+    /**
+     * {@inheritDoc}
+     * @see \PHPUnit\Framework\TestCase::tearDown()
+     */
+    protected function tearDown(): void
+    {
+        unset($this->adapter);
+    }
+
     /**
      * @covers \ZfcUser\Authentication\Adapter\AbstractAdapter::getStorage
      */
-    public function testGetStorageWithoutStorageSet()
+    public function testGetStorageWithoutStorageSet(): void
     {
-        $this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->adapter->getStorage());
+        $this->assertInstanceOf(Session::class, $this->adapter->getStorage());
     }
 
     /**
      * @covers \ZfcUser\Authentication\Adapter\AbstractAdapter::getStorage
      * @covers \ZfcUser\Authentication\Adapter\AbstractAdapter::setStorage
      */
-    public function testSetGetStorage()
+    public function testSetGetStorage(): void
     {
-        $storage = new \Laminas\Authentication\Storage\Session('ZfcUser');
+        $storage = new Session('ZfcUser');
         $storage->write('zfcUser');
         $this->adapter->setStorage($storage);
 
-        $this->assertInstanceOf('Laminas\Authentication\Storage\Session', $this->adapter->getStorage());
+        $this->assertInstanceOf(Session::class, $this->adapter->getStorage());
         $this->assertSame('zfcUser', $this->adapter->getStorage()->read());
     }
 
     /**
      * @covers \ZfcUser\Authentication\Adapter\AbstractAdapter::isSatisfied
      */
-    public function testIsSatisfied()
+    public function testIsSatisfied(): void
     {
         $this->assertFalse($this->adapter->isSatisfied());
     }
 
-    public function testSetSatisfied()
+    public function testSetSatisfied(): void
     {
         $result = $this->adapter->setSatisfied();
-        $this->assertInstanceOf('ZfcUser\Authentication\Adapter\AbstractAdapter', $result);
+        $this->assertInstanceOf(AbstractAdapter::class, $result);
         $this->assertTrue($this->adapter->isSatisfied());
 
         $result = $this->adapter->setSatisfied(false);
-        $this->assertInstanceOf('ZfcUser\Authentication\Adapter\AbstractAdapter', $result);
+        $this->assertInstanceOf(AbstractAdapter::class, $result);
         $this->assertFalse($this->adapter->isSatisfied());
     }
 }