Add PHP 8.0 support (#5)

* Add PHP 8.0 support
* Fix phpcs sniffs
* Configure php compat sniff

Author: kimpepper

.circleci/config.yml

@@ -1,50 +1,52 @@
-version: 2
+version: 2.1
+
+executors:
+  php74:
+    docker:
+      - image: skpr/php-cli:7.4-1.x
+  php80:
+    docker:
+      - image: skpr/php-cli:8.0-1.x
 
 workflows:
-  version: 2
   build:
     jobs:
-      - build_lowest
-      - build_highest
-
-defaults: &defaults
-  docker:
-    - image: previousnext/php-apache:7.3-3.x-dev
-  working_directory: /data
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - deps-{{ arch }}
-    - run:
-        name: "Install Dependencies"
-        command: composer update --prefer-dist --no-progress --no-suggest --no-interaction ${PREFER_LOWEST}
-    - save_cache:
-        key: deps-{{ arch }}
-        paths:
-          - vendor
-    - run:
-        name: "Lint"
-        command: ./bin/phpcs
-    - run:
-        name: "Test"
-        command: |
-          mkdir -p ~/phpunit
-          ./bin/phpunit --testsuite unit --log-junit ~/phpunit/phpunit.xml
-    - store_test_results:
-        path: ~/phpunit
-    - store_artifacts:
-        path: ~/phpunit
+      - build:
+          matrix:
+            parameters:
+              php: ["php74", "php80"]
+              composer-opts: ["", "--prefer-lowest"]
 
 jobs:
-  build_lowest:
-    <<: *defaults
-    docker:
-      - image: previousnext/php-apache:7.1-3.x-dev
-
-    environment:
-      - PREFER_LOWEST: --prefer-lowest
-  build_highest:
-    <<: *defaults
-    environment:
-      - PREFER_LOWEST: ''
+  build:
+    parameters:
+      php:
+        type: executor
+      composer-opts:
+        type: string
+    executor: << parameters.php >>
+    working_directory: /data
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - deps-{{ arch }}
+      - run:
+          name: "Install Dependencies"
+          command: composer2 update --prefer-dist --no-progress --no-suggest --no-interaction << parameters.composer-opts >>
+      - save_cache:
+          key: deps-{{ arch }}
+          paths:
+            - vendor
+      - run:
+          name: "Lint"
+          command: ./bin/phpcs --runtime-set testVersion 8.0-
+      - run:
+          name: "Test"
+          command: |
+            mkdir -p ~/phpunit
+            ./bin/phpunit --testsuite unit --log-junit ~/phpunit/phpunit.xml
+      - store_test_results:
+          path: ~/phpunit
+      - store_artifacts:
+          path: ~/phpunit

.gitignore

@@ -1,3 +1,4 @@
 /bin
 /vendor
+/.phpunit.result.cache
 /composer.lock

composer.json

@@ -13,12 +13,14 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.2||^8.0",
     "phpunit/phpunit": "^6.4||^7.0||^8.0",
     "symfony/console": "^3.4||^4.4"
   },
   "require-dev": {
-    "drupal/coder": ">=8.2.12"
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+    "drupal/coder": "~8.3.12",
+    "phpcompatibility/php-compatibility": "^9.3"
   },
   "autoload": {
     "psr-4": {"PhpUnitFinder\\": "src/"}

phpcs.xml

@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="phpunit-finder">
-  <description>PHP CodeSniffer configuration for PHPUnit Finder</description>
-  <!-- folders to scan -->
+<ruleset name="pnx-project">
+  <description>PHP Codesniffer configuration.</description>
   <file>./src</file>
-  <file>./tests</file>
-  <!-- extensions to scan -->
+  <exclude-pattern>./tests/bootstrap.php</exclude-pattern>
   <arg name="extensions" value="php"/>
-  <!-- additional arguments -->
   <arg name="report" value="full"/>
-  <!-- inherit from coder -->
-  <rule ref="./vendor/drupal/coder/coder_sniffer/Drupal"/>
-  <!-- Additional detailed sniff configuration -->
-  <!-- You can determine sniff names by running with -s flag -->
-  <!-- Example 1 - ignore Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    <rule ref="Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
-      <severity>0</severity>
-    </rule>
-  // End example 1 -->
-  <!-- Example 2 - ignore rule for specific files
-    <rule ref="Drupal.NamingConventions.ValidVariableName.LowerCamelName">
-      <exclude-pattern>OfferNormalizerTrait.php</exclude-pattern>
-      <exclude-pattern>TimeOfUseValidationTrait.php</exclude-pattern>
-    </rule>
-  // End example 2 -->
+  <arg name="colors"/>
+  <arg value="sp"/>
+  <rule ref="Drupal">
+    <!-- ignore for now -->
+    <exclude name="Drupal.Classes.UseGlobalClass.RedundantUseStatement" />
+  </rule>
+  <rule ref="PHPCompatibility"/>
+  <config name="testVersion" value="7.3-"/>
 </ruleset>

src/FinderCommand.php

@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Util\Configuration;
-use ReflectionClass;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -43,7 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
       $suite = $config->getTestSuiteConfiguration($suiteName);
       foreach (new \RecursiveIteratorIterator($suite->getIterator()) as $test) {
         if ($test instanceof TestCase) {
-          $testFilenames[] = ((new ReflectionClass($test))->getFileName());
+          $testFilenames[] = ((new \ReflectionClass($test))->getFileName());
         }
       }
     }