skip named-arguments tests for php7

staabm · staabm · commit 5f93ffc54703 · 2024-11-26T08:33:31.000+01:00
diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
@@ -289,6 +289,10 @@ public function testBug4056(): void
 
 	public function testNamedArguments(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$this->analyse([__DIR__ . '/data/instantiation-named-arguments.php'], [
 			[
 				'Missing parameter $j (int) in call to InstantiationNamedArguments\Foo constructor.',
diff --git a/tests/PHPStan/Rules/Classes/data/instantiation-named-arguments.php b/tests/PHPStan/Rules/Classes/data/instantiation-named-arguments.php
@@ -1,7 +1,7 @@
 <?php // lint >= 8.0
 
 namespace InstantiationNamedArguments;
-if (PHP_VERSION_ID < 80000) return;
+
 class Foo
 {
 
diff --git a/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php b/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php
@@ -156,6 +156,10 @@ public function testRule(): void
 
 	public function testNamedArguments(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$this->analyse([__DIR__ . '/data/callables-named-arguments.php'], [
 			[
 				'Missing parameter $j (int) in call to closure.',
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -476,6 +476,10 @@ public function testGenericFunction(): void
 
 	public function testNamedArguments(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$errors = [
 			[
 				'Missing parameter $j (int) in call to function FunctionNamedArguments\foo.',
@@ -490,12 +494,6 @@ public function testNamedArguments(): void
 				14,
 			],
 		];
-		if (PHP_VERSION_ID < 80000) {
-			$errors[] = [
-				'Missing parameter $arr1 (array) in call to function array_merge.',
-				14,
-			];
-		}
 
 		require_once __DIR__ . '/data/named-arguments-define.php';
 		$this->analyse([__DIR__ . '/data/named-arguments.php'], $errors);
diff --git a/tests/PHPStan/Rules/Functions/data/callables-named-arguments.php b/tests/PHPStan/Rules/Functions/data/callables-named-arguments.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace CallablesNamedArguments;
-if (PHP_VERSION_ID < 80000) return;
+
 class Foo
 {
 
diff --git a/tests/PHPStan/Rules/Functions/data/named-arguments.php b/tests/PHPStan/Rules/Functions/data/named-arguments.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace FunctionNamedArguments;
-if (PHP_VERSION_ID < 80000) return;
+
 function bar(): void
 {
 	foo(i: 1);
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1835,6 +1835,10 @@ public function testDisallowNamedArgumentsInPhpVersionScope(): void
 
 	public function testNamedArguments(): void
 	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$this->checkThisOnly = false;
 		$this->checkNullables = true;
 		$this->checkUnionTypes = true;
@@ -2114,6 +2118,11 @@ public function testBug4800(): void
 		$this->checkThisOnly = false;
 		$this->checkNullables = true;
 		$this->checkUnionTypes = true;
+
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$this->analyse([__DIR__ . '/data/bug-4800.php'], [
 			[
 				'Missing parameter $bar (string) in call to method Bug4800\HelloWorld2::a().',
diff --git a/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php
@@ -412,6 +412,10 @@ public function testNamedArguments(): void
 	{
 		$this->checkThisOnly = false;
 
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
 		$this->analyse([__DIR__ . '/data/static-method-named-arguments.php'], [
 			[
 				'Missing parameter $j (int) in call to static method StaticMethodNamedArguments\Foo::doFoo().',
diff --git a/tests/PHPStan/Rules/Methods/data/bug-4800.php b/tests/PHPStan/Rules/Methods/data/bug-4800.php
@@ -1,7 +1,7 @@
 <?php // lint >= 8.0
 
 namespace Bug4800;
-if (PHP_VERSION_ID < 80000) return;
+
 class HelloWorld
 {
 	/**
diff --git a/tests/PHPStan/Rules/Methods/data/named-arguments.php b/tests/PHPStan/Rules/Methods/data/named-arguments.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace NamedArgumentsMethod;
-if (PHP_VERSION_ID < 80000) return;
+
 class Foo
 {
 
diff --git a/tests/PHPStan/Rules/Methods/data/static-method-named-arguments.php b/tests/PHPStan/Rules/Methods/data/static-method-named-arguments.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace StaticMethodNamedArguments;
-if (PHP_VERSION_ID < 80000) return;
+
 class Foo
 {
 

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,10 @@ public function testBug4056(): void`
`289`	`289`
`290`	`290`	`public function testNamedArguments(): void`
`291`	`291`	`{`
	`292`	`+ if (PHP_VERSION_ID < 80000) {`
	`293`	`+ $this->markTestSkipped('Test requires PHP 8.0');`
	`294`	`+ }`
	`295`	`+`
`292`	`296`	`$this->analyse([__DIR__ . '/data/instantiation-named-arguments.php'], [`
`293`	`297`	`[`
`294`	`298`	`'Missing parameter $j (int) in call to InstantiationNamedArguments\Foo constructor.',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php // lint >= 8.0`
`2`	`2`
`3`	`3`	`namespace InstantiationNamedArguments;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`class Foo`
`6`	`6`	`{`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,10 @@ public function testRule(): void`
`156`	`156`
`157`	`157`	`public function testNamedArguments(): void`
`158`	`158`	`{`
	`159`	`+ if (PHP_VERSION_ID < 80000) {`
	`160`	`+ $this->markTestSkipped('Test requires PHP 8.0');`
	`161`	`+ }`
	`162`	`+`
`159`	`163`	`$this->analyse([__DIR__ . '/data/callables-named-arguments.php'], [`
`160`	`164`	`[`
`161`	`165`	`'Missing parameter $j (int) in call to closure.',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`namespace CallablesNamedArguments;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`class Foo`
`6`	`6`	`{`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`namespace FunctionNamedArguments;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`function bar(): void`
`6`	`6`	`{`
`7`	`7`	`foo(i: 1);`
Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,10 @@ public function testNamedArguments(): void`
`412`	`412`	`{`
`413`	`413`	`$this->checkThisOnly = false;`
`414`	`414`
	`415`	`+ if (PHP_VERSION_ID < 80000) {`
	`416`	`+ $this->markTestSkipped('Test requires PHP 8.0');`
	`417`	`+ }`
	`418`	`+`
`415`	`419`	`$this->analyse([__DIR__ . '/data/static-method-named-arguments.php'], [`
`416`	`420`	`[`
`417`	`421`	`'Missing parameter $j (int) in call to static method StaticMethodNamedArguments\Foo::doFoo().',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php // lint >= 8.0`
`2`	`2`
`3`	`3`	`namespace Bug4800;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`class HelloWorld`
`6`	`6`	`{`
`7`	`7`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`namespace NamedArgumentsMethod;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`class Foo`
`6`	`6`	`{`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`namespace StaticMethodNamedArguments;`
`4`		`-if (PHP_VERSION_ID < 80000) return;`
	`4`	`+`
`5`	`5`	`class Foo`
`6`	`6`	`{`
`7`	`7`