Merge pull request #777 from Geolim4/master

Ensured full PHP8 compatibility

Author: Geolim4

.github/workflows/tests.yml

@@ -37,4 +37,18 @@ jobs:
           extensions: mbstring, intl, pdo_sqlite, json
           ini-values: apc.enabled=1, apc.shm_size=32M, apc.ttl=7200, apc.enable_cli=1, apc.serializer=php
       - name: Run tests on PHP 7.4
-        run: php -f ./bin/ci/run_tests.php
+        run: php -f ./bin/ci/run_tests.php
+
+      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+      # Docs: https://getcomposer.org/doc/articles/scripts.md
+      - name: Run tests on PHP 8.0
+        run: php -f ./bin/ci/run_tests.php
+      - name: Setup PHP 8.0
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          coverage: none
+          extensions: mbstring, intl, pdo_sqlite, json
+          ini-values: apc.enabled=1, apc.shm_size=32M, apc.ttl=7200, apc.enable_cli=1, apc.serializer=php
+      - name: Run tests on PHP 8.0
+        run: php -f ./bin/ci/run_tests.php

.travis.yml

@@ -41,14 +41,16 @@ php:
   # - 7.2
   - 7.3
   - 7.4
-  - nightly
+  - 8.0
+  # - nightly # crashes on almost every builds, very unstable
   - hhvm
 
 jobs:
   fast_finish: true
   allow_failures:
-    - php: nightly
+    # - php: nightly
     - php: hhvm
+    - php: 8.0
 
 install:
   - ./bin/ci/install_dependencies.sh

bin/ci/run_tests.php

@@ -11,9 +11,11 @@
 $timestamp = microtime(true);
 $climate = new League\CLImate\CLImate;
 $climate->forceAnsiOn();
+$phpBinPath = 'php ';
 $status = 0;
 $dir = __DIR__;
 $driver = $argv[ 1 ] ?? 'Files';
+$phpBinPath = $_SERVER['PHP_BIN_PATH'] ?? 'php';
 
 /**
  * @param string $pattern
@@ -23,17 +25,18 @@
 $globCallback = static function (string $pattern, int $flags = 0) use (&$globCallback): array
 {
     $files = \glob($pattern, $flags);
+    $subFiles = [];
 
     foreach (\glob(\dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
-        $files = \array_merge($files, $globCallback($dir . '/' . \basename($pattern), $flags));
+        $subFiles[] = $globCallback($dir . '/' . \basename($pattern), $flags);
     }
 
-    return $files;
+    return \array_merge($files, ...$subFiles);
 };
 
 foreach ($globCallback(PFC_TEST_DIR . DIRECTORY_SEPARATOR . '*.test.php') as $filename) {
     $climate->backgroundLightYellow()->blue()->out('---');
-    $command = "php -f {$filename} {$driver}";
+    $command = "{$phpBinPath} -f {$filename} {$driver}";
     $climate->out("<yellow>phpfastcache@unit-test</yellow> <blue>{$dir}</blue> <green>#</green> <red>$command</red>");
 
     \exec($command, $output, $return_var);
@@ -63,4 +66,4 @@
     $climate->backgroundRed()->white()->flank('[KO] The build has failed miserably', '~')->out('');
 }
 
-exit($status);
+exit($status);

lib/Phpfastcache/Drivers/Cookie/Driver.php

@@ -142,7 +142,7 @@ protected function driverReadExpirationDate($key): int
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    protected function driverDelete(CacheItemInterface $item)
+    protected function driverDelete(CacheItemInterface $item): bool
     {
         /**
          * Check for Cross-Driver type confusion
@@ -183,4 +183,4 @@ protected function driverClear(): bool
 
         return $return;
     }
-}
+}

lib/Phpfastcache/Drivers/Couchbase/Driver.php

@@ -169,7 +169,7 @@ protected function driverWrite(CacheItemInterface $item): bool
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    protected function driverDelete(CacheItemInterface $item)
+    protected function driverDelete(CacheItemInterface $item): bool
     {
         /**
          * Check for Cross-Driver type confusion

lib/Phpfastcache/Util/ClassNamespaceResolverTrait.php

@@ -45,12 +45,12 @@ trait ClassNamespaceResolverTrait
      */
     protected static function createClassMap($dir): array
     {
-        if (is_string($dir)) {
+        if (\is_string($dir)) {
             $dir = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
         }
         $map = [];
 
-        if (is_array($dir) || $dir instanceof Traversable) {
+        if (\is_iterable($dir)) {
             foreach ($dir as $file) {
                 if (!$file->isFile()) {
                     continue;
@@ -98,10 +98,19 @@ protected static function findClasses(string $path): array
             switch ($token[0]) {
                 case T_NAMESPACE:
                     $namespace = '';
-                    // If there is a namespace, extract it
-                    while (isset($tokens[++$i][1])) {
-                        if (in_array($tokens[$i][0], [T_STRING, T_NS_SEPARATOR])) {
-                            $namespace .= $tokens[$i][1];
+                    // If there is a namespace, extract it (PHP 8 test)
+                    if(\defined('T_NAME_QUALIFIED')){
+                        while (isset($tokens[++$i][1])) {
+                            if ($tokens[$i][0] === T_NAME_QUALIFIED) {
+                                $namespace = $tokens[$i][1];
+                                break;
+                            }
+                        }
+                    }else{
+                        while (isset($tokens[++$i][1])) {
+                            if (\in_array($tokens[$i][0], [T_STRING, T_NS_SEPARATOR], true)) {
+                                $namespace .= $tokens[$i][1];
+                            }
                         }
                     }
                     $namespace .= '\\';
@@ -118,7 +127,7 @@ protected static function findClasses(string $path): array
                         if (T_DOUBLE_COLON === $tokens[$j][0]) {
                             $isClassConstant = true;
                             break;
-                        } elseif (!in_array($tokens[$j][0], [T_WHITESPACE, T_DOC_COMMENT, T_COMMENT], false)) {
+                        } elseif (!\in_array($tokens[$j][0], [T_WHITESPACE, T_DOC_COMMENT, T_COMMENT], false)) {
                             break;
                         }
                     }
@@ -140,6 +149,7 @@ protected static function findClasses(string $path): array
                     break;
             }
         }
+
         return $classes;
     }
 

tests/DriverListResolver.test.php

@@ -20,6 +20,7 @@
 
 $driverList = CacheManager::getDriverList();
 
+
 foreach ($driverList as $driver) {
     foreach ($subClasses as $subClass) {
         $className = "Phpfastcache\\Drivers\\{$driver}\\{$subClass}";
@@ -31,4 +32,4 @@
     }
 }
 
-$testHelper->terminateTest();
+$testHelper->terminateTest();