[TASK] Move commands to composer and use them from ci and nix-shell

Author: extcode

.github/workflows/ci.yaml

@@ -79,23 +79,19 @@ jobs:
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Coding Guideline
-        run: .build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --using-cache=no --path-mode=intersection ./
+        run: composer project:cgl
 
   code-quality:
     runs-on: ubuntu-latest
     needs:
       - php-linting
     strategy:
       matrix:
-        include:
-          - php-version: '8.2'
-            typo3-version: '^14.1'
-          - php-version: '8.3'
-            typo3-version: '^14.1'
-          - php-version: '8.4'
-            typo3-version: '^14.1'
-          - php-version: '8.5'
-            typo3-version: '^14.1'
+        php-version:
+          - 8.2
+          - 8.3
+          - 8.4
+          - 8.5
     steps:
       - uses: actions/checkout@v4
 
@@ -112,41 +108,35 @@ jobs:
           && composer install --no-progress --no-ansi --no-interaction
 
       - name: Code Quality (by PHPStan)
-        run: .build/bin/phpstan analyse -c Build/phpstan.neon
+        run: composer project:phpstan
 
   tests-unit-and-functional:
     runs-on: ubuntu-latest
     needs:
       - coding-guideline
       - code-quality
+    strategy:
+      matrix:
+        php-version:
+          - 8.2
+          - 8.3
+          - 8.4
+          - 8.5
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v31
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
         with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: Run Unit Tests PHP8.2
-        run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-unit
-
-      - name: Run Unit Tests PHP8.3
-        run: nix-shell --arg phpVersion \"php83\" --pure --run project-test-unit
-
-      - name: Run Unit Tests PHP8.4
-        run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-unit
-
-      - name: Run Unit Tests PHP8.5
-        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-unit
-
-      - name: Run Functional Tests PHP8.2
-        run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-functional
+          php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
 
-      - name: Run Functional Tests PHP8.3
-        run: nix-shell --arg phpVersion \"php83\" --pure --run project-test-functional
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
 
-      - name: Run Functional Tests PHP8.4
-        run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-functional
+      - name: Run unit tests
+        run: composer project:test:unit
 
-      - name: Run Functional Tests PHP8.5
-        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-functional
+      - name: Run functional tests
+        run: export typo3DatabaseDriver=pdo_sqlite && composer project:test:functional
 

composer.json

@@ -74,6 +74,14 @@
         "typo3/testing-framework": "^9.5",
         "ssch/typo3-rector": "^3.11"
     },
+    "scripts": {
+        "project:cgl": ".build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --diff --using-cache=no --path-mode=intersection ./",
+        "project:cgl:fix": ".build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php",
+        "project:lint:php": "find ./*.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
+        "project:phpstan": "./.build/bin/phpstan analyse -c Build/phpstan.neon --memory-limit 256M",
+        "project:test:unit": ".build/bin/phpunit -c Build/phpunit.xml.dist --testsuite unit --display-warnings --display-deprecations --display-errors --display-notices",
+        "project:test:functional": ".build/bin/phpunit -c Build/phpunit.xml.dist --testsuite functional --display-warnings --display-deprecations --display-errors"
+    },
     "suggest": {
         "typo3/cms-dashboard": "^14.2",
         "typo3/cms-form": "^14.2"

shell.nix

@@ -19,8 +19,8 @@ let
   projectInstall = pkgs.writeShellApplication {
     name = "project-install";
     runtimeInputs = [
-      php
       composer
+      php
     ];
     text = ''
       composer update --prefer-dist --no-progress
@@ -31,71 +31,77 @@ let
     name = "project-cgl";
 
     runtimeInputs = [
+      composer
       php
     ];
 
     text = ''
-      ./.build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php -v --dry-run --diff
+      composer project:cgl
     '';
   };
 
   projectCglFix = pkgs.writeShellApplication {
     name = "project-cgl-fix";
 
     runtimeInputs = [
+      composer
       php
     ];
 
     text = ''
-      ./.build/bin/php-cs-fixer fix --config=Build/.php-cs-fixer.dist.php
+      composer project:cgl:fix
     '';
   };
 
-  projectLint = pkgs.writeShellApplication {
-    name = "project-lint";
+  projectLintPhp = pkgs.writeShellApplication {
+    name = "project-lint-php";
 
     runtimeInputs = [
+      composer
       php
     ];
 
     text = ''
-      find ./*.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
+      composer project:lint:php
     '';
   };
 
   projectPhpstan = pkgs.writeShellApplication {
     name = "project-phpstan";
 
     runtimeInputs = [
+      composer
       php
     ];
 
     text = ''
-      ./.build/bin/phpstan analyse -c Build/phpstan.neon --memory-limit 256M
+      composer project:phpstan
     '';
   };
 
   projectTestUnit = pkgs.writeShellApplication {
     name = "project-test-unit";
     runtimeInputs = [
+      composer
       php
       projectInstall
     ];
     text = ''
       project-install
-      .build/bin/phpunit -c Build/phpunit.xml.dist --testsuite unit --display-warnings --display-deprecations --display-errors --display-notices
+      composer project:test:unit
     '';
   };
 
   projectTestFunctional = pkgs.writeShellApplication {
     name = "project-test-functional";
     runtimeInputs = [
+      composer
       php
       projectInstall
     ];
     text = ''
       project-install
-      .build/bin/phpunit -c Build/phpunit.xml.dist --testsuite functional --display-warnings --display-deprecations --display-errors
+      composer project:test:functional
     '';
   };
 
@@ -105,10 +111,9 @@ in pkgs.mkShell {
     php
     composer
     projectInstall
-    projectPhpstan
     projectCgl
     projectCglFix
-    projectLint
+    projectLintPhp
     projectPhpstan
     projectTestUnit
     projectTestFunctional