Update dependencies and CI

Steevan BARBOYON · steevanb · commit d83886038082 · 2025-05-23T19:45:41.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
+/.editorconfig export-ignore
 /.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
diff --git a/.github/actions/ci-env/action.yml b/.github/actions/ci-env/action.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,72 +1,18 @@
 name: CI
 on: [push]
 jobs:
-    phpcs:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - run: bin/ci/phpcs
-
-    phpstan:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php: [--php=8.1, --php=8.2, --php=8.3]
-        steps:
-            - uses: actions/checkout@v2
-            - uses: ./.github/actions/ci-env
-            - run: bin/ci/phpstan ${{ matrix.php }}
-
-    phpdd:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: ./.github/actions/ci-env
-            - run: bin/ci/phpdd
-
-    composer-require-checker:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: ./.github/actions/ci-env
-            - run: bin/ci/composer-require-checker
-
-    composer-validate:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - run: bin/ci/composer-validate
-
-    shellcheck:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - run: bin/ci/shellcheck
-
-    unused-scanner:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - run: bin/ci/unused-scanner
-
-    phpunit-symfony-6:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php: [--php=8.1, --php=8.2, --php=8.3]
-                symfony: [--symfony=6.1, --symfony=6.2, --symfony=6.3, --symfony=6.4]
-        steps:
-            - uses: actions/checkout@v2
-            - uses: ./.github/actions/ci-env
-            - run: bin/ci/phpunit ${{ matrix.php }} ${{ matrix.symfony }}
-
-    phpunit-symfony-7:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php: [--php=8.2, --php=8.3]
-                symfony: [--symfony=7.0, --symfony=7.1]
-        steps:
-            - uses: actions/checkout@v2
-            - uses: ./.github/actions/ci-env
-            - run: bin/ci/phpunit ${{ matrix.php }} ${{ matrix.symfony }}
+    validate:
+        runs-on: ubuntu-latest
+        steps:
+            -
+                name: Checkout repository
+                uses: actions/checkout@v4
+            -
+                name: Composer cache
+                uses: actions/cache@v3
+                with:
+                    path: vendor
+                    key: composer-${{ hashFiles('composer.json') }}
+                    restore-keys: composer-${{ hashFiles('composer.json') }}
+            - run: bin/ci/env
+            - run: bin/ci/validate --theme=summary
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,10 +12,12 @@ jobs:
         name: Release
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            -
+                name: Checkout repository
+                uses: actions/checkout@v4
             -
                 name: Composer cache
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: vendor
                     key: composer-${{ hashFiles('composer.json') }}
diff --git a/bin/ci/docker b/bin/ci/docker
@@ -6,5 +6,5 @@ readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 source "${ROOT_PATH}"/bin/common.inc.sh
 
 DOCKER_IMAGE_NAME="${CI_DOCKER_IMAGE_NAME}" \
-    DOCKER_FILE_PATH="${ROOT_PATH}"/docker/ci/Dockerfile \
+    DOCKERFILE_PATH="${ROOT_PATH}"/docker/ci \
     source "${ROOT_PATH}"/bin/docker-build.inc.bash
diff --git a/bin/ci/env b/bin/ci/env
@@ -6,4 +6,4 @@ readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 . "${ROOT_PATH}"/bin/common.inc.sh
 . "${ROOT_PATH}"/bin/dockerise.inc.bash
 
-"${ROOT_PATH}"/bin/composer install
+"${ROOT_PATH}"/bin/composer install --ansi
diff --git a/bin/ci/phpcs b/bin/ci/phpcs
@@ -10,13 +10,4 @@ if [ ! -d "${ROOT_PATH}"/var/ci/phpcs ]; then
     mkdir -p "${ROOT_PATH}"/var/ci/phpcs
 fi
 
