Update dependencies

Author: ilijastuden

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .php_cs.cache
+.phpunit.result.cache
 *.idea
 /vendor

composer.json

@@ -25,7 +25,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
-        "lightsaml/lightsaml": "^1.1",
+        "lightsaml/lightsaml": "^2.0",
         "phpunit/phpunit": "^9.0",
         "satooshi/php-coveralls": "^1.0",
         "laminas/laminas-diactoros": "^2.0"

composer.lock

@@ -1,26 +1,17 @@
-<phpunit bootstrap="./test/bootstrap.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         processIsolation="false"
-         colors="true">
-    <testsuites>
-        <testsuite name="Authentication">
-            <directory>./test/src</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <log type="coverage-clover" target="./test/log/clover.xml"/>
-    </logging>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./test/bootstrap.php" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" processIsolation="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory>./src</directory>
+    </include>
+    <report>
+      <clover outputFile="./test/log/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Authentication">
+      <directory>./test/src</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>

phpunit.xml

@@ -189,7 +189,7 @@ private function getValidExternalUrlValue(?string $url): ?string
         throw new InvalidArgumentException('URL is not valid');
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'username_format' => $this->getUsernameFormat(),

src/LoginPolicy/LoginPolicy.php

@@ -87,7 +87,7 @@ public function needsRehash($hash, $hashed_with)
      */
     private function pbkdf2($p, $s, $c, $kl, $a = 'sha256')
     {
-        $hl = strlen(hash($a, null, true)); // Hash length
+        $hl = strlen(hash($a, '', true)); // Hash length
         $kb = ceil($kl / $hl);              // Key blocks to compute
         $dk = '';                           // Derived key
 

src/Password/Manager/PasswordManager.php

@@ -79,10 +79,7 @@ public function requireSymbols()
         return $this->require_symbols;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'min_length' => $this->getMinLength(),

src/Password/Policy/PasswordPolicy.php

@@ -119,11 +119,12 @@ public function canAuthenticate()
         return $this->can_authenticate;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
-        return ['id' => $this->getId(), 'name' => $this->getFullName(), 'email' => $this->getEmail()];
+        return [
+            'id' => $this->getId(),
+            'name' => $this->getFullName(),
+            'email' => $this->getEmail(),
+        ];
     }
 }

test/src/AuthenticatedUser/AuthenticatedUser.php

@@ -108,10 +108,7 @@ public function setIsExtendedSession($value)
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $expires_at = null;
 
@@ -121,7 +118,11 @@ public function jsonSerialize()
             $expires_at = $this->expires_at->getTimestamp();
         }
 
-        return ['session_id' => $this->session_id, 'user_id' => $this->user_id, 'expires_at' => $expires_at];
+        return [
+            'session_id' => $this->session_id,
+            'user_id' => $this->user_id,
+            'expires_at' => $expires_at,
+        ];
     }
 
     /**

test/src/Session/Session.php

@@ -85,10 +85,7 @@ public function setExtraAttribute($value)
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $expires_at = null;