Fix Shopsys

phpstan · Jun 6, 2024 · 47653ae · 47653ae
1 parent 57cf08d
commit 47653ae
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -328,16 +328,25 @@ jobs:
               cp ../sylius-composer.lock composer.lock
               composer install
             phpstan-command: ../../../phpstan.phar analyse -c ../sylius.neon
+            baseline-file: sylius-baseline.neon
           - php-version: 8.3
             repo: shopsys/shopsys
             ref: v14.0.0
             setup: |
-              export DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
               composer install
 
             # from build.xml
-            phpstan-command: ../../../phpstan.phar analyse -c ../shopsys.neon -l 5 packages/*/src packages/*/tests project-base/app project-base/app/src project-base/app/tests utils/*/src utils/*/tests
-            baseline-file: sylius-baseline.neon
+            phpstan-command: ../../../phpstan.phar analyse -c ../shopsys.neon -l 5 packages/*/src packages/*/tests utils/*/src utils/*/tests
+          - php-version: 8.3
+            repo: shopsys/shopsys
+            ref: v14.0.0
+            setup: |
+              cd project-base/app
+              composer install
+
+            # test project-base separately
+            phpstan-command: ../../../../../phpstan.phar analyse -c ../../../shopsys-project-base.neon -l 5 src tests
+            baseline-file: shopsys-project-base-baseline.neon
           - php-version: 8.1
             repo: doctrine/orm
             ref: 2.13.1

diff --git a/e2e/integration/shopsys-project-base-baseline.neon b/e2e/integration/shopsys-project-base-baseline.neon
@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Call to an undefined method Tests\\\\App\\\\Test\\\\Codeception\\\\AcceptanceTester\\:\\:selectOptionInSelect2ByCssAndValue\\(\\)\\.$#"
+			count: 1
+			path: repo/project-base/app/tests/App/Acceptance/acceptance/PageObject/Admin/ProductAdvancedSearchPage.php
diff --git a/e2e/integration/shopsys-project-base.neon b/e2e/integration/shopsys-project-base.neon
@@ -0,0 +1,8 @@
+includes:
+	- repo/project-base/app/phpstan.neon
+	- shopsys-project-base-baseline.neon
+
+parameters:
+	reportUnmatchedIgnoredErrors: false
+	excludePaths:
+		- repo/project-base/app/tests/App/Test/Codeception/AcceptanceTester.php
diff --git a/e2e/integration/shopsys.neon b/e2e/integration/shopsys.neon
@@ -1,3 +1,6 @@
 includes:
 	- repo/phpstan.neon
 	- shopsys-baseline.neon
+
+parameters:
+	reportUnmatchedIgnoredErrors: false