From 73196abb9613d1ccc18941e8c399b533b5e04d33 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 29 Dec 2022 17:15:56 +0100 Subject: [PATCH 1/2] Fix test expectations of bug 8610 reproducer --- e2e/bug8610/phpstan.neon | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/e2e/bug8610/phpstan.neon b/e2e/bug8610/phpstan.neon index 683809213b..2285b29900 100644 --- a/e2e/bug8610/phpstan.neon +++ b/e2e/bug8610/phpstan.neon @@ -3,4 +3,7 @@ parameters: paths: - . bootstrapFiles: - - autoloader.php \ No newline at end of file + - autoloader.php + + ignoreErrors: + - '#Instantiated class DoesNotExist not found.#' \ No newline at end of file From eddbf3ce8b889541fad23bfc75a6428667d7fdc2 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 29 Dec 2022 19:49:33 +0100 Subject: [PATCH 2/2] generate baseline --- .github/workflows/other-tests.yml | 2 +- e2e/bug8610/phpstan-baseline.neon | 7 +++++++ e2e/bug8610/phpstan.neon | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 e2e/bug8610/phpstan-baseline.neon diff --git a/.github/workflows/other-tests.yml b/.github/workflows/other-tests.yml index 25cfcb0360..c30d628236 100644 --- a/.github/workflows/other-tests.yml +++ b/.github/workflows/other-tests.yml @@ -337,7 +337,7 @@ jobs: cd e2e/bug8543 composer install ../../phpstan - - php-version: 8.1 + - php-version: 8.2 ini-values: memory_limit=256M operating-system: ubuntu-latest script: | diff --git a/e2e/bug8610/phpstan-baseline.neon b/e2e/bug8610/phpstan-baseline.neon new file mode 100644 index 0000000000..c8de09e69a --- /dev/null +++ b/e2e/bug8610/phpstan-baseline.neon @@ -0,0 +1,7 @@ +parameters: + ignoreErrors: + - + message: "#^Instantiated class DoesNotExist not found\\.$#" + count: 1 + path: trigger-autoload.php + diff --git a/e2e/bug8610/phpstan.neon b/e2e/bug8610/phpstan.neon index 2285b29900..7adb506ae3 100644 --- a/e2e/bug8610/phpstan.neon +++ b/e2e/bug8610/phpstan.neon @@ -1,9 +1,9 @@ +includes: + - phpstan-baseline.neon + parameters: level: max paths: - . bootstrapFiles: - autoloader.php - - ignoreErrors: - - '#Instantiated class DoesNotExist not found.#' \ No newline at end of file