Merge pull request #327 from laminas/1.28.x-merge-up-into-2.0.x_je7Wpu2i

Merge release 1.28.0 into 2.0.x

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:21.7.3-alpine as compiler
+FROM node:21.7.3-alpine AS compiler
 
 RUN mkdir -p /usr/local/source
 WORKDIR /usr/local/source

README.md

@@ -26,6 +26,7 @@ Currently, it identifies the following:
 - PHPUnit tests based on the presence of `phpunit.xml.dist` or `phpunit.xml` files.
 - phpcs checks based on the presence of `phpcs.xml.dist` or `phpcs.xml` files.
 - Psalm checks based on the presence of `psalm.xml.dist` or `psalm.xml` files.
+- PHPStan checks based on the presence of `phpstan.neon`, `phpstan.neon.dist` or `phpstan.dist.neon` files.
 - ComposerRequireChecker checks based on the presence of `composer-require-checker.json` file.
 - phpbench benchmarks based on the presence of a `phpbench.json`.
 - Infection mutation tests based on the presence of `infection.json` or `infection.json.dist`. In case that `roave/infection-static-analysis-plugin` is installed, this will be used instead.

laminas-ci.schema.json

@@ -256,6 +256,7 @@
                 "8.1",
                 "8.2",
                 "8.3",
+                "8.4",
                 "@default"
             ]
         },

package.json

@@ -13,7 +13,7 @@
     },
     "dependencies": {
         "@actions/core": "^1.10.0",
-        "@cfworker/json-schema": "^1.12.5",
+        "@cfworker/json-schema": "^2.0.0",
         "@types/semver": "^7.3.13",
         "semver": "^7.3.8"
     },
@@ -33,7 +33,7 @@
         "source-map-loader": "^5.0.0",
         "ts-jest": "^29.0.3",
         "ts-node": "^10.9.1",
-        "typescript": "~5.5.0",
+        "typescript": "~5.7.0",
         "webpack": "^5.74.0",
         "webpack-cli": "^5.0.0"
     }

src/config/app.spec.ts

