Merge branch 'feature/ci-versions-update' into release-week-12

mollie · Mar 22, 2021 · dbf8ac0 · dbf8ac0
2 parents b0ebbb3 + e90834b
commit dbf8ac0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -11,16 +11,12 @@ jobs:
             MAGENTO_VERSION: 2.2.11
           - PHP_VERSION: php71-fpm
             MAGENTO_VERSION: 2.2.11
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.4
-          - PHP_VERSION: php72-fpm
-            MAGENTO_VERSION: 2.3.4
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -6,8 +6,13 @@ jobs:
     build:
         strategy:
             matrix:
-                PHP_VERSION: [php71-fpm, php72-fpm]
-                MAGENTO_VERSION: [2.3.5-p1]
+              include:
+                - PHP_VERSION: php71-fpm
+                  MAGENTO_VERSION: 2.3.5-p1
+                - PHP_VERSION: php72-fpm
+                  MAGENTO_VERSION: 2.3.5-p1
+                - PHP_VERSION: php74-fpm
+                  MAGENTO_VERSION: 2.4.2
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/setup-di-compile.yml b/.github/workflows/setup-di-compile.yml
@@ -6,13 +6,13 @@ jobs:
     build:
         strategy:
             matrix:
-                PHP_VERSION: [php7-fpm, php71-fpm, php72-fpm]
-                MAGENTO_VERSION: [2.2.11, 2.3.5-p1]
-                exclude:
-                    - PHP_VERSION: php7-fpm
-                      MAGENTO_VERSION: 2.3.5-p1
-                    - PHP_VERSION: php72-fpm
-                      MAGENTO_VERSION: 2.2.11
+              include:
+                - PHP_VERSION: php7-fpm
+                  MAGENTO_VERSION: 2.2.11
+                - PHP_VERSION: php72-fpm
+                  MAGENTO_VERSION: 2.3.6-p1
+                - PHP_VERSION: php74-fpm
+                  MAGENTO_VERSION: 2.4.2
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -11,15 +11,15 @@ jobs:
           - PHP_VERSION: php71-fpm
             MAGENTO_VERSION: 2.2.11
           - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php72-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,9 +1,11 @@
 parameters:
     level: 1
+    reportUnmatchedIgnoredErrors: false
     ignoreErrors:
 # Not applicable on level 1
 #        - '#Call to an undefined method [a-zA-Z0-9\\_]+::(get|set|uns|has|calc|unset)[A-Z]#'
         - '#Variable \$block might not be defined.#'
+        - '#Undefined variable: \$block#'
     fileExtensions:
         - php
         - phtml