Merge pull request #215 from mlocati/php-8.0

PHP 8.0 compatibility

Author: mlocati

.github/workflows/test.yml

@@ -13,6 +13,7 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
     runs-on: ${{ matrix.os }}
     steps:
       - name: Setup PHP
@@ -38,12 +39,16 @@ jobs:
       - name: Install Composer dependencies (including dev, preferring dist)
         run: composer install --optimize-autoloader --ansi --no-interaction
       - name: Run Behat
-        run: PICKLE_BEHAT_PROCESS_TIMEOUT=0 vendor/bin/behat --format=progress
+        env:
+          PICKLE_BEHAT_PROCESS_TIMEOUT: 0
+        run: vendor/bin/behat --format=progress
+      # We need a new release of Ocular that supports PHP 8 - see https://github.com/scrutinizer-ci/ocular/pull/52
       - name: Download Ocular
+        if: always() && !startsWith(matrix.php-version, '8.')
         run: curl -sSLf -o ocular.phar https://scrutinizer-ci.com/ocular.phar
       - name: Upload code coverage
-        if: ${{ always() }}
+        if: always()
         run: |
           if test -f ocular.phar && test -f clover.xml; then
-            php ocular.phar code-coverage:upload --format=php-clover clover.xml
+            php ocular.phar code-coverage:upload --format=php-clover --ansi --no-interaction -vvv clover.xml
           fi

.gitignore

@@ -2,3 +2,5 @@ composer.phar
 pickle*.phar
 vendor/
 *.test
+/clover.xml
+/ocular.phar

composer.json

@@ -17,24 +17,25 @@
     ],
     "require": {
         "php": ">=7.2",
-        "ext-zlib": "*",
-        "ext-mbstring": "*",
-        "ext-simplexml": "*",
-        "ext-json": "*",
         "ext-dom": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
         "ext-openssl": "*",
-        "symfony/console": "^5.0",
-        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+        "ext-simplexml": "*",
+        "ext-zlib": "*",
         "composer/composer": "<2.0",
-        "padraic/phar-updater": "~1.0@dev"
+        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+        "padraic/phar-updater": "~1.0@dev",
+        "symfony/console": "^5.0"
     },
     "require-dev": {
         "atoum/atoum": "~3.4",
         "atoum/praspel-extension": "~0.17",
         "atoum/visibility-extension": "~1.3",
         "behat/behat": "~3.6",
-        "symfony/process": "^5.0",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "mlocati/composer-patcher": "^1.2.2",
+        "symfony/process": "^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,13 +44,28 @@
     },
     "bin": ["bin/pickle"],
     "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true,
         "platform": {
             "php": "7.2.5"
-        }
+        },
+        "discard-changes": true
     },
     "scripts": {
         "cs": "vendor/bin/php-cs-fixer --ansi fix --config=sf23",
         "test": "vendor/bin/atoum --force-terminal && vendor/bin/behat --suite pickle --colors"
+    },
+    "extra": {
+        "patches": {
+            "atoum/atoum:3.4.2": {
+                "PHP 8 fixes": "patches/atoum/atoum/0001-PHP-8-fixes.patch"
+            },
+            "hoa/realdom:1.17.01.13": {
+                "PHP 8 fixes": "patches/hoa/realdom/0001-Remove-use-of-deprecated-each-function.patch"
+            },
+            "hoa/stream:1.17.02.21": {
+                "PHP 8 fixes": "patches/hoa/stream/0001-Fix-PHP-8-compatibility.patch"
+            }
+        }
     }
-
-}
+}

composer.lock

@@ -0,0 +1,81 @@
+From: Michele Locati <[email protected]>
+Date: Mon, 25 Jan 2021 09:49:46 +0100
+Subject: [PATCH] PHP 8 fixes
+
+--- a/classes/autoloader.php
++++ b/classes/autoloader.php
+@@ -40,7 +40,8 @@ class autoloader
+ 
+         $defaultAliases = [
+             'atoum' => __NAMESPACE__ . '\test',
+-            __NAMESPACE__ => __NAMESPACE__ . '\test'
++            __NAMESPACE__ => __NAMESPACE__ . '\test',
++            __NAMESPACE__ . '\iterators\recursives\directory\factory' => __NAMESPACE__ . '\iterators\recursives\directory\\' . (PHP_VERSION_ID < 80000 ? 'factory7' : 'factory8'),
+         ];
+ 
+         foreach ($classAliases ?: $defaultAliases as $alias => $target) {
+--- a/classes/includer.php
++++ b/classes/includer.php
+@@ -84,7 +84,7 @@ class includer
+         return $firstError;
+     }
+ 
+-    public function errorHandler($error, $message, $file, $line, $context)
++    public function errorHandler($error, $message, $file, $line, $context = null)
+     {
+         $errorReporting = $this->adapter->error_reporting();
+ 
+new file mode 100644
+--- /dev/null
++++ b/classes/iterators/recursives/directory/factory7.php
+@@ -0,0 +1,11 @@
++<?php
++
++namespace mageekguy\atoum\iterators\recursives\directory;
++
++class factory7 extends factoryBase
++{
++    public function getIterator($path)
++    {
++        return $this->getIteratorBase($path);
++    }
++}
+new file mode 100644
+--- /dev/null
++++ b/classes/iterators/recursives/directory/factory8.php
+@@ -0,0 +1,11 @@
++<?php
++
++namespace mageekguy\atoum\iterators\recursives\directory;
++
++class factory8 extends factoryBase
++{
++    public function getIterator()
++    {
++        return $this->getIteratorBase(func_get_arg(0));
++    }
++}
+diff --git a/classes/iterators/recursives/directory/factory.php b/classes/iterators/recursives/directory/factoryBase.phpsimilarity index 97%
+similarity index 97%
+rename from classes/iterators/recursives/directory/factory.php
+rename to classes/iterators/recursives/directory/factoryBase.php
+--- a/classes/iterators/recursives/directory/factory.php
++++ b/classes/iterators/recursives/directory/factoryBase.php
+@@ -4,7 +4,7 @@ namespace mageekguy\atoum\iterators\recursives\directory;
+ 
+ use mageekguy\atoum\iterators\filters;
+ 
+-class factory implements \iteratorAggregate
++abstract class factoryBase implements \iteratorAggregate
+ {
+     protected $dotFilterFactory = null;
+     protected $iteratorFactory = null;
+@@ -63,7 +63,7 @@ class factory implements \iteratorAggregate
+         return $this->extensionFilterFactory;
+     }
+ 
+-    public function getIterator($path)
++    public function getIteratorBase($path)
+     {
+         $iterator = call_user_func($this->iteratorFactory, $path);
+