-phpcs \
-    -p \
-    --warning-severity=0 \
-    --ignore=/vendor/,/var/,*Enum.php \
-    --bootstrap=config/ci/phpcs.php \
-    --standard="${COMPOSER_HOME}"/vendor/steevanb/php-code-sniffs/src/Steevanb/ruleset.xml \
-    --report=steevanb\\PhpCodeSniffs\\Reports\\Steevanb \
-    --cache="${ROOT_PATH}"/var/ci/phpcs/cache \
-    . \
-    "${@}"
+phpcs --standard="${ROOT_PATH}"/config/ci/phpcs.xml "${@}"
diff --git a/bin/ci/phpstan.php b/bin/ci/phpstan.php
@@ -14,7 +14,7 @@
 
 function createPhpstanProcesses(): ProcessInterfaceCollection
 {
-    $phpVersions = new StringCollection(['8.1', '8.2', '8.3']);
+    $phpVersions = new StringCollection(['8.1', '8.2', '8.3', '8.4']);
 
     $return = new ProcessInterfaceCollection();
     foreach ($phpVersions->toArray() as $loopPhpVersion) {
diff --git a/bin/ci/phpunit.inc.php b/bin/ci/phpunit.inc.php
@@ -10,17 +10,17 @@
 
 function createPhpunitProcesses(string $phpVersion = null, string $symfonyVersion = null): ProcessInterfaceCollection
 {
-    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['8.1', '8.2', '8.3']);
+    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['8.1', '8.2', '8.3', '8.4']);
     $symfonyVersions = new StringCollection(
-        is_string($symfonyVersion) ? [$symfonyVersion] : ['6.1', '6.2', '6.3', '6.4', '7.0', '7.1']
+        is_string($symfonyVersion) ? [$symfonyVersion] : ['6.1', '6.2', '6.3', '6.4', '7.0', '7.1', '7.2']
     );
 
     $return = new ProcessInterfaceCollection();
     foreach ($phpVersions->toArray() as $loopPhpVersion) {
         foreach ($symfonyVersions->toArray() as $loopSymfonyVersion) {
             if (
-                in_array($loopSymfonyVersion, ['7.0', '7.1'])
-                && in_array($loopPhpVersion, ['8.2', '8.3'], true) === false
+                in_array($loopSymfonyVersion, ['7.0', '7.1', '7.2'])
+                && in_array($loopPhpVersion, ['8.2', '8.3', '8.4'], true) === false
             ) {
                 continue;
             }
diff --git a/bin/ci/validate.php b/bin/ci/validate.php
@@ -19,4 +19,5 @@
     ->addProcess(new Process([__DIR__ . '/phpunit']))
     ->addProcess(new Process([__DIR__ . '/shellcheck']))
     ->addProcess(new Process([__DIR__ . '/unused-scanner']))
+    ->setRefreshInterval(100000)
     ->run(new ArgvInput($argv));
diff --git a/bin/common.inc.sh b/bin/common.inc.sh
@@ -2,5 +2,5 @@
 
 set -eu
 
-readonly CI_DOCKER_IMAGE_NAME="steevanb/php-collection:ci"
-readonly RELEASE_DOCKER_IMAGE_NAME="steevanb/php-collection:release"
+readonly CI_DOCKER_IMAGE_NAME=ghcr.io/steevanb/php-collection:ci
+readonly RELEASE_DOCKER_IMAGE_NAME=ghcr.io/steevanb/php-collection:release
diff --git a/bin/dev/generate-php-collections b/bin/dev/generate-php-collections
@@ -6,4 +6,4 @@ readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 source "${ROOT_PATH}"/bin/common.inc.sh
 BIN_DIR=bin/dev COMPOSER_HOME=/app/var/composer source "${ROOT_PATH}"/bin/dockerise.inc.bash
 
-php /app/bin/dev/generate-php-collections.php
+php8.4 /app/bin/dev/generate-php-collections.php
diff --git a/bin/docker-build.inc.bash b/bin/docker-build.inc.bash
@@ -15,12 +15,9 @@ function buildDockerImage() {
     DOCKER_BUILDKIT=1 \
         docker \
             build \
-                --file "${dockerFilePath}" \
-                --tag="${dockerImageName}" \
-                --build-arg DOCKER_UID="$(id -u)" \
-                --build-arg DOCKER_GID="$(id -g)" \
+                --tag "${dockerImageName}" \
                 ${refreshArguments} \
-                "${ROOT_PATH}"
+                "${dockerFilePath}"
 }
 
 function pushDockerImage() {
@@ -40,7 +37,7 @@ for param in "${@}"; do
     fi
 done
 
-buildDockerImage "${DOCKER_IMAGE_NAME}" "${DOCKER_FILE_PATH}"
+buildDockerImage "${DOCKER_IMAGE_NAME}" "${DOCKERFILE_PATH}"
 
 if [ "${push}" == true ]; then
     pushDockerImage "${DOCKER_IMAGE_NAME}"
diff --git a/bin/release/docker b/bin/release/docker
@@ -6,5 +6,5 @@ readonly ROOT_PATH="$(realpath "$(dirname "$(realpath "$0")")/../..")"
 source "${ROOT_PATH}"/bin/common.inc.sh
 
 DOCKER_IMAGE_NAME="${RELEASE_DOCKER_IMAGE_NAME}" \
-    DOCKER_FILE_PATH="${ROOT_PATH}"/docker/release/Dockerfile \
+    DOCKERFILE_PATH="${ROOT_PATH}"/docker/release \
     source "${ROOT_PATH}"/bin/docker-build.inc.bash
diff --git a/bridge/Symfony/Normalizer/ObjectCollectionDenormalizer.php b/bridge/Symfony/Normalizer/ObjectCollectionDenormalizer.php
@@ -20,8 +20,12 @@ class ObjectCollectionDenormalizer implements DenormalizerInterface, Denormalize
     use DenormalizerAwareTrait;
 
     /** @param array<mixed> $context */
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return
             is_subclass_of($type, AbstractObjectCollection::class)
             || is_subclass_of($type, AbstractObjectNullableCollection::class);
@@ -43,7 +47,7 @@ public function getSupportedTypes(?string $format): array
     public function denormalize(
         mixed $data,
         string $type,
-        string $format = null,
+        ?string $format = null,
         array $context = []
     ): AbstractObjectCollection|AbstractObjectNullableCollection {
         /** @var class-string<AbstractObjectCollection<object>|AbstractObjectNullableCollection<object|null>> $type */
diff --git a/bridge/Symfony/Normalizer/ScalarCollectionDenormalizer.php b/bridge/Symfony/Normalizer/ScalarCollectionDenormalizer.php
@@ -18,8 +18,12 @@
 class ScalarCollectionDenormalizer implements DenormalizerInterface
 {
     /** @param array<mixed> $context */
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
-    {
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
         return in_array(
             $type,
             [
@@ -54,7 +58,7 @@ public function getSupportedTypes(?string $format): array
     public function denormalize(
         mixed $data,
         string $type,
-        string $format = null,
+        ?string $format = null,
         array $context = []
     ): CollectionInterface {
         /**
diff --git a/config/ci/phpcs.php b/config/ci/phpcs.php
diff --git a/config/ci/phpcs.xml b/config/ci/phpcs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<ruleset name="phpcs">
+    <rule ref="/composer/common/vendor/steevanb/php-code-sniffs/src/Steevanb/ruleset.xml"/>
+    <arg name="warning-severity" value="0"/>
+    <exclude-pattern>/var</exclude-pattern>
+    <exclude-pattern>/vendor</exclude-pattern>
+    <arg name="report" value="steevanb\PhpCodeSniffs\Reports\Steevanb"/>
+    <arg name="cache" value="../../var/ci/phpcs/cache"/>
+    <arg name="report" value="full"/>
+    <file>../../</file>
+    <exclude-pattern>**/*Enum.php</exclude-pattern>
+    <rule ref="Steevanb.Uses.GroupUses">
+        <properties>
+            <property name="thirdLevelPrefixes" type="array">
+                <element value="Symfony\Component\"/>
+            </property>
+        </properties>
+    </rule>
+</ruleset>
diff --git a/config/ci/phpstan.neon b/config/ci/phpstan.neon
@@ -7,6 +7,9 @@ parameters:
         - ../../tests
     excludePaths:
         - ../../tests/Unit/ArrayTest.php
+    ignoreErrors:
+        # str_replace() accepts string|int|null
+        - "#Parameter \\#2 \\$replace of function str_replace expects array<string>\\|string, array<string, int\\|string\\|null> given#"
 includes:
     - /composer/common/vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - /composer/common/vendor/phpstan/phpstan-phpunit/extension.neon
diff --git a/config/ci/phpstan.php-8.4.neon b/config/ci/phpstan.php-8.4.neon
@@ -0,0 +1,4 @@
+includes:
+    - phpstan.neon
+parameters:
+    tmpDir: ../../var/ci/phpstan/php-8-4
diff --git a/config/ci/phpunit.php-8.4.xml b/config/ci/phpunit.php-8.4.xml
@@ -0,0 +1,10 @@
+<phpunit
+    cacheResultFile="../../var/ci/phpunit/php-8.4/.phpunit.result.cache"
+    colors="true"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>../../tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
diff --git a/docker/ci/composer.json b/docker/ci/composer.json
diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile
diff --git a/src/Maker/AbstractCollectionMaker.php b/src/Maker/AbstractCollectionMaker.php
diff --git a/src/ObjectCollection/DatePeriodCollection.php b/src/ObjectCollection/DatePeriodCollection.php
diff --git a/src/ObjectCollection/ReflectionAttributeNullableCollection.php b/src/ObjectCollection/ReflectionAttributeNullableCollection.php
diff --git a/src/ObjectCollection/ReflectionClassNullableCollection.php b/src/ObjectCollection/ReflectionClassNullableCollection.php
diff --git a/src/ObjectCollection/ReflectionEnumCollection.php b/src/ObjectCollection/ReflectionEnumCollection.php

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/.editorconfig export-ignore`
`1`	`2`	`/.github export-ignore`
`2`	`3`	`/.gitattributes export-ignore`
`3`	`4`	`/.gitignore export-ignore`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`function createPhpstanProcesses(): ProcessInterfaceCollection`
`16`	`16`	`{`
`17`		`- $phpVersions = new StringCollection(['8.1', '8.2', '8.3']);`
	`17`	`+ $phpVersions = new StringCollection(['8.1', '8.2', '8.3', '8.4']);`
`18`	`18`
`19`	`19`	`$return = new ProcessInterfaceCollection();`
`20`	`20`	`foreach ($phpVersions->toArray() as $loopPhpVersion) {`