Make CI green (#17)

* Make CI green * Try PHP74 * Different version of psalm * fix
Happyr · Jul 11, 2021 · f564b59 · f564b59
1 parent 5a6519a
commit f564b59
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,15 +1,15 @@
 name: Tests
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
-  build:
-    name: Build
+  phpunit:
+    name: PHPUnit
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 10
       matrix:
         php: [ '7.2', '7.3', '7.4', '8.0']
-        sf_version: [ '4.4.*', '5.2.*' ]
+        sf_version: [ '4.4.*', '5.3.*' ]
 
     steps:
       - name: Set up PHP

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -1,37 +1,80 @@
-on: [push, pull_request]
+on: [pull_request]
 name: Static analysis
 
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: PHPStan
-        uses: docker://oskarstark/phpstan-ga
-        env:
-          REQUIRE_DEV: true
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: analyze --no-progress
+          php-version: 8.0
+          coverage: none
+          tools: phpstan:0.12.92, cs2pr
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+
+      - name: PHPStan
+        run: phpstan analyze --no-progress --error-format=checkstyle | cs2pr
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+
     steps:
-      - uses: actions/checkout@v2
-      - name: PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: --dry-run --diff-format udiff
+          php-version: 8.0
+          coverage: none
+          tools: php-cs-fixer:2.19.0, cs2pr
+
+      - name: PHP-CS-Fixer
+        run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          coverage: none
+          tools: vimeo/psalm:4.8.1
+
+      - name: Download dependencies
+        uses: ramsey/composer-install@v1
+
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions
+        run: psalm --no-progress --output-format=github
+
+  composer-normalize:
+    name: Composer Normalize
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          coverage: none
+          tools: composer-normalize
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Normalize
+        run: composer-normalize --dry-run
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,7 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, ProxyManager\\\\Autoloader\\\\AutoloaderInterface given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, ProxyManager\\\\Autoloader\\\\AutoloaderInterface given\\.$#"
 			count: 1
 			path: src/DependencyInjection/CompilerPass/ProxyServiceWithMockPass.php
 

diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -1,8 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
+<files psalm-version="4.8.1@f73f2299dbc59a3e6c4d66cff4605176e728ee69">
   <file src="src/ServiceMock.php">
     <UndefinedInterfaceMethod occurrences="1">
       <code>getWrappedValueHolderValue</code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="vendor/laminas/laminas-code/src/Generator/ClassGenerator.php">
+    <ParseError occurrences="6">
+      <code>$interface</code>
+      <code>$interface</code>
+      <code>)</code>
+      <code>)</code>
+      <code>fn</code>
+      <code>fn</code>
+    </ParseError>
+  </file>
+  <file src="vendor/laminas/laminas-code/src/Generator/TypeGenerator.php">
+    <ParseError occurrences="13">
+      <code>$left</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>$type</code>
+      <code>)</code>
+      <code>)</code>
+      <code>)</code>
+      <code>)</code>
+      <code>,</code>
+      <code>,</code>
+      <code>,</code>
+      <code>fn</code>
+      <code>fn</code>
+    </ParseError>
+  </file>
+  <file src="vendor/laminas/laminas-code/src/Generator/TypeGenerator/AtomicType.php">
+    <ParseError occurrences="3">
+      <code>$type</code>
+      <code>)</code>
+      <code>fn</code>
+    </ParseError>
+  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="5"
+    errorLevel="4"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/src/DependencyInjection/CompilerPass/ProxyServiceWithMockPass.php b/src/DependencyInjection/CompilerPass/ProxyServiceWithMockPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
             if ($container->hasDefinition($serviceId)) {
                 $definition = $container->getDefinition($serviceId);
             } elseif ($container->hasAlias($serviceId)) {
-                $definition = $container->getDefinition($container->getAlias($serviceId));
+                $definition = $container->getDefinition($container->getAlias($serviceId)->__toString());
             } else {
                 throw new \LogicException(sprintf('[HappyrServiceMocking] Service or alias with id "%s" does not exist.', $serviceId));
             }