Make tests work

.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: CI
+
+on:
+  # Run on all pushes to master and on all pull requests.
+  push:
+    branches:
+      master
+  pull_request:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  test:
+    uses: "zetacomponents/.github/.github/workflows/ci.yml@master"

.gitignore

@@ -1,3 +1,6 @@
 vendor
 run-tests-tmp
-extract
+extract
+.phpunit.result.cache
+composer.lock
+

composer.json

@@ -45,6 +45,7 @@
         "zetacomponents/base": "~1.8"
     },
     "require-dev": {
-        "zetacomponents/unit-test": "*"
+        "zetacomponents/unit-test": "*",
+        "phpunit/phpunit": "~9.0"
     }
 }

docs/tutorial/tutorial_autoload.php

@@ -9,12 +9,7 @@
 }
 
 /**
- * Autoload ezc classes 
- * 
- * @param string $className 
+ * Autoload ezc classes
  */
-function __autoload( $className )
-{
-    ezcBase::autoload( $className );
-}
+spl_autoload_register('ezcBase::autoload');
 ?>

docs/tutorial/tutorial_token1.php

@@ -6,7 +6,7 @@
 $token  = "";
 for( $i = 1; $i <= 6 ; $i++ )
 {
-    $token .= $pattern{rand( 0, 36 )};
+    $token .= $pattern[rand( 0, 36 )];
 }
 $encryptedToken = sha1( $token );
 

phpunit.xml.dist

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Zeta Components Authentication">
-            <directory suffix="_test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Zeta Components Authentication">
+      <directory suffix="_test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>

src/authentication.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -84,21 +84,21 @@ class ezcAuthentication
 {
     /**
      * The filter queue of the authentication process.
-     * 
+     *
      * @var array(ezcAuthenticationFilter)
      */
     protected $filters = array();
 
     /**
      * Options for the Authentication object.
-     * 
+     *
      * @var ezcAuthenticationOptions
      */
     protected $options;
 
     /**
      * The properties of this class.
-     * 
+     *
      * @var array(string=>mixed)
      */
     private $properties = array();
@@ -109,7 +109,7 @@ class ezcAuthentication
      * @param ezcAuthenticationCredentials $credentials Authentication credentials
      * @param ezcAuthenticationOptions $options Options for this class
      */
-    public function __construct( ezcAuthenticationCredentials $credentials, ezcAuthenticationOptions $options = null )
+    public function __construct( ezcAuthenticationCredentials $credentials, ?ezcAuthenticationOptions $options = null )
     {
         $this->credentials = $credentials;
         $this->status = new ezcAuthenticationStatus();
@@ -263,7 +263,8 @@ public function run()
                     // status of the Authentication object
                     foreach ( $statuses as $status )
                     {
-                        list( $key, $value ) = each( $status );
+                        $key = key( $status );
+                        $value = current( $status );
                         $this->status->append( $key, $value );
                     }
                 }
@@ -328,7 +329,7 @@ public function addFilter( ezcAuthenticationFilter $filter, $stop = false )
      *        array( 'ezcAuthenticationDatabaseFilter' => ezcAuthenticationDatabaseFilter::STATUS_PASSWORD_INCORRECT )
      *      );
      * </code>
-     * 
+     *
      * @return array(string=>mixed)
      */
     public function getStatus()

src/filters/group/group_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -170,14 +170,14 @@ class ezcAuthenticationGroupFilter extends ezcAuthenticationFilter
 
     /**
      * Authentication filters.
-     * 
+     *
      * @var array(ezcAuthenticationFilter)
      */
     protected $filters = array();
 
     /**
      * The properties of this class.
-     * 
+     *
      * @var array(string=>mixed)
      */
     private $properties = array();
@@ -215,7 +215,7 @@ class ezcAuthenticationGroupFilter extends ezcAuthenticationFilter
      * @param array(ezcAuthenticationFilter|mixed) $filters Authentication filters
      * @param ezcAuthenticationGroupOptions $options Options for this class
      */
