WIP

Author: Stefan Boonstra

.github/workflows/testing-suite.yml

@@ -4,33 +4,28 @@ jobs:
   PHP:
     strategy:
       matrix:
-        image: [
-          'srcoder/development-php:php81-fpm',
-          'srcoder/development-php:php82-fpm'
-        ]
+        php-version: [8.1, 8.2, 8.3, 8.4]
     runs-on: ubuntu-latest
     container:
-      image: ${{ matrix.image }}
+      image: ${{ matrix.php-version == '8.1' && 'srcoder/development-php:php81-fpm' ||
+        matrix.php-version == '8.2' && 'srcoder/development-php:php82-fpm' ||
+        matrix.php-version == '8.3' && 'srcoder/development-php:php83-fpm' ||
+        matrix.php-version == '8.4' && 'srcoder/development-php:php84-fpm' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Testing Suite
-        # We are purposefully skipping the phpunit task since it is written for phpunit ^12 and php >= 8.3
+
+      - name: Install Dependencies
         run: |
           composer2 install --dev --prefer-dist --no-scripts --no-progress --optimize-autoloader --no-interaction -vvv
           composer2 show
-          composer2 exec -v grumphp -- run --tasks=composer,jsonlint,xmllint,yamllint,phpcs,phplint,phpmd,phpstan,securitychecker_enlightn
         shell: bash
-  PHPWithUnitTests:
-    runs-on: ubuntu-latest
-    container:
-      image: 'srcoder/development-php:php83-fpm'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Testing Suite
+
+      - name: Run GrumPHP Tasks
         run: |
-          composer2 install --dev --prefer-dist --no-scripts --no-progress --optimize-autoloader --no-interaction -vvv
-          composer2 show
-          composer2 exec -v grumphp -- run --tasks=composer,jsonlint,xmllint,yamllint,phpcs,phplint,phpmd,phpstan,phpunit,securitychecker_enlightn
+          if [[ "${{ matrix.php-version }}" == "8.1" || "${{ matrix.php-version }}" == "8.2" ]]; then
+            composer2 exec -v grumphp -- run --tasks=composer,jsonlint,xmllint,yamllint,phpcs,phplint,phpmd,phpstan,securitychecker_enlightn
+          else
+            composer2 exec -v grumphp -- run
+          fi
         shell: bash

src/ConfigResolver.php

@@ -21,11 +21,11 @@ class ConfigResolver
      * Constructor.
      *
      * @param ProjectTypeResolver $typeResolver
-     * @param string              $template
+     * @param string|null         $template
      */
     public function __construct(
         ProjectTypeResolver $typeResolver,
-        string $template = null
+        ?string $template = null
     ) {
         $this->typeResolver = $typeResolver;
         $this->template     = $template ?? $this->template;

src/Installer/ArchiveExcludeInstaller.php

@@ -12,6 +12,8 @@
 use Composer\Factory;
 use Composer\IO\IOInterface;
 use Composer\Json\JsonFile;
+use Exception;
+use Seld\JsonLint\ParsingException;
 use Youwe\FileMapping\FileMappingInterface;
 use Youwe\TestingSuite\Composer\MappingResolver;
 
@@ -50,15 +52,15 @@ class ArchiveExcludeInstaller implements InstallerInterface
      * @param MappingResolver $resolver
      * @param IOInterface     $io
      * @param JsonFile|null   $file
-     * @param string          $destination
+     * @param string |null    $destination
      * @param array|null      $defaults
      */
     public function __construct(
         MappingResolver $resolver,
         IOInterface $io,
-        JsonFile $file = null,
-        string $destination = null,
-        array $defaults = null
+        ?JsonFile $file = null,
+        ?string $destination = null,
+        ?array $defaults = null
     ) {
         $this->resolver    = $resolver;
         $this->io          = $io;
@@ -71,6 +73,7 @@ public function __construct(
      * Install.
      *
      * @return void
+     * @throws Exception
      */
     public function install(): void
     {

src/Installer/ConfigInstaller.php

@@ -34,7 +34,7 @@ class ConfigInstaller implements InstallerInterface
      */
     public function __construct(
         ConfigResolver $resolver,
-        JsonFile $file = null
+        ?JsonFile $file = null
     ) {
         $this->resolver = $resolver;
         $this->file     = $file ?? new JsonFile(Factory::getComposerFile());

src/Installer/PackagesInstaller.php

@@ -93,8 +93,8 @@ public function __construct(
         Composer $composer,
         ProjectTypeResolver $typeResolver,
         IOInterface $io,
-        DependencyInstaller $installer = null,
-        array $mapping = null
+        ?DependencyInstaller $installer = null,
+        ?array $mapping = null
     ) {
         $this->composer     = $composer;
         $this->typeResolver = $typeResolver;
@@ -135,6 +135,7 @@ public function install(): void
      * Whether a package has been required.
      *
      * @param string $packageName
+     * @param string $version
      *
      * @return bool
      */

src/ProjectTypeResolver.php

@@ -51,7 +51,7 @@ class ProjectTypeResolver
      * @param Composer   $composer
      * @param array|null $mapping
      */
-    public function __construct(Composer $composer, array $mapping = null)
+    public function __construct(Composer $composer, ?array $mapping = null)
     {
         $this->composer = $composer;
         $this->mapping  = $mapping ?? $this->mapping;