Upgraded codebase to php 8.4

shudd3r · shudd3r · commit dcea0d9f6497 · 2025-01-05T03:47:06.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,19 +2,19 @@ name: build
 on: [push, pull_request]
 
 jobs:
-  full-build:
-    name: "Coding standards & coverage tests"
+  quality-check:
+    name: "Coding standards & test coverage"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
         operating-system: ['ubuntu-latest']
         php-versions: ['7.4']
     env:
       extensions: pcov, dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
-      key: cache-v2
+      key: cache-v3
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: "Setup PHP extensions cache environment"
         id: cache-env
         uses: shivammathur/cache-extensions@v1
@@ -23,7 +23,7 @@ jobs:
           extensions: ${{ env.extensions }}
           key: ${{ env.key }}
       - name: "Cache PHP extensions"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -35,49 +35,88 @@ jobs:
           coverage: pcov
           extensions: ${{ env.extensions }}
           ini-values: assert.exception=1, zend.assertions=1
-      - name: "Validate composer.json"
-        run: composer validate
-      - name: "Setup composer cache"
-        uses: actions/cache@v2
+      - name: "Install Composer dependencies"
+        uses: ramsey/composer-install@v2
         with:
-          path: ~/.composer/cache
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: "Install highest dependencies"
-        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
+          dependency-versions: highest
+          composer-options: --prefer-stable
+          custom-cache-key: composer-${{ runner.os }}-php${{ matrix.php-versions }}-${{ hashFiles('**/composer.json') }}
       - name: "Coding standard Php-CS-Fixer checks"
         run: vendor/bin/php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src tests
       - name: "Coding standard CodeSniffer checks"
         run: |
-          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml src
-          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --ignore=*/code-samples/* tests
+          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --colors src
+          vendor/bin/phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --colors --ignore=*/code-samples/* tests
       - name: "Package skeleton validation"
         run: vendor/bin/polymorphine-skeleton check
       - name: "Run PhpUnit tests with coverage"
         run: |
-          mkdir -p build/logs
-          vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+          mkdir -p .dev/logs
+          vendor/bin/phpunit --coverage-clover .dev/logs/clover.xml
       - name: "Send coverage report to coveralls.io"
-        run: vendor/bin/php-coveralls -v
+        run: |
+          composer require php-coveralls/php-coveralls
+          vendor/bin/php-coveralls -v -o .dev/logs/coveralls-upload.json -x .dev/logs/clover.xml
         env:
-          COVERALLS_RUN_LOCALLY: 1
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
-  php-os-builds:
-    name: "PHP 8 tests"
+  platform-compatibility:
+    name: "Operating systems"
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
         operating-system: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        php-versions: ['8.0', '8.1']
+        php-versions: ['8.4']
     env:
       extensions: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
-      key: cache-v2
+      key: cache-v3
     steps:
       - name: "Turn off git EOL conversion"
         run: git config --global core.autocrlf false
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - name: "Setup PHP extensions cache environment"
+        id: cache-env
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: ${{ env.extensions }}
+          key: ${{ env.key }}
+      - name: "Cache PHP extensions"
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.cache-env.outputs.dir }}
+          key: ${{ steps.cache-env.outputs.key }}
+          restore-keys: ${{ steps.cache-env.outputs.key }}
+      - name: "Install PHP with extensions"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          coverage: none
+          extensions: ${{ env.extensions }}
+          ini-values: assert.exception=1, zend.assertions=1
+      - name: "Install Composer dependencies"
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: highest
+          composer-options: --prefer-stable
+          custom-cache-key: composer-${{ runner.os }}-php${{ matrix.php-versions }}-${{ hashFiles('**/composer.json') }}
+      - name: "Run PhpUnit tests (no coverage)"
+        run: vendor/bin/phpunit --no-coverage
+
+  php-versions:
+    name: "PHP versions"
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-latest']
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
+    env:
+      extensions: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
+      key: cache-v3
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v3
       - name: "Setup PHP extensions cache environment"
         id: cache-env
         uses: shivammathur/cache-extensions@v1
@@ -86,7 +125,7 @@ jobs:
           extensions: ${{ env.extensions }}
           key: ${{ env.key }}
       - name: "Cache PHP extensions"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -98,13 +137,11 @@ jobs:
           coverage: none
           extensions: ${{ env.extensions }}
           ini-values: assert.exception=1, zend.assertions=1
