fix(test): Fixed issue with CI and psalm

Author: TheCelavi

.github/workflows/ci.yaml

@@ -1,7 +1,7 @@
 name: Run CI build script
 
 on:
-    workflow_call: 
+    workflow_call:
     pull_request:
         types: [ opened, reopened, edited, synchronize ]
         branches:
@@ -17,6 +17,9 @@ jobs:
                 with:
                     ref: ${{ github.event.pull_request.head.sha }}
 
+            -   name: Mark repository as safe
+                run: git config --global --add safe.directory $GITHUB_WORKSPACE
+
             -   name: Setup python
                 uses: actions/setup-python@v4
                 id: setup-python
@@ -34,11 +37,13 @@ jobs:
                 run: |
                     pipenv install
                     pipenv run python bin/ci.py --verbose --teardown
-                    
-            - name: Upload Scrutinizer coverage
-              uses: sudo-bot/action-scrutinizer@latest
+                env:
+                    COMPOSER_ROOT_VERSION: ${{ vars.COMPOSER_ROOT_VERSION }}
+
+            -   name: Upload Scrutinizer coverage
+                uses: sudo-bot/action-scrutinizer@latest
                 # Do not run this step on forked versions of the main repository (example: contributor forks)
-              if: github.repository == 'runopencode/query-resources-loader-bundle'
-              with:
-                  cli-args: "--format=php-clover build/logs/clover.xml --revision=${{ github.event.pull_request.head.sha || github.sha }}"                    
+                if: github.repository == 'runopencode/query-resources-loader-bundle'
+                with:
+                    cli-args: "--format=php-clover build/logs/clover.xml --revision=${{ github.event.pull_request.head.sha || github.sha }}"                    
 

.github/workflows/release.yaml

@@ -26,6 +26,10 @@ jobs:
                 uses: actions/checkout@v4
                 with:
                     fetch-depth: 0
+                    
+            -   name: Mark repository as safe
+                run: git config --global --add safe.directory $GITHUB_WORKSPACE                    
+                    
             -   name: Setup Node.js
                 uses: actions/setup-node@v4
                 with:
@@ -34,6 +38,6 @@ jobs:
                 run: npm clean-install
             -   name: Release
                 env:
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
                 run: npx semantic-release                
 

bin/ci.py

@@ -32,12 +32,12 @@ def ci(verbose, install, teardown):
     commands = {
         'composer install': ('XDEBUG_MODE=off composer install', False),
         'composer run phpunit': ('XDEBUG_MODE=coverage composer run phpunit', False),    
-        'composer run php-cs-fixer': ('composer run php-cs-fixer', False),
-        'composer run phpmd': ('composer run phpmd', False),
-        'composer run phpstan': ('composer run phpstan', False),
-        'composer run psalm': ('composer run psalm', False),
-        'composer run composer-require-checker': ('composer run composer-require-checker', False),
-        'composer run composer-unused': ('composer run composer-unused', False)
+        'composer run php-cs-fixer': ('XDEBUG_MODE=off composer run php-cs-fixer', False),
+        'composer run phpmd': ('XDEBUG_MODE=off composer run phpmd', False),
+        'composer run phpstan': ('XDEBUG_MODE=off composer run phpstan', False),
+        'composer run psalm': ('XDEBUG_MODE=off composer run psalm', False),
+        'composer run composer-require-checker': ('XDEBUG_MODE=off composer run composer-require-checker', False),
+        'composer run composer-unused': ('XDEBUG_MODE=off composer run composer-unused', False)
     }
 
     if not install:

psalm.xml

@@ -37,9 +37,7 @@
 
     <plugins>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
-            <containerXml>
-                tests/Resources/App/var/cache/test/RunOpenCode_Bundle_QueryResourcesLoader_Tests_Resources_App_TestKernelTestDebugContainer.xml
-            </containerXml>
+            <containerXml>tests/Resources/App/var/cache/test/RunOpenCode_Bundle_QueryResourcesLoader_Tests_Resources_App_TestKernelTestDebugContainer.xml</containerXml>
         </pluginClass>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>

tests/bootstrap.php

@@ -18,7 +18,7 @@
 // when we are running only one test case.
 if (\in_array(\strtolower($bootstrap), ['yes', '1', 'true'], true)) {
     // Clear the cache before running the tests.
-    (new Filesystem())->remove(__DIR__ . '/Resources/var/cache');
+    (new Filesystem())->remove(__DIR__ . '/Resources/App/var/cache');
 
     $kernel = new TestKernel('test', false);