Merge pull request #114 from ec-europa/feature/DQA-4440

DQA-4440: PHPunit 9.

Author: jonhy81

.drone.yml

@@ -1,29 +1,22 @@
 clone:
   git:
-    image: plugins/git:next
+    image: registry.fpfis.eu/drone-plugins/git:next
 
 workspace:
   base: /test
   path: qa-automation
 
 matrix:
-  COMPOSER_VERSION:
-    - 1
-    - 2
   COMPOSER_BOUNDARY:
     - lowest
     - highest
-  PHP_VERSION:
-    - 7.4
-    - 8.0
-    - 8.1
-    
+
 pipeline:
   composer-install:
     group: init
-    image: fpfis/httpd-php:${PHP_VERSION=7.3}-ci
+    image: registry.fpfis.eu/fpfis/httpd-php:8.1-ci
     commands:
-      - composer self-update --${COMPOSER_VERSION=1}
+      - composer self-update --2
       - composer install --ansi --no-suggest --no-progress
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
@@ -33,9 +26,9 @@ pipeline:
 
   composer-install-lowest:
     group: init
-    image: fpfis/httpd-php:${PHP_VERSION=7.3}-ci
+    image: registry.fpfis.eu/fpfis/httpd-php:8.1-ci
     commands:
-      - composer self-update --${COMPOSER_VERSION=1}
+      - composer self-update --2
       - composer update --prefer-${COMPOSER_BOUNDARY=lowest} --prefer-stable --ansi --no-suggest --no-progress
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
@@ -44,15 +37,15 @@ pipeline:
         COMPOSER_BOUNDARY: lowest
 
   phpcs:
-    image: fpfis/httpd-php:${PHP_VERSION=7.3}-ci
+    image: registry.fpfis.eu/fpfis/httpd-php:8.1-ci
     commands:
       - ./vendor/bin/phpcs -p
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
 
   phpunit:
-    image: fpfis/httpd-php:${PHP_VERSION=7.3}-ci
+    image: registry.fpfis.eu/fpfis/httpd-php:8.1-ci
     commands:
-      - ./vendor/bin/phpunit phpcs/
+      - ./vendor/bin/phpunit
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache

CHANGELOG.md

@@ -1,6 +1,6 @@
 # QA Automation change log
 
-## Version 8.2.0
+## Version 9.0.0
 DQA-4440: Drop dependency on grumphp.
 
 ## Version 8.1.8

README.md

@@ -14,20 +14,18 @@ analysis and/or reviews on Drupal projects.
 ```json
 {
   "require-dev": {
-    "ec-europa/qa-automation": "~4.0"
+    "ec-europa/qa-automation": "^9.0"
   }
 }
 ```
 
 ### 1.2 Install with composer command
 ```
-composer require --dev ec-europa/qa-automation:~4.0
+composer require --dev ec-europa/qa-automation:^9.0
 ```
 
 ## 2. Sniff list
 
-<!--- Start snifflist. -->
-
 ```
 The QualityAssurance standard contains 13 sniffs
 
@@ -48,4 +46,7 @@ QualityAssurance (13 sniffs)
   QualityAssurance.InstallFiles.InstallUpdateCallbacks
 ```
 
-<!--- End snifflist. -->
+To update this list run:
+```shell
+./vendor/bin/phpcs -e --standard=QualityAssurance
+```

composer.json

@@ -13,30 +13,21 @@
         "code review"
     ],
     "require": {
-        "php": ">=7.3",
+        "php": ">=8.1",
         "phpcompatibility/php-compatibility": "^9.1",
         "squizlabs/php_codesniffer": "^3.6",
         "drupal/coder": "^8.3",
         "cweagans/composer-patches": "^1.7",
         "composer/xdebug-handler": "^3.0",
         "phpmd/phpmd": "^2.10",
-        "symfony/yaml": "^4.4 | ^5.0 | ^6.0"
+        "symfony/yaml": "^5.0 | ^6.0"
     },
     "require-dev": {
-        "openeuropa/task-runner": "^1.0.0-beta6",
-        "phpunit/phpunit": "^5.7 | ^8.5.23 | ^9.0"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-0": {
             "QualityAssurance\\": "phpcs/QualityAssurance/"
-        },
-        "psr-4": {
-            "EcEuropa\\QaAutomation\\": "./src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "EcEuropa\\QaAutomation\\Tests\\": "./tests/"
         }
     },
     "extra": {

dist/library-conventions.compatible.yml

@@ -132,6 +132,9 @@ final public function testSniff()
             $this->markTestSkipped();
         }
 
+        // Simulate an assertion.
+        $this->assertEquals('1', '1');
+
         $sniffCode = Common::getSniffCode(get_class($this));
         list($standardName, $categoryName, $sniffName) = explode('.', $sniffCode);
 

dist/library-conventions.yml

@@ -23,4 +23,4 @@ no_forbidden_yet: true
 # Note: do not add the 'version' or 'project' properties yourself.
 # They will be added automatically by the packager on drupal.org.
 # version: 1.0
-# project: 'hello_world'
+# project: 'hello_world'