Release v3

.ddev/commands/web/php-cs-fixer

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: run PHP-CS-Fixer
+## Usage: php-cs-fixer
+## Example: ddev php-cs-fixer <path-to-files>
+
+php vendor/bin/php-cs-fixer fix "$@"

.ddev/commands/web/rector

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: run rector
+## Usage: rector
+## Example: ddev rector <path-to-files>
+
+php vendor/bin/rector process --config .rector.php "$@"

.github/workflows/composer.yml

@@ -0,0 +1,28 @@
+name: Composer
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  composer:
+    name: Validation
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Validate composer
+        run: composer validate --strict --no-check-all

.github/workflows/deploy.yml

@@ -155,7 +155,7 @@ jobs:
         env:
           GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
           GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
-        run: bash .github/workflows/update-dist-repo.sh
+        run: bash .github/workflows/scripts/update-dist-repo.sh
 
   create-github-release:
     runs-on: ubuntu-latest

.github/workflows/phar_build_and_update.yml

@@ -1,7 +1,8 @@
----
 name: Phar build and update test
 
-on: [push, pull_request]
+on:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/php-cs-fixer.yml

@@ -1,10 +1,7 @@
 name: PHP-CS-Fixer
 
 on:
-  push:
-  pull_request:
   workflow_call:
-  # Allow manually triggering the workflow.
   workflow_dispatch:
 
 jobs:

.github/workflows/php_compatibility.yml

@@ -1,8 +1,8 @@
----
 name: PHP Compatibility
+
 on:
-  - push
-  - pull_request
+  workflow_call:
+  workflow_dispatch:
 
 env:
   MIN_PHP_VERSION: 7.4

.github/workflows/phpstan.yml

@@ -1,10 +1,7 @@
 name: PHPStan
 
 on:
-  push:
-  pull_request:
   workflow_call:
-  # Allow manually triggering the workflow.
   workflow_dispatch:
 
 jobs:

.github/workflows/rector.yml

@@ -0,0 +1,36 @@
+name: Rector
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  php-cs-fixer:
+    name: Rector
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
+
+      - name: PHP-CS-Fixer
+        run: php vendor/bin/rector process --config .rector.php --dry-run

.github/workflows/test-magento-open-source.yml

@@ -1,6 +1,8 @@
 name: Test Magento Open Source 1.9 with PHP 7.4
 
-on: [push, pull_request]
+on:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   test-magento-open-source-1-9:
@@ -20,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Linux Setup
-        run: ./.github/workflows/linux-setup.sh
+        run: ./.github/workflows/scripts/linux-setup.sh
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -68,7 +70,7 @@ jobs:
         run: echo "N98_MAGERUN_TEST_MAGENTO_ROOT=${{ github.workspace }}/magento" >> $GITHUB_ENV
 
       - name: Run tests
-        run: php -f vendor/bin/phpunit
+        run: php vendor/bin/phpunit --configuration .phpunit.dist.xml
         env:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 

.github/workflows/test-openmage-20.0.yml

@@ -1,6 +1,8 @@
 name: Test OpenMage 20.0.x
 
-on: [push, pull_request]
+on:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   test-openmage-20-0-marix:
@@ -27,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Linux Setup
-        run: ./.github/workflows/linux-setup.sh
+        run: ./.github/workflows/scripts/linux-setup.sh
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -75,7 +77,7 @@ jobs:
         run: echo "N98_MAGERUN_TEST_MAGENTO_ROOT=${{ github.workspace }}/magento" >> $GITHUB_ENV
 
       - name: Run tests
-        run: php -f vendor/bin/phpunit
+        run: php vendor/bin/phpunit --configuration .phpunit.dist.xml
         env:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 

.github/workflows/test-openmage-20.1.yml

@@ -1,7 +1,8 @@
-
 name: Test OpenMage 20.1.x
 
-on: [push, pull_request]
+on:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   test-openmage-20-1-matrix:
@@ -28,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Linux Setup
-        run: ./.github/workflows/linux-setup.sh
+        run: ./.github/workflows/scripts/linux-setup.sh
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -76,7 +77,7 @@ jobs:
         run: echo "N98_MAGERUN_TEST_MAGENTO_ROOT=${{ github.workspace }}/magento" >> $GITHUB_ENV
 
       - name: Run tests
-        run: php -f vendor/bin/phpunit
+        run: php vendor/bin/phpunit --configuration .phpunit.dist.xml
         env:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 