-      - name: "Setup composer cache"
-        uses: actions/cache@v2
+      - name: "Install Composer dependencies"
+        uses: ramsey/composer-install@v2
         with:
-          path: ~/.composer/cache
-          key: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-php${{ matrix.php-versions }}-composer-
-      - name: "Install highest dependencies"
-        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-stable
+          dependency-versions: highest
+          composer-options: --prefer-stable
+          custom-cache-key: composer-${{ runner.os }}-php${{ matrix.php-versions }}-${{ hashFiles('**/composer.json') }}
       - name: "Run PhpUnit tests (no coverage)"
         run: vendor/bin/phpunit --no-coverage
diff --git a/composer.json b/composer.json
@@ -13,10 +13,10 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.4 || ^8.0",
-        "psr/container": "^1.0"
+        "psr/container": "^1.1"
     },
     "require-dev": {
-        "polymorphine/dev": "0.2.*"
+        "polymorphine/dev": "0.5.*"
     },
     "autoload": {
         "psr-4": {
@@ -31,8 +31,8 @@
     "scripts": {
         "test-cs": [
             "php-cs-fixer --dry-run -v --config=cs-fixer.php.dist --path-mode=intersection fix src tests",
-            "phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml src",
-            "phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --ignore=*/code-samples/* tests"
+            "phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --colors src",
+            "phpcs --extensions=php --standard=vendor/polymorphine/dev/phpcs.xml --colors --ignore=*/code-samples/* tests"
         ],
         "test-php": "phpunit",
         "test-skeleton": "polymorphine-skeleton check"
diff --git a/cs-fixer.php.dist b/cs-fixer.php.dist
@@ -11,4 +11,4 @@
 
 use Polymorphine\Dev\FixerFactory;
 
-return FixerFactory::createFor('Polymorphine/Container', __DIR__);
+return FixerFactory::createFor(__FILE__);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,12 +2,13 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
-    cacheResultFile=".dev/temp/.phpunit.result.cache"
+    cacheResultFile=".dev/cache/.phpunit.result.cache"
     colors="true"
     bootstrap="vendor/autoload.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="DEV_TESTS_DIRECTORY" value=".dev/tests" force="true" />
     </php>
     <testsuites>
         <testsuite name="Polymorphine/Container tests">
diff --git a/src/Setup.php b/src/Setup.php
@@ -28,7 +28,7 @@ class Setup
     /**
      * @param Build|null $build
      */
-    public function __construct(Build $build = null)
+    public function __construct(?Build $build = null)
     {
         $this->build = $build ?: new Build();
     }
diff --git a/tests/Setup/EntryTest.php b/tests/Setup/EntryTest.php
@@ -134,7 +134,7 @@ private function builder(): Doubles\MockedBuild
         return new Doubles\MockedBuild();
     }
 
-    private function entry(string $id, Doubles\MockedBuild $build = null): Entry
+    private function entry(string $id, ?Doubles\MockedBuild $build = null): Entry
     {
         return new Entry($id, $build ?? $this->builder());
     }

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@`
`11`	`11`
`12`	`12`	`use Polymorphine\Dev\FixerFactory;`
`13`	`13`
`14`		`-return FixerFactory::createFor('Polymorphine/Container', __DIR__);`
	`14`	`+return FixerFactory::createFor(__FILE__);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class Setup`
`28`	`28`	`/**`
`29`	`29`	`* @param Build\|null $build`
`30`	`30`	`*/`
`31`		`- public function __construct(Build $build = null)`
	`31`	`+ public function __construct(?Build $build = null)`
`32`	`32`	`{`
`33`	`33`	`$this->build = $build ?: new Build();`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private function builder(): Doubles\MockedBuild`
`134`	`134`	`return new Doubles\MockedBuild();`
`135`	`135`	`}`
`136`	`136`
`137`		`- private function entry(string $id, Doubles\MockedBuild $build = null): Entry`
	`137`	`+ private function entry(string $id, ?Doubles\MockedBuild $build = null): Entry`
`138`	`138`	`{`
`139`	`139`	`return new Entry($id, $build ?? $this->builder());`
`140`	`140`	`}`