Merge pull request #41 from jakzal/php-8.1

Add PHP 8.1 support and drop 7.4

Author: jakzal

.github/workflows/build.yml

@@ -15,10 +15,10 @@ jobs:
         name: Build and test
         strategy:
             matrix:
-                php: [7.4, 8.0]
+                php: ['8.0', '8.1']
                 deps: [high]
                 include:
-                    -   php: 8.0
+                    -   php: '8.1'
                         deps: low
 
         steps:
@@ -42,7 +42,7 @@ jobs:
 
             -   name: Upload the phar
                 uses: actions/upload-artifact@v1
-                if: matrix.php == '7.4' && matrix.deps == 'high'
+                if: matrix.php == '8.0' && matrix.deps == 'high'
                 with:
                     name: zalas-phpunit-injector-extension.phar
                     path: build/zalas-phpunit-injector-extension.phar

Makefile

@@ -1,4 +1,4 @@
-IS_PHP8:=$(shell php -r 'echo (int)version_compare(PHP_VERSION, "8.0", ">=");')
+IS_PHP81:=$(shell php -r 'echo (int)version_compare(PHP_VERSION, "8.1", ">=");')
 
 default: build
 
@@ -27,7 +27,7 @@ test: vendor cs deptrac phpunit infection
 test-min: update-min cs deptrac phpunit infection
 .PHONY: test-min
 
-ifeq ($(IS_PHP8),1)
+ifeq ($(IS_PHP81),1)
 test-package:
 else
 test-package: package test-package-tools
@@ -36,32 +36,20 @@ endif
 .PHONY: test-package
 
 
-ifeq ($(IS_PHP8),1)
-cs:
-else
 cs: tools/php-cs-fixer
 	PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi --diff fix
-endif
 .PHONY: cs
 
-ifeq ($(IS_PHP8),1)
-cs-fix:
-else
 cs-fix: tools/php-cs-fixer
 	PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
-endif
 .PHONY: cs-fix
 
 deptrac: tools/deptrac
-	tools/deptrac --no-interaction --ansi --formatter-graphviz-display=0
+	tools/deptrac --no-interaction --ansi
 .PHONY: deptrac
 
-ifeq ($(IS_PHP8),1)
-infection:
-else
 infection: tools/infection tools/infection.pubkey
-	phpdbg -qrr ./tools/infection --no-interaction --formatter=progress --min-msi=95 --min-covered-msi=95 --only-covered --ansi
-endif
+	phpdbg -qrr ./tools/infection --no-interaction --formatter=progress --min-msi=100 --min-covered-msi=100 --only-covered --ansi
 .PHONY: infection
 
 phpunit: tools/phpunit
@@ -81,7 +69,7 @@ clean:
 	find tests/phar/tools -not -path '*/\.*' -type f -delete
 .PHONY: clean
 
-ifeq ($(IS_PHP8),1)
+ifeq ($(IS_PHP81),1)
 package:
 else
 package: tools/box
@@ -93,7 +81,7 @@ package: tools/box
 
 	cd build/phar && \
 	  composer remove phpunit/phpunit --no-update && \
-	  composer config platform.php 7.4 && \
+	  composer config platform.php 8.0 && \
 	  composer update --no-dev -o -a
 
 	tools/box compile
@@ -113,16 +101,16 @@ tools/php-cs-fixer:
 	curl -Ls http://cs.symfony.com/download/php-cs-fixer-v2.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer
 
 tools/deptrac:
-	curl -Ls https://github.com/sensiolabs-de/deptrac/releases/download/0.10.0/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
+	curl -Ls https://github.com/sensiolabs-de/deptrac/releases/download/0.19.1/deptrac.phar -o tools/deptrac && chmod +x tools/deptrac
 
 tools/infection: tools/infection.pubkey
-	curl -Ls https://github.com/infection/infection/releases/download/0.20.2/infection.phar -o tools/infection && chmod +x tools/infection
+	curl -Ls https://github.com/infection/infection/releases/download/0.26.2/infection.phar -o tools/infection && chmod +x tools/infection
 
 tools/infection.pubkey:
-	curl -Ls https://github.com/infection/infection/releases/download/0.20.2/infection.phar.pubkey -o tools/infection.pubkey
+	curl -Ls https://github.com/infection/infection/releases/download/0.26.2/infection.phar.pubkey -o tools/infection.pubkey
 
 tools/box:
-	curl -Ls https://github.com/humbug/box/releases/download/3.10.0/box.phar -o tools/box && chmod +x tools/box
+	curl -Ls https://github.com/humbug/box/releases/download/3.14.0/box.phar -o tools/box && chmod +x tools/box
 
 tests/phar/tools/phpunit:
 	curl -Ls https://phar.phpunit.de/phpunit-9.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit

composer.json

@@ -3,7 +3,7 @@
     "description": "Injects services from a PSR-11 dependency injection container to PHPUnit test cases",
     "type": "library",
     "require": {
-        "php": "^7.4 || ~8.0.0",
+        "php": "~8.0.0 || ~8.1.0",
         "phpunit/phpunit": "^9.0",
         "psr/container": "^1.0",
         "zalas/injector": "^2.0"

infection.json.dist

@@ -12,7 +12,12 @@
         "@default": true,
         "IdenticalEqual": false,
         "NotIdenticalNotEqual": false,
-        "OneZeroInteger": {
+        "Assignment": {
+            "ignore": [
+                "Zalas\\Injector\\PHPUnit\\Symfony\\Compiler\\Discovery\\ClassFinder::findClassInFile"
+            ]
+        },
+        "Increment": {
             "ignore": [
                 "Zalas\\Injector\\PHPUnit\\Symfony\\Compiler\\Discovery\\ClassFinder::findClassInFile"
             ]
@@ -29,6 +34,16 @@
                 "Zalas\\Injector\\PHPUnit\\Symfony\\Compiler\\Discovery\\PropertyDiscovery::__construct",
                 "Zalas\\Injector\\PHPUnit\\TestListener\\ServiceInjectorListener::startTest"
             ]
+        },
+        "InstanceOf_": {
+            "ignore": [
+                "Zalas\\Injector\\PHPUnit\\Symfony\\TestCase\\SymfonyKernel::ensureKernelShutdown"
+            ]
+        },
+        "LogicalOr": {
+            "ignore": [
+                "Zalas\\Injector\\PHPUnit\\Symfony\\TestCase\\SymfonyKernel::ensureKernelShutdown"
+            ]
         }
     }
 }

manifest.xml.in

@@ -10,6 +10,6 @@
     </copyright>
 
     <requires>
-        <php version="^7.4 || ^8.0"/>
+        <php version="^8.0"/>
     </requires>
 </phar>

src/Symfony/Compiler/Discovery/ClassFinder.php

@@ -69,10 +69,6 @@ private function findClassInFile(\SplFileInfo $phpFile): ?string
 
     private function isNamespaceToken($tokens, int $index): bool
     {
-        if (PHP_VERSION_ID < 80000) {
-            return $this->extractTokens($tokens, $index - 2, 3) === [T_NAMESPACE, T_WHITESPACE, T_STRING];
-        }
-
         return $this->extractTokens($tokens, $index - 2, 3) === [T_NAMESPACE, T_WHITESPACE, T_NAME_QUALIFIED];
     }