Merge pull request #6 from veewee/php81

veewee · web-flow · commit 06b552a6fb73 · 2021-11-15T20:42:58.000+01:00
Add PHP81 support
diff --git a/.gitattributes b/.gitattributes
@@ -6,5 +6,5 @@ tools/          export-ignore
 /.gitignore     export-ignore
 /phpunit.xml    export-ignore
 /phive.xml      export-ignore
-/php_cs.dist    export-ignore
+.php-cs-fixer.dist.php    export-ignore
 /psalm.xml      export-ignore
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0', '8.1']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4']
+                php-versions: ['7.4', '8.0', '8.1']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest, windows-latest, macos-latest]
-                php-versions: ['7.4', '8.0']
+                php-versions: ['7.4', '8.0', '8.1']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0']
+                php-versions: ['7.4', '8.0', '8.1']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /vendor/
 .phpunit.cache
-.php_cs.cache
+.php-cs-fixer.cache
 composer.lock
 infection.log
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpunit" version="^9.5.10" installed="9.5.10" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^4.12.0" installed="4.12.0" location="./tools/psalm.phar" copy="true"/>
+  <phar name="infection" version="^0.25" installed="0.25.3" location="./tools/infection.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.3.2" installed="3.3.2" location="./tools/php-cs-fixer.phar" copy="true"/>
+</phive>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setFinder(
         \Symfony\Component\Finder\Finder::create()
             ->in([
@@ -16,7 +16,9 @@
         'array_indentation' => true,
         'array_syntax' => ['syntax' => 'short'],
         'backtick_to_shell_exec' => true,
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['return']
+        ],
         'class_keyword_remove' => false,
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
@@ -48,7 +50,9 @@
         'no_blank_lines_before_namespace' => false,
         'no_null_property_initialization' => true,
         'no_php4_constructor' => true,
-        'no_short_echo_tag' => false,
+        'echo_tag_syntax' => [
+            'format' => 'long'
+        ],
         'no_superfluous_elseif' => true,
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
@@ -62,7 +66,12 @@
         'php_unit_mock' => false,
         'php_unit_namespaced' => false,
         'php_unit_no_expectation_annotation' => false,
-        'php_unit_ordered_covers' => true,
+        'phpdoc_order_by_value' => [
+            'annotations' => ['covers']
+        ],
+        'php_unit_method_casing' => [
+            'case' => 'snake_case',
+        ],
         'php_unit_set_up_tear_down_visibility' => true,
         'php_unit_strict' => false,
         'php_unit_test_annotation' => false,
@@ -71,7 +80,7 @@
         'phpdoc_order' => true,
         'phpdoc_types_order' => ['null_adjustment' => 'always_last'],
         'pow_to_exponentiation' => true,
-        'psr0' => true,
+        'psr_autoloading' => true,
         'random_api_migration' => false,
         'simplified_null_return' => true,
         'static_lambda' => false,
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^7.4 || ^8.0.0 || ^8.1.0",
         "composer-plugin-api": "~2.0"
     },
     "require-dev": {
@@ -35,7 +35,7 @@
     "scripts": {
         "parallel": "ComposerRunParallel\\Scripts\\ParallelScript::initializeAndRun",
         "cs": "@fix-cs --dry-run",
-        "fix-cs": "./tools/php-cs-fixer.phar fix",
+        "fix-cs": "PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix",
         "psalm": "./tools/psalm.phar",
         "tests": "./tools/phpunit.phar",
         "coverage": "@php ./tools/full-coverage-check.php .phpunit.cache/clover/clover.xml",
diff --git a/phive.xml b/phive.xml
diff --git a/psalm.xml b/psalm.xml
@@ -4,7 +4,6 @@
     forbidEcho="true"
     strictBinaryOperands="true"
     phpVersion="7.4"
-    allowPhpStormGenerics="true"
     allowStringToStandInForClass="true"
     rememberPropertyAssignmentsAfterCall="false"
     skipChecksOnUnresolvableIncludes="false"
diff --git a/src/Finder/PhpExecutableFinder.php b/src/Finder/PhpExecutableFinder.php
@@ -36,6 +36,7 @@ public function __invoke(): string
             throw ParallelException::phpBinaryNotFound();
         }
 
+        /** @var list<string> $phpArgs */
         $phpArgs = $this->finder->findArguments();
         $phpArgs = $phpArgs ? ' '.implode(' ', $phpArgs) : '';
         $allowUrlFOpenFlag = ' -d allow_url_fopen='.ProcessExecutor::escape(ini_get('allow_url_fopen'));
diff --git a/src/Result/ResultMap.php b/src/Result/ResultMap.php
@@ -81,7 +81,7 @@ public function getResultCode(): int
     {
         return array_reduce(
             $this->map,
-            fn (int $highest, int $value): int => (int) max($highest, $value),
+            fn (int $highest, int $value): int => max($highest, $value),
             0
         );
     }
diff --git a/tools/infection.phar b/tools/infection.phar
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
diff --git a/tools/phpunit.phar b/tools/phpunit.phar
diff --git a/tools/psalm.phar b/tools/psalm.phar
