Merge pull request #22 from jakzal/build-fix

Fix the build

Author: jakzal

.github/workflows/build.yml

@@ -34,12 +34,12 @@ jobs:
 
             -   name: Test & package
                 if: matrix.deps == 'high'
-                run: make install test -o cs
+                run: make install test
 
-                # Separate CS and package step until PHP 8.0 is supported
+                # Separate package step until PHP 8.0 is supported
             -   name: Coding standards
                 if: matrix.php != '8.0'
-                run: make cs package
+                run: make package
 
             -   name: Test & package (min)
                 if: matrix.deps == 'low'

Makefile

@@ -1,3 +1,5 @@
+IS_PHP8:=$(shell php -r 'echo (int)version_compare(PHP_VERSION, "8.0", ">=");')
+
 default: build
 
 build: install test
@@ -29,12 +31,20 @@ test-package: test-package-tools
 	cd tests/phar && ./tools/phpunit
 .PHONY: test-package
 
+ifeq ($(IS_PHP8),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)
+cs-fix:
+else
 cs-fix: tools/php-cs-fixer
 	tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
+endif
 .PHONY: cs-fix
 
 phpunit: tools/phpunit
@@ -81,13 +91,13 @@ tools/php-cs-fixer:
 	curl -Ls http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -o tools/php-cs-fixer && chmod +x tools/php-cs-fixer
 
 tools/box:
-	curl -Ls https://github.com/humbug/box/releases/download/3.8.4/box.phar -o tools/box && chmod +x tools/box
+	curl -Ls https://github.com/humbug/box/releases/download/3.10.0/box.phar -o tools/box && chmod +x tools/box
 
 test-package-tools: tests/phar/tools/phpunit tests/phar/tools/phpunit.d/zalas-phpunit-globals-extension.phar
 .PHONY: test-package-tools
 
 tests/phar/tools/phpunit:
-	curl -Ls https://phar.phpunit.de/phpunit-9.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
+	curl -Ls https://phar.phpunit.de/phpunit-9.4.4.phar -o tests/phar/tools/phpunit && chmod +x tests/phar/tools/phpunit
 
 tests/phar/tools/phpunit.d/zalas-phpunit-globals-extension.phar: build/zalas-phpunit-globals-extension.phar
 	cp build/zalas-phpunit-globals-extension.phar tests/phar/tools/phpunit.d/zalas-phpunit-globals-extension.phar

composer.json

@@ -13,6 +13,9 @@
         "php": "^7.3 || ~8.0.0",
         "phpunit/phpunit": "^9.0"
     },
+    "conflict": {
+        "phpunit/phpunit": "9.5.0"
+    },
     "autoload": {
         "psr-4": {
             "Zalas\\PHPUnit\\Globals\\": "src/"

phpunit.xml.dist

@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.0/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         colors="true"
-         verbose="true">
-    <testsuite name="default">
-        <directory suffix="Test.php">tests</directory>
-        <exclude>tests/phar</exclude>
-    </testsuite>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
-    <extensions>
-        <extension class="Zalas\PHPUnit\Globals\AnnotationExtension" />
-    </extensions>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" colors="true" verbose="true">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuite name="default">
+    <directory suffix="Test.php">tests</directory>
+    <exclude>tests/phar</exclude>
+  </testsuite>
+  <extensions>
+    <extension class="Zalas\PHPUnit\Globals\AnnotationExtension"/>
+  </extensions>
 </phpunit>