.github/workflows/test-openmage-20.10.yml

@@ -1,7 +1,8 @@
-
 name: Test OpenMage 20.10.x
 
-on: [push, pull_request]
+on:
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   test-openmage-20-9-matrix:
@@ -10,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openmage_version: ["20.10.0"]
+        openmage_version: ["20.10.2"]
         php_version: ["8.3", "8.2", "8.1", "7.4"]
         mysql_version: ["8.0", "5.7"]
 
@@ -28,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Linux Setup
-        run: ./.github/workflows/linux-setup.sh
+        run: ./.github/workflows/scripts/linux-setup.sh
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -76,7 +77,7 @@ jobs:
         run: echo "N98_MAGERUN_TEST_MAGENTO_ROOT=${{ github.workspace }}/magento" >> $GITHUB_ENV
 
       - name: Run tests
-        run: php -f vendor/bin/phpunit
+        run: php vendor/bin/phpunit --configuration .phpunit.dist.xml
         env:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 

.github/workflows/workflow.yml

@@ -0,0 +1,54 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  composer:
+    name: Composer
+    uses: ./.github/workflows/composer.yml
+
+  php_compatibility:
+    name: Composer
+    uses: ./.github/workflows/php_compatibility.yml
+
+  php-cs-fixer:
+    name: PHP CS Fixer
+    needs: [composer]
+    uses: ./.github/workflows/php-cs-fixer.yml
+
+  phpstan:
+    name: PHPStan
+    needs: [composer, php-cs-fixer]
+    uses: ./.github/workflows/phpstan.yml
+
+  rector:
+    name: Rector
+    needs: [composer, php-cs-fixer]
+    uses: ./.github/workflows/rector.yml
+
+  unit_tests_magento_opensource:
+    name: PHPUnit Magento1
+    needs: [composer, php-cs-fixer, phpstan, rector]
+    uses: ./.github/workflows/test-magento-open-source.yml
+
+  unit_tests_om_20_0:
+    name: PHPUnit OpenMage 20.0
+    needs: [composer, php-cs-fixer, phpstan, rector]
+    uses: ./.github/workflows/test-openmage-20.0.yml
+
+  unit_tests_om_20_1:
+    name: PHPUnit OpenMage 20.1
+    needs: [composer, php-cs-fixer, phpstan, rector]
+    uses: ./.github/workflows/test-openmage-20.1.yml
+
+  unit_tests_om_20_10:
+    name: PHPUnit OpenMage 20.10
+    needs: [composer, php-cs-fixer, phpstan, rector]
+    uses: ./.github/workflows/test-openmage-20.10.yml
+
+  build_phar:
+    name: Build Phar
+    needs: [composer, php-cs-fixer, phpstan, rector, unit_tests_magento_opensource, unit_tests_om_20_0, unit_tests_om_20_1, unit_tests_om_20_10]
+    uses: ./.github/workflows/phar_build_and_update.yml

.php-cs-fixer.dist.php

@@ -1,17 +1,33 @@
 <?php
 
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
+declare(strict_types=1);
 
-$finder = (new Finder())
-    ->in('.');
-
-return (new Config())
+$config = new PhpCsFixer\Config();
+return $config
     ->setRiskyAllowed(true)
-    ->setFinder($finder)
     ->setRules([
-        'array_syntax' => ['syntax' => 'short'],
-        'modernize_types_casting' => true,
+        // see https://cs.symfony.com/doc/ruleSets/PER-CS2.0.html
+        '@PER-CS2.0' => true,
+        // RISKY: Use && and || logical operators instead of and or.
         'logical_operators' => true,
+        // RISKY: Replaces intval, floatval, doubleval, strval and boolval function calls with according type casting operator.
+        'modernize_types_casting' => true,
+        // PHP84: Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
+        'nullable_type_declaration_for_default_null_value' => true,
+        // Convert double quotes to single quotes for simple strings.
         'single_quote' => true,
-    ]);
+        // Arguments lists, array destructuring lists, arrays that are multi-line, match-lines and parameters lists must have a trailing comma.
+        // removed "match" and "parameters" for PHP7
+        // see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8308
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'array_destructuring', 'arrays']],
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in([
+                __DIR__ . '/src',
+                __DIR__ . '/tests',
+            ])
+            ->name('*.php')
+            ->ignoreDotFiles(true)
+            ->ignoreVCS(true)
+    );