Merge branch refs/heads/1.10.x into 1.11.x

phpstan · Jun 21, 2023 · 53d5d89 · 53d5d89
2 parents da675f1 + 5b7bb23
commit 53d5d89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -956,6 +956,10 @@ public function testBug393(): void
 
 	public function testBug9474(): void
 	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
 		$this->cliArgumentsVariablesRegistered = true;
 		$this->polluteScopeWithLoopInitialAssignments = true;
 		$this->checkMaybeUndefinedVariables = true;

diff --git a/tests/PHPStan/Rules/Variables/data/bug-9474.php b/tests/PHPStan/Rules/Variables/data/bug-9474.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.1
 
 namespace Bug9474;