Merge pull request #45 from visto9259/master

Fixed Test suite to remove PHP 8.2 deprecation notices
LM-Commons · Aug 22, 2023 · 341a0bd · 341a0bd
2 parents e05b6fd + 9337968
commit 341a0bd
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 43 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,6 +37,18 @@ matrix:
     - php: 8.0
       env:
         - DEPS=latest
+    - php: 8.1
+      env:
+        - DEPS=lowest
+    - php: 8.1
+      env:
+        - DEPS=latest
+    - php: 8.2
+      env:
+        - DEPS=lowest
+    - php: 8.2
+      env:
+        - DEPS=latest
     - php: nightly
       env:
         - DEPS=lowest

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,39 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         verbose="true"
-         stopOnFailure="false"
-         processIsolation="false"
-         backupGlobals="false"
->
-    <testsuite name="LmcUser Test Suite">
-        <directory>./tests</directory>
-    </testsuite>
-
-    <php>
-        <const name="DB_MYSQL_DSN" value="mysql:host=localhost;dbname=lmc_user" />
-        <const name="DB_MYSQL_USERNAME" value="root" />
-        <const name="DB_MYSQL_PASSWORD" value="" />
-        <const name="DB_MYSQL_SCHEMA" value="./data/schema.mysql.sql" />
-
-        <const name="DB_SQLITE_DSN" value="sqlite::memory:" />
-        <const name="DB_SQLITE_USERNAME" value="" />
-        <const name="DB_SQLITE_PASSWORD" value="" />
-        <const name="DB_SQLITE_SCHEMA" value="./data/schema.sqlite.sql" />
-    </php>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-            <file>Module.php</file>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-text" target="php://stdout"/>
-        <log type="coverage-clover" target="./build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" verbose="true" stopOnFailure="false" processIsolation="false" backupGlobals="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+      <file>Module.php</file>
+    </include>
+    <report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <text outputFile="php://stdout"/>
+    </report>
+  </coverage>
+  <testsuite name="LmcUser Test Suite">
+    <directory>./tests</directory>
+  </testsuite>
+  <php>
+    <const name="DB_MYSQL_DSN" value="mysql:host=localhost;dbname=lmc_user"/>
+    <const name="DB_MYSQL_USERNAME" value="root"/>
+    <const name="DB_MYSQL_PASSWORD" value=""/>
+    <const name="DB_MYSQL_SCHEMA" value="./data/schema.mysql.sql"/>
+    <const name="DB_SQLITE_DSN" value="sqlite::memory:"/>
+    <const name="DB_SQLITE_USERNAME" value=""/>
+    <const name="DB_SQLITE_PASSWORD" value=""/>
+    <const name="DB_SQLITE_SCHEMA" value="./data/schema.sqlite.sql"/>
+  </php>
+  <logging/>
 </phpunit>
diff --git a/tests/Authentication/Adapter/DbTest.php b/tests/Authentication/Adapter/DbTest.php
@@ -2,6 +2,7 @@
 
 namespace LmcUserTest\Authentication\Adapter;
 
+use Laminas\Crypt\Password\Bcrypt;
 use Laminas\EventManager\Event;
 use LmcUser\Authentication\Adapter\Db;
 use PHPUnit\Framework\TestCase;
@@ -199,6 +200,15 @@ public function testAuthenticateWithWrongPassword()
             ->method('getPasswordCost')
             ->willReturn(4);
 
+        $bcrypt = new Bcrypt([
+            'cost' => 4,
+        ]);
+
+        $hash = $bcrypt->create('123456');
+        $this->user->expects($this->once())
+            ->method('getPassword')
+            ->willReturn($hash);
+
         $this->authEvent->expects($this->once())
             ->method('setCode')
             ->with(\Laminas\Authentication\Result::FAILURE_CREDENTIAL_INVALID)

diff --git a/tests/Mapper/UserTest.php b/tests/Mapper/UserTest.php
@@ -68,6 +68,16 @@ class UserTest extends TestCase
      */
     protected $mockedDbAdapterPlatform;
 
+    /**
+     * @var \Laminas\Db\Adapter\Driver\StatementInterface
+     */
+    protected $mockedDbAdapterStatement;
+
+    /**
+     * @var \Laminas\Db\Sql\Platform\Platform
+     */
+    protected $mockedDbSqlPlatform;
+
     public function setUp():void
     {
         $mapper = new Mapper;

diff --git a/tests/Service/UserTest.php b/tests/Service/UserTest.php
@@ -88,13 +88,14 @@ public function testRegisterWithInvalidForm()
      */
     public function testRegisterWithUsernameAndDisplayNameUserStateDisabled()
     {
-        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User');
+        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User', 'password' => '123456');
 
         $user = $this->createMock('LmcUser\Entity\User');
         $user->expects($this->once())
             ->method('setPassword');
         $user->expects($this->once())
-            ->method('getPassword');
+            ->method('getPassword')
+            ->willReturn('123456');
         $user->expects($this->once())
             ->method('setUsername')
             ->with('LmcUser');
@@ -159,13 +160,14 @@ public function testRegisterWithUsernameAndDisplayNameUserStateDisabled()
      */
     public function testRegisterWithDefaultUserStateOfZero()
     {
-        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User');
+        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User', 'password' => '123456');
 
         $user = $this->createMock('LmcUser\Entity\User');
         $user->expects($this->once())
             ->method('setPassword');
         $user->expects($this->once())
-            ->method('getPassword');
+            ->method('getPassword')
+            ->willReturn('123456');
         $user->expects($this->once())
             ->method('setUsername')
             ->with('LmcUser');
@@ -231,13 +233,14 @@ public function testRegisterWithDefaultUserStateOfZero()
      */
     public function testRegisterWithUserStateDisabled()
     {
-        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User');
+        $expectArray = array('username' => 'LmcUser', 'display_name' => 'Zfc User', 'password' => '123456');
 
         $user = $this->createMock('LmcUser\Entity\User');
         $user->expects($this->once())
             ->method('setPassword');
         $user->expects($this->once())
-            ->method('getPassword');
+            ->method('getPassword')
+            ->willReturn('123456');
         $user->expects($this->once())
             ->method('setUsername')
             ->with('LmcUser');