Fix E2E tests

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -137,17 +137,18 @@ jobs:
               ../../bin/phpstan -vvv
           - script: |
               cd e2e/env-parameter
-              export PHPSTAN_SCOPE_CLASS=MyTestScope
-              ACTUAL=$(../../bin/phpstan dump-parameters -c phpstan.neon --json -l 9 | jq --raw-output '.scopeClass')
-              [[ "$ACTUAL" == "MyTestScope" ]];
+              export PHPSTAN_RESULT_CACHE_PATH=/some/path
+              ACTUAL=$(../../bin/phpstan dump-parameters -c phpstan.neon --json -l 9 | jq --raw-output '.resultCachePath')
+              [[ "$ACTUAL" == "/some/path" ]];
           - script: |
               cd e2e/result-cache-8
               composer install
               ../../bin/phpstan
               echo -en '\n' >> build/CustomRule.php
-              OUTPUT=$(../../bin/phpstan 2>&1)
-              grep 'Result cache might not behave correctly' <<< "$OUTPUT"
-              grep 'ResultCache8E2E\\CustomRule' <<< "$OUTPUT"
+              OUTPUT=$(../../bin/phpstan analyze 2>&1 || true)
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Result cache might not behave correctly' "$OUTPUT"
+              ../bashunit -a contains 'ResultCache8E2E\\CustomRule' "$OUTPUT"
           - script: |
               cd e2e/env-int-key
               env 1=1 ../../bin/phpstan analyse test.php

e2e/bug-9622-trait/baseline-1.neon

@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Offset 'foo' does not exist on array\\{foo\\?\\: int\\}\\.$#"
+			message: "#^Offset 'foo' might not exist on array\\{foo\\?\\: int\\}\\.$#"
 			count: 1
 			path: src/UsesBar.php

e2e/bug-9622/baseline-1.neon

@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Offset 'foo' does not exist on array\\{foo\\?\\: int\\}\\.$#"
+			message: "#^Offset 'foo' might not exist on array\\{foo\\?\\: int\\}\\.$#"
 			count: 1
 			path: src/Bar.php

e2e/discussion-11362/phpstan.neon

@@ -1,7 +1,5 @@
 parameters:
   excludePaths:
-    analyseAndScan:
-      - .git
     analyse:
       - vendor
 

e2e/env-parameter/phpstan.neon

@@ -1,2 +1,2 @@
 parameters:
-	scopeClass: %env.PHPSTAN_SCOPE_CLASS%
+	resultCachePath: %env.PHPSTAN_RESULT_CACHE_PATH%

e2e/result-cache-5/phpstan.neon

@@ -5,3 +5,6 @@ parameters:
 	level: 8
 	paths:
 		- src
+	ignoreErrors:
+		-
+			identifier: instanceof.alwaysTrue

e2e/result-cache-7/phpstan.neon

@@ -5,3 +5,6 @@ parameters:
 	level: 8
 	paths:
 		- src
+	ignoreErrors:
+		-
+			identifier: trait.unused