From e90834b978a0b9bd7b53c47887dcf12b3811c688 Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Mon, 22 Mar 2021 09:10:50 +0100 Subject: [PATCH] Feature: Magento versions used in the CI pipeline updated --- .github/workflows/integration-test.yml | 10 +++------- .github/workflows/phpstan.yml | 9 +++++++-- .github/workflows/setup-di-compile.yml | 14 +++++++------- .github/workflows/unit-test.yml | 10 +++++----- phpstan.neon | 2 ++ 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 96d0776c2d0..78748403fc0 100644 --- 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 index 8d380454e60..0d5c71565c3 100644 --- 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 index 72f658608a4..9118b1c28df 100644 --- 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 index 5540f939306..4be90f8e546 100644 --- 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 index 748ec2efea1..f6487485b53 100755 --- 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