wip

phphd · Nov 18, 2023 · b6795f3 · b6795f3
1 parent 1c3ced2
commit b6795f3
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
             -   name: 'Validate composer.json'
                 run: composer validate --strict --ansi
 
-    code-analysis:
+    code-style:
         needs: composer-validate
         name: ${{ matrix.actions.name }}
         runs-on: ubuntu-latest
@@ -45,14 +45,21 @@ jobs:
                     composer-options: "--optimize-autoloader"
 
             -   run: ${{ matrix.actions.run }}
-    test:
+    static-analysis:
         needs: composer-validate
-        name: PHPUnit
         runs-on: ubuntu-latest
+        name: ${{ matrix.actions.name }}
         strategy:
+            fail-fast: false
             matrix:
                 php: [ '8.0', '8.2' ]
                 dependencies: [ highest, lowest ]
+                actions:
+                    -   name: 'Psalm'
+                        run: vendor/bin/psalm --stats --no-progress --output-format=github --threads=$(nproc)
+
+                    -   name: 'PHPStan'
+                        run: vendor/bin/phpstan analyze --no-progress --error-format=github --ansi --configuration=phpstan.dist.neon ./
         steps:
             -   name: 'Checkout Code'
                 uses: actions/checkout@v4
@@ -70,11 +77,31 @@ jobs:
                     composer-options: "--optimize-autoloader"
                     dependency-versions: ${{ matrix.dependencies }}
 
-            -   name: 'Psalm'
-                run: vendor/bin/psalm --stats --no-progress --output-format=github --threads=$(nproc)
+            -   run: ${{ matrix.actions.run }}
+    test:
+        needs: composer-validate
+        name: PHPUnit
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [ '8.0', '8.2' ]
+                dependencies: [ highest, lowest ]
+        steps:
+            -   name: 'Checkout Code'
+                uses: actions/checkout@v4
+
+            -   name: 'Setup PHP'
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    coverage: none
+                    tools: composer:v2
 
-            -   name: 'PHPStan'
-                run: vendor/bin/phpstan analyze --no-progress --error-format=github --ansi --configuration=phpstan.dist.neon ./
+            -   name: 'Install Dependencies'
+                uses: "ramsey/composer-install@v2"
+                with:
+                    composer-options: "--optimize-autoloader"
+                    dependency-versions: ${{ matrix.dependencies }}
 
             -   name: 'Run PHPUnit'
                 run: vendor/bin/phpunit --testdox --colors=always --configuration=phpunit.xml.dist

diff --git a/Accessor/TestContainerAccessor.php b/Accessor/TestContainerAccessor.php
@@ -8,6 +8,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/** @internal */
 final class TestContainerAccessor
 {
     /** @param class-string<KernelTestCase> $testClassName */

diff --git a/Clearer/CacheItemPoolsClearer.php b/Clearer/CacheItemPoolsClearer.php
@@ -11,6 +11,7 @@
 use function array_map;
 use function sprintf;
 
+/** @internal */
 final class CacheItemPoolsClearer
 {
     public function __construct(

diff --git a/Clearer/TestClearer.php b/Clearer/TestClearer.php
@@ -16,6 +16,7 @@
 use function is_a;
 use function strtok;
 
+/** @internal */
 final class TestClearer
 {
     private TestContainerAccessor $containerAccessor;

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "vimeo/psalm": "^5.15",
         "psalm/plugin-phpunit": "^0.18.4",
         "symplify/easy-coding-standard": "^12.0",
-        "phphd/coding-standard": "@dev",
+        "phphd/coding-standard": "0.3.*",
         "phpstan/phpstan-phpunit": "^1.3"
     },
     "repositories": [