@@ -24,7 +24,7 @@ describe('config/app', () => {
             ${'~8.1'}                      | ${[ '8.1' ]}
             ${'~8.1.0'}                    | ${[ '8.1' ]}
             ${'~8.1.12'}                   | ${[ '8.1' ]}
-            ${'^8.0 || ~8.0.0 || ~8.1.12'} | ${[ '8.0', '8.1', '8.2', '8.3' ]}
+            ${'^8.0 || ~8.0.0 || ~8.1.12'} | ${[ '8.0', '8.1', '8.2', '8.3', '8.4' ]}
             ${'<=8.1.0'}                   | ${[ '8.0', '8.1' ]}
         `('for "$constraint" === $expected', ({constraint, expected}) => {
             expect(gatherVersions({require: {php: constraint}})).toEqual(expected);

src/config/app.ts

@@ -1,8 +1,9 @@
 import fs, {PathLike} from 'fs';
 import semver from 'semver';
 import parseJsonFile from '../json';
-import {isToolRunningContainerDefaultPhpVersion, Tool, ToolExecutionType} from '../tools';
+import {isToolRunningContainerDefaultPhpVersion, Tool} from '../tools';
 import {Logger} from '../logging';
+import {ToolExecutionType} from '../enum/toolExecutionType';
 import {
     CONTAINER_DEFAULT_PHP_VERSION,
     CURRENT_STABLE,

src/enum/toolExecutionType.ts

@@ -0,0 +1,13 @@
+export enum ToolExecutionType {
+    /**
+     * @description Executed on every supported PHP version with lowest & latest dependencies.
+     *              In case, a lock-file is present, the minimum supported PHP version will also run with LOCKED
+     *              dependencies.
+     */
+    MATRIX = 'matrix',
+
+    /**
+     * @description Executed on the minimum PHP version with either LOCKED or LATEST dependencies.
+     */
+    STATIC = 'static',
+}

src/enum/toolType.ts

@@ -0,0 +1,4 @@
+export enum ToolType {
+    LINTER = 'linter',
+    CODE_CHECK = 'code_check',
+}

src/tools.ts

@@ -1,27 +1,17 @@
 import fs, {PathLike} from 'fs';
 import {Config} from './config/app';
-import {ComposerJson} from './config/composer';
-import parseJsonFile from './json';
 import {CONTAINER_DEFAULT_PHP_VERSION} from './config/php';
-
-export enum ToolExecutionType {
-    /**
-     * @description Executed on every supported PHP version with lowest & latest dependencies.
-     *              In case, a lock-file is present, the minimum supported PHP version will also run with LOCKED
-     *              dependencies.
-     */
-    MATRIX = 'matrix',
-
-    /**
-     * @description Executed on the minimum PHP version with either LOCKED or LATEST dependencies.
-     */
-    STATIC = 'static',
-}
-
-enum ToolType {
-    LINTER = 'linter',
-    CODE_CHECK = 'code_check',
-}
+import {PHPUnitTool} from './tools/phpunit';
+import {InfectionTool} from './tools/infection';
+import {PhpCodeSnifferTool} from './tools/codesniffer';
+import {PsalmTool} from './tools/psalm';
+import {ComposerRequireCheckerTool} from './tools/composerRequireChecker';
+import {PhpBenchTool} from './tools/phpbench';
+import {CodeceptionTool} from './tools/codeception';
+import {PhpCsFixerTool} from './tools/phpCsFixer';
+import {PHPStanTool} from './tools/phpstan';
+import {ToolExecutionType} from './enum/toolExecutionType';
+import {ToolType} from './enum/toolType';
 
 export type Tool = {
     executionType: ToolExecutionType,
@@ -36,16 +26,6 @@ export type ToolRunningContainerDefaultPhpVersion = Tool & {
     php: typeof CONTAINER_DEFAULT_PHP_VERSION,
 }
 
-function detectInfectionCommand(): string {
-    const composerJson: ComposerJson = parseJsonFile('composer.json', true) as ComposerJson;
-
-    if (composerJson['require-dev']?.['roave/infection-static-analysis-plugin'] !== undefined) {
-        return './vendor/bin/roave-infection-static-analysis-plugin';
-    }
-
-    return './vendor/bin/infection';
-}
-
 function backwardCompatibilityCheckTool(config: Config): ToolRunningContainerDefaultPhpVersion | null {
     if (!config.backwardCompatibilityCheck) {
         return null;
@@ -70,14 +50,14 @@ export default function createTools(config: Config): Array<Tool> {
         {
             executionType : ToolExecutionType.STATIC,
             name          : 'Documentation Linting',
-            command       : 'markdownlint doc/book/**/*.md',
+            command       : "markdownlint 'doc/book/**/*.md'",
             filesToCheck  : [ 'doc/book/' ],
             toolType      : ToolType.LINTER,
         },
         {
             executionType : ToolExecutionType.STATIC,
             name          : 'Documentation Linting',
-            command       : 'markdownlint docs/book/**/*.md',
+            command       : "markdownlint 'docs/book/**/*.md'",
             filesToCheck  : [ 'docs/book/' ],
             toolType      : ToolType.LINTER,
         },
@@ -95,65 +75,15 @@ export default function createTools(config: Config): Array<Tool> {
             filesToCheck  : [ 'README.md' ],
             toolType      : ToolType.LINTER,
         },
-        {
-            executionType     : ToolExecutionType.MATRIX,
-            name              : 'PHPUnit',
-            command           : './vendor/bin/phpunit',
-            filesToCheck      : [ 'phpunit.xml.dist', 'phpunit.xml' ],
-            toolType          : ToolType.CODE_CHECK,
-            lintConfigCommand : 'xmllint --schema vendor/phpunit/phpunit/phpunit.xsd',
-        },
-        {
-            executionType : ToolExecutionType.STATIC,
-            name          : 'Infection',
-            command       : detectInfectionCommand(),
-            filesToCheck  : [ 'infection.json', 'infection.json.dist' ],
-            toolType      : ToolType.CODE_CHECK,
-        },
-        {
-            executionType     : ToolExecutionType.STATIC,
-            name              : 'PHPCodeSniffer',
-            command           : './vendor/bin/phpcs -q --report=checkstyle | cs2pr',
-            filesToCheck      : [ 'phpcs.xml', 'phpcs.xml.dist' ],
-            toolType          : ToolType.CODE_CHECK,
-            lintConfigCommand : 'xmllint --schema vendor/squizlabs/php_codesniffer/phpcs.xsd',
-        },
-        {
-            executionType     : ToolExecutionType.STATIC,
-            name              : 'Psalm',
-            command           : './vendor/bin/psalm --shepherd --stats --output-format=github --no-cache',
-            filesToCheck      : [ 'psalm.xml.dist', 'psalm.xml' ],
-            toolType          : ToolType.CODE_CHECK,
-            lintConfigCommand : 'xmllint --schema vendor/vimeo/psalm/config.xsd',
-        },
-        {
-            executionType : ToolExecutionType.STATIC,
-            name          : 'Composer Require Checker',
-            command       : './vendor/bin/composer-require-checker check --config-file=composer-require-checker.json -n -v composer.json',
-            filesToCheck  : [ 'composer-require-checker.json' ],
-            toolType      : ToolType.CODE_CHECK,
-        },
-        {
-            executionType : ToolExecutionType.STATIC,
-            name          : 'PHPBench',
-            command       : './vendor/bin/phpbench run --revs=2 --iterations=2 --report=aggregate',
-            filesToCheck  : [ 'phpbench.json' ],
-            toolType      : ToolType.CODE_CHECK,
-        },
-        {
-            executionType : ToolExecutionType.STATIC,
-            name          : 'Codeception',
-            command       : './vendor/bin/codecept run',
-            filesToCheck  : [ 'codeception.yml.dist', 'codeception.yml' ],
-            toolType      : ToolType.CODE_CHECK,
-        },
-        {
-            executionType : ToolExecutionType.STATIC,
-            name          : 'PHP CS Fixer',
-            command       : './vendor/bin/php-cs-fixer fix -v --diff --dry-run',
-            filesToCheck  : [ '.php-cs-fixer.php', '.php-cs-fixer.dist.php' ],
-            toolType      : ToolType.CODE_CHECK,
-        },
+        PHPUnitTool,
+        InfectionTool,
+        PhpCodeSnifferTool,
+        PsalmTool,
+        ComposerRequireCheckerTool,
+        PhpBenchTool,
+        CodeceptionTool,
+        PhpCsFixerTool,
+        PHPStanTool,
         backwardCompatibilityCheckTool(config),
     ].filter((tool) => tool !== null) as Tool[];
 

src/tools/codeception.ts

@@ -0,0 +1,10 @@
+import {ToolExecutionType} from '../enum/toolExecutionType';
+import {ToolType} from '../enum/toolType';
+
+export const CodeceptionTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'Codeception',
+    command       : './vendor/bin/codecept run',
+    filesToCheck  : [ 'codeception.yml.dist', 'codeception.yml' ],
+    toolType      : ToolType.CODE_CHECK,
+};

src/tools/codesniffer.ts

@@ -0,0 +1,11 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PhpCodeSnifferTool = {
+    executionType     : ToolExecutionType.STATIC,
+    name              : 'PHPCodeSniffer',
+    command           : './vendor/bin/phpcs -q --report=checkstyle | cs2pr',
+    filesToCheck      : [ 'phpcs.xml', 'phpcs.xml.dist' ],
+    toolType          : ToolType.CODE_CHECK,
+    lintConfigCommand : 'xmllint --schema vendor/squizlabs/php_codesniffer/phpcs.xsd',
+};

src/tools/composerRequireChecker.ts

@@ -0,0 +1,10 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const ComposerRequireCheckerTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'Composer Require Checker',
+    command       : './vendor/bin/composer-require-checker check --config-file=composer-require-checker.json -n -v composer.json',
+    filesToCheck  : [ 'composer-require-checker.json' ],
+    toolType      : ToolType.CODE_CHECK,
+};

src/tools/infection.ts

@@ -0,0 +1,22 @@
+import {ToolType} from '../enum/toolType';
+import {ComposerJson} from '../config/composer';
+import parseJsonFile from '../json';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const InfectionTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'Infection',
+    command       : detectInfectionCommand(),
+    filesToCheck  : [ 'infection.json', 'infection.json.dist' ],
+    toolType      : ToolType.CODE_CHECK,
+};
+
+function detectInfectionCommand(): string {
+    const composerJson: ComposerJson = parseJsonFile('composer.json', true) as ComposerJson;
+
+    if (composerJson['require-dev']?.['roave/infection-static-analysis-plugin'] !== undefined) {
+        return './vendor/bin/roave-infection-static-analysis-plugin';
+    }
+
+    return './vendor/bin/infection';
+}

src/tools/phpCsFixer.ts

@@ -0,0 +1,10 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PhpCsFixerTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'PHP CS Fixer',
+    command       : './vendor/bin/php-cs-fixer fix -v --diff --dry-run',
+    filesToCheck  : [ '.php-cs-fixer.php', '.php-cs-fixer.dist.php' ],
+    toolType      : ToolType.CODE_CHECK,
+};

src/tools/phpbench.ts

@@ -0,0 +1,10 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PhpBenchTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'PHPBench',
+    command       : './vendor/bin/phpbench run --revs=2 --iterations=2 --report=aggregate',
+    filesToCheck  : [ 'phpbench.json' ],
+    toolType      : ToolType.CODE_CHECK,
+};

src/tools/phpstan.ts

@@ -0,0 +1,10 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PHPStanTool = {
+    executionType : ToolExecutionType.STATIC,
+    name          : 'PHPStan',
+    command       : './vendor/bin/phpstan analyse --error-format=github --ansi --no-progress',
+    filesToCheck  : [ 'phpstan.neon', 'phpstan.neon.dist', 'phpstan.dist.neon' ],
+    toolType      : ToolType.CODE_CHECK,
+};

src/tools/phpunit.ts

@@ -0,0 +1,11 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PHPUnitTool = {
+    executionType     : ToolExecutionType.MATRIX,
+    name              : 'PHPUnit',
+    command           : './vendor/bin/phpunit',
+    filesToCheck      : [ 'phpunit.xml.dist', 'phpunit.xml' ],
+    toolType          : ToolType.CODE_CHECK,
+    lintConfigCommand : 'xmllint --schema vendor/phpunit/phpunit/phpunit.xsd',
+};

src/tools/psalm.ts

@@ -0,0 +1,11 @@
+import {ToolType} from '../enum/toolType';
+import {ToolExecutionType} from '../enum/toolExecutionType';
+
+export const PsalmTool = {
+    executionType     : ToolExecutionType.STATIC,
+    name              : 'Psalm',
+    command           : './vendor/bin/psalm --shepherd --stats --output-format=github --no-cache',
+    filesToCheck      : [ 'psalm.xml.dist', 'psalm.xml' ],
+    toolType          : ToolType.CODE_CHECK,
+    lintConfigCommand : 'xmllint --schema vendor/vimeo/psalm/config.xsd',
+};

tests/code-check-phpstan-alternative-dist/.laminas-ci.json

@@ -0,0 +1,3 @@
+{
+    "stablePHP": "8.3"
+}