chore: cleanup

roxblnfk · roxblnfk · commit 9288ef029210 · 2025-04-03T03:20:11.000+04:00
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -11,21 +11,28 @@ on: # yamllint disable-line rule:truthy
       - master
 
 jobs:
-  code-coverage:
+  testing:
     timeout-minutes: 4
     runs-on: ${{ matrix.os }}
     concurrency:
       cancel-in-progress: true
-      group: code-coverage-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.php-version }}-${{ matrix.dependencies }}
+      group: testing-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.php-version }}-${{ matrix.dependencies }}
     strategy:
       fail-fast: true
       matrix:
         os:
           - 'ubuntu-latest'
         php-version:
-          - '8.4'
+          - '8.1'
+          - '8.2'
+          - '8.3'
         dependencies:
+          - lowest
           - locked
+          - highest
+        include:
+          - php-version: '8.4'
+            dependencies: highest
     steps:
       - name: 📦 Check out the codebase
         uses: actions/checkout@v4
@@ -35,7 +42,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           ini-values: error_reporting=E_ALL
-          coverage: xdebug
 
       - name: 🛠️ Setup problem matchers
         run: |
@@ -50,38 +56,24 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
-      - name: 🧪 Collect code coverage with Xdebug and PhpUnit
-        run: composer test:cc
-
-      - name: 📤 Upload code coverage report to Codecov
-        uses: codecov/codecov-action@v4.3.0
-        with:
-          files: .build/phpunit/logs/clover.xml
-          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true
+      - name: 🧪 Run tests
+        run: composer test
 
-  testing:
+  code-coverage:
     timeout-minutes: 4
     runs-on: ${{ matrix.os }}
     concurrency:
       cancel-in-progress: true
-      group: testing-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.php-version }}-${{ matrix.dependencies }}
+      group: code-coverage-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.php-version }}-${{ matrix.dependencies }}
     strategy:
       fail-fast: true
       matrix:
         os:
           - 'ubuntu-latest'
         php-version:
           - '8.1'
-          - '8.2'
-          - '8.3'
         dependencies:
-          - lowest
           - locked
-          - highest
-        include:
-          - php-version: '8.4'
-            dependencies: highest
     steps:
       - name: 📦 Check out the codebase
         uses: actions/checkout@v4
@@ -106,8 +98,15 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
-      - name: 🧪 Run tests
-        run: composer test
+      - name: 🧪 Collect code coverage with Xdebug and PhpUnit
+        run: composer test:cc
+
+      - name: 📤 Upload code coverage report to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: runtime/phpunit/logs/clover.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
 
   compile-phar:
     timeout-minutes: 4
diff --git a/composer.json b/composer.json
@@ -120,7 +120,7 @@
         "test:arch": "phpunit --color=always --testsuite=Arch",
         "test:cc": [
             "@putenv XDEBUG_MODE=coverage",
-            "phpunit --coverage-clover=.build/phpunit/logs/clover.xml --color=always"
+            "phpunit --coverage-clover=runtime/phpunit/logs/clover.xml --color=always"
         ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,7 +3,7 @@
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         cacheResultFile=".build/phpunit/result.cache"
+         cacheResultFile="runtime/phpunit/result.cache"
          failOnWarning="true"
          failOnRisky="true"
          executionOrder="random"
@@ -22,13 +22,13 @@
     </testsuites>
     <coverage>
         <report>
-            <html outputDirectory=".build/coverage"/>
-            <text outputFile=".build/coverage.txt"/>
-            <clover outputFile=".build/logs/clover.xml"/>
+            <html outputDirectory="runtime/coverage"/>
+            <text outputFile="runtime/coverage.txt"/>
+            <clover outputFile="runtime/logs/clover.xml"/>
         </report>
     </coverage>
     <logging>
-        <junit outputFile=".build/report.junit.xml"/>
+        <junit outputFile="runtime/report.junit.xml"/>
     </logging>
     <source>
         <include>
diff --git a/rector.php b/rector.php
@@ -24,9 +24,6 @@
         __DIR__ . '/src/Client',
     ])
     ->withSkipPath('src/Client/TrapHandle/ContextProvider/Source.php')
-    ->withPHPStanConfigs([
-        __DIR__ . '/phpstan-baseline.neon',
-    ])
     ->withImportNames(importNames: false, importDocBlockNames: true, importShortClasses: false, removeUnusedImports: true)
     ->withPhpVersion(PhpVersion::PHP_81)
     ->withPhpSets(php81: true)

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@`
`120`	`120`	`"test:arch": "phpunit --color=always --testsuite=Arch",`
`121`	`121`	`"test:cc": [`
`122`	`122`	`"@putenv XDEBUG_MODE=coverage",`
`123`		`- "phpunit --coverage-clover=.build/phpunit/logs/clover.xml --color=always"`
	`123`	`+ "phpunit --coverage-clover=runtime/phpunit/logs/clover.xml --color=always"`
`124`	`124`	`]`
`125`	`125`	`}`
`126`	`126`	`}`