Merge pull request #24 from BenMorel/reenable

Re-enable stuff on PHP 8

Author: jakzal

.github/workflows/build.yml

@@ -36,9 +36,7 @@ jobs:
                 if: matrix.deps == 'high'
                 run: make install test
 
-                # Separate package step until PHP 8.0 is supported
             -   name: Coding standards
-                if: matrix.php != '8.0' && matrix.php != '8.1'
                 run: make package
 
             -   name: Test & package (min)

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
 
@@ -31,15 +31,15 @@ test-package: test-package-tools
 	cd tests/phar && ./tools/phpunit
 .PHONY: test-package
 
-ifeq ($(IS_PHP8),1)
+ifeq ($(IS_PHP81),1)
 cs:
 else
 cs: tools/php-cs-fixer
 	tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
 endif
 .PHONY: cs
 
-ifeq ($(IS_PHP8),1)
+ifeq ($(IS_PHP81),1)
 cs-fix:
 else
 cs-fix: tools/php-cs-fixer