-    public function __construct( array $filters, ezcAuthenticationGroupOptions $options = null )
+    public function __construct( array $filters, ?ezcAuthenticationGroupOptions $options = null )
     {
         $this->options = ( $options === null ) ? new ezcAuthenticationGroupOptions() : $options;
 
@@ -399,7 +399,7 @@ public function run( $credentials )
      *                                                  with $filter if the multipleCredentials
      *                                                  option is enabled
      */
-    public function addFilter( ezcAuthenticationFilter $filter, ezcAuthenticationCredentials $credentials = null )
+    public function addFilter( ezcAuthenticationFilter $filter, ?ezcAuthenticationCredentials $credentials = null )
     {
         if ( $this->options->multipleCredentials === true )
         {

src/filters/htpasswd/htpasswd_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -108,7 +108,7 @@ class ezcAuthenticationHtpasswdFilter extends ezcAuthenticationFilter
      * @param string $file The path and file name of the htpasswd file to use
      * @param ezcAuthenticationHtpasswdOptions $options Options for this class
      */
-    public function __construct( $file, ezcAuthenticationHtpasswdOptions $options = null )
+    public function __construct( $file, ?ezcAuthenticationHtpasswdOptions $options = null )
     {
         $this->file = $file;
         $this->options = ( $options === null ) ? new ezcAuthenticationHtpasswdOptions() : $options;
@@ -232,7 +232,7 @@ public function run( $credentials )
             }
             else
             {
-                $password = ( $this->options->plain ) ? crypt( $credentials->password, $hashFromFile ) :
+                $password = ( $this->options->plain ) ? crypt( $credentials->password ? $credentials->password : '', $hashFromFile ) :
                                                         $credentials->password;
             }
             if ( $password === $hashFromFile )

src/filters/ldap/ldap_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -153,7 +153,7 @@ class ezcAuthenticationLdapFilter extends ezcAuthenticationFilter implements ezc
      * @param ezcAuthenticationLdapInfo $ldap How to connect to LDAP
      * @param ezcAuthenticationLdapOptions $options Options for this class
      */
-    public function __construct( ezcAuthenticationLdapInfo $ldap, ezcAuthenticationLdapOptions $options = null )
+    public function __construct( ezcAuthenticationLdapInfo $ldap, ?ezcAuthenticationLdapOptions $options = null )
     {
         if ( !ezcBaseFeatures::hasExtensionSupport( 'ldap' ) )
         {

src/filters/openid/openid_file_store.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -67,7 +67,7 @@ class ezcAuthenticationOpenidFileStore extends ezcAuthenticationOpenidStore
      * @param string $path The path where to save the nonces
      * @param ezcAuthenticationOpenidFileStoreOptions $options Options for this class
      */
-    public function __construct( $path, ezcAuthenticationOpenidFileStoreOptions $options = null )
+    public function __construct( $path, ?ezcAuthenticationOpenidFileStoreOptions $options = null )
     {
         $this->path = $path;
         $this->options = ( $options === null ) ? new ezcAuthenticationOpenidFileStoreOptions() : $options;

src/filters/openid/openid_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -368,7 +368,7 @@ class ezcAuthenticationOpenidFilter extends ezcAuthenticationFilter implements e
      *
      * @param ezcAuthenticationOpenidOptions $options Options for this class
      */
-    public function __construct( ezcAuthenticationOpenidOptions $options = null )
+    public function __construct( ?ezcAuthenticationOpenidOptions $options = null )
     {
         $this->options = ( $options === null ) ? new ezcAuthenticationOpenidOptions() : $options;
     }
@@ -1090,7 +1090,7 @@ protected function checkSignatureSmart( ezcAuthenticationOpenidAssociation $asso
         {
             $serialized .= "{$key}:{$value}\n";
         }
-        
+
         $key = base64_decode( $association->secret );
         if ( strlen( $key ) > 64 )
         {

src/filters/token/token_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -108,7 +108,7 @@ class ezcAuthenticationTokenFilter extends ezcAuthenticationFilter
      * @param callback $function The encryption function to use when comparing tokens
      * @param ezcAuthenticationTokenOptions $options Options for this class
      */
-    public function __construct( $token, $function, ezcAuthenticationTokenOptions $options = null )
+    public function __construct( $token, $function, ?ezcAuthenticationTokenOptions $options = null )
     {
         $this->token = $token;
         $this->function = $function;
@@ -207,7 +207,7 @@ public function __isset( $name )
      */
     public function run( $credentials )
     {
-        $password = call_user_func( $this->function, $credentials->id );
+        $password = call_user_func( $this->function, $credentials->id ? $credentials->id : '' );
         if ( $this->token === $password )
         {
             return self::STATUS_OK;

src/filters/typekey/typekey_filter.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -255,7 +255,7 @@ class ezcAuthenticationTypekeyFilter extends ezcAuthenticationFilter implements
      *         if neither of the PHP gmp and bcmath extensions are installed
      * @param ezcAuthenticationTypekeyOptions $options Options for this class
      */
-    public function __construct( ezcAuthenticationTypekeyOptions $options = null )
+    public function __construct( ?ezcAuthenticationTypekeyOptions $options = null )
     {
         $this->options = ( $options === null ) ? new ezcAuthenticationTypekeyOptions() : $options;
         $this->lib = ezcAuthenticationMath::createBignumLibrary();

src/math/math.php

@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -102,7 +102,7 @@ public static function createBignumLibrary( $lib = null )
     /**
      * Calculates an MD5 hash similar to the Unix command "htpasswd -m".
      *
-     * This is different from the hash returned by the PHP md5() function. 
+     * This is different from the hash returned by the PHP md5() function.
      *
      * @param string $plain Plain text to encrypt
      * @param string $salt Salt to apply to encryption
@@ -126,7 +126,7 @@ public static function apr1( $plain, $salt )
         }
         for ( $i = strlen( $plain ); $i; $i >>= 1 )
         {
-            $text .= ( $i & 1 ) ? chr( 0 ) : $plain{0};
+            $text .= ( $i & 1 ) ? chr( 0 ) : $plain[0];
         }
         $bin = pack( 'H32', md5( $text ) );
         for ( $i = 0; $i ^ 1000; ++$i )

src/session/authentication_session.php

@@ -116,7 +116,7 @@ class ezcAuthenticationSession
      *
      * @param ezcAuthenticationSessionOptions $options Options for this class
      */
-    public function __construct( ezcAuthenticationSessionOptions $options = null )
+    public function __construct( ?ezcAuthenticationSessionOptions $options = null )
     {
         $this->options = ( $options === null ) ? new ezcAuthenticationSessionOptions() : $options;
     }