Everything should be compatible with PHP 8 lint

kukulich · kukulich · commit 4f7eb27c2036 · 2020-08-25T16:57:20.000+02:00
diff --git a/tests/Helpers/data/lotsOfReferencedNames.php b/tests/Helpers/data/lotsOfReferencedNames.php
@@ -12,7 +12,7 @@
 class FooClass extends \ExtendedClass implements \ImplementedInterface, \SecondImplementedInterface, \ThirdImplementedInterface
 {
 
-	use \FullyQualified\SomeOtherTrait, SomeDifferentTrait, \FullyQualified \ SometTotallyDifferentTrait;
+	use \FullyQualified\SomeOtherTrait, SomeDifferentTrait, \FullyQualified\SometTotallyDifferentTrait;
 	use SomeTrait;
 
 	/** @ORM\Column(name="foo") */
diff --git a/tests/Sniffs/Classes/ParentCallSpacingSniffTest.php b/tests/Sniffs/Classes/ParentCallSpacingSniffTest.php
@@ -19,8 +19,8 @@ public function testErrors(): void
 
 		self::assertSame(2, $report->getErrorCount());
 
-		self::assertSniffError($report, 5, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "parent", found 0.');
-		self::assertSniffError($report, 11, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "parent", found 0.');
+		self::assertSniffError($report, 6, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "parent", found 0.');
+		self::assertSniffError($report, 12, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "parent", found 0.');
 
 		self::assertAllFixedInFile($report);
 	}
diff --git a/tests/Sniffs/Classes/data/parentCallSpacingErrors.fixed.php b/tests/Sniffs/Classes/data/parentCallSpacingErrors.fixed.php
@@ -1,6 +1,7 @@
 <?php
 
-class X {
+class X extends Whatever
+{
 	function a() {
 		parent::a();
 
diff --git a/tests/Sniffs/Classes/data/parentCallSpacingErrors.php b/tests/Sniffs/Classes/data/parentCallSpacingErrors.php
@@ -1,6 +1,7 @@
 <?php
 
-class X {
+class X extends Whatever
+{
 	function a() {
 		parent::a();
 		echo 'wow';
diff --git a/tests/Sniffs/Classes/data/parentCallSpacingNoErrors.php b/tests/Sniffs/Classes/data/parentCallSpacingNoErrors.php
@@ -1,6 +1,7 @@
 <?php
 
-class X {
+class X extends Whatever
+{
 	function a() {
 		parent::a();
 
diff --git a/tests/Sniffs/Commenting/data/forbiddenComments.fixed.php b/tests/Sniffs/Commenting/data/forbiddenComments.fixed.php
@@ -1,6 +1,6 @@
 <?php
 
-class Foo
+class Foo extends Whatever
 {
 
 	public function __construct()
diff --git a/tests/Sniffs/Commenting/data/forbiddenComments.php b/tests/Sniffs/Commenting/data/forbiddenComments.php
@@ -3,7 +3,7 @@
 /**
  * Created by PhpStorm.
  */
-class Foo
+class Foo extends Whatever
 {
 
 	/**
diff --git a/tests/Sniffs/Operators/NegationOperatorSpacingSniffTest.php b/tests/Sniffs/Operators/NegationOperatorSpacingSniffTest.php
@@ -16,7 +16,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/negationOperatorSpacingErrors.php');
 
-		self::assertSame(97, $report->getErrorCount());
+		self::assertSame(95, $report->getErrorCount());
 
 		self::assertAllFixedInFile($report);
 	}
@@ -35,7 +35,7 @@ public function testRequireSpaceErrors(): void
 			['spacesCount' => 1]
 		);
 
-		self::assertSame(97, $report->getErrorCount());
+		self::assertSame(95, $report->getErrorCount());
 
 		self::assertAllFixedInFile($report);
 	}
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingErrors.fixed.php b/tests/Sniffs/Operators/data/negationOperatorSpacingErrors.fixed.php
@@ -50,7 +50,6 @@ function(){yield -1;};
 $a = (array) -1;
 $a = (bool) -1;
 $a = (object) -1;
-$a = (unset) -1;
 $a = (float) -1;
 $a = (int) -1;
 $a ^= -1;
@@ -99,7 +98,6 @@ function(){yield -$b;};
 $a = (array) -$b;
 $a = (bool) -$b;
 $a = (object) -$b;
-$a = (unset) -$b;
 $a = (float) -$b;
 $a = (int) -$b;
 $a ^= -$b;
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingErrors.php b/tests/Sniffs/Operators/data/negationOperatorSpacingErrors.php
@@ -50,7 +50,6 @@ function(){yield - 1;};
 $a = (array) - 1;
 $a = (bool) - 1;
 $a = (object) - 1;
-$a = (unset) - 1;
 $a = (float) - 1;
 $a = (int) - 1;
 $a ^= - 1;
@@ -99,7 +98,6 @@ function(){yield - $b;};
 $a = (array) - $b;
 $a = (bool) - $b;
 $a = (object) - $b;
-$a = (unset) - $b;
 $a = (float) - $b;
 $a = (int) - $b;
 $a ^= - $b;
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingNoErrors.php b/tests/Sniffs/Operators/data/negationOperatorSpacingNoErrors.php
@@ -50,7 +50,6 @@ function(){yield -1;};
 $a = (array) -1;
 $a = (bool) -1;
 $a = (object) -1;
-$a = (unset) -1;
 $a = (float) -1;
 $a = (int) -1;
 $a ^= -1;
@@ -99,7 +98,6 @@ function(){yield -$b;};
 $a = (array) -$b;
 $a = (bool) -$b;
 $a = (object) -$b;
-$a = (unset) -$b;
 $a = (float) -$b;
 $a = (int) -$b;
 $a ^= -$b;
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceErrors.fixed.php b/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceErrors.fixed.php
@@ -50,7 +50,6 @@ function(){yield - 1;};
 $a = (array) - 1;
 $a = (bool) - 1;
 $a = (object) - 1;
-$a = (unset) - 1;
 $a = (float) - 1;
 $a = (int) - 1;
 $a ^= - 1;
@@ -99,7 +98,6 @@ function(){yield - $b;};
 $a = (array) - $b;
 $a = (bool) - $b;
 $a = (object) - $b;
-$a = (unset) - $b;
 $a = (float) - $b;
 $a = (int) - $b;
 $a ^= - $b;
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceErrors.php b/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceErrors.php
@@ -50,7 +50,6 @@ function(){yield -1;};
 $a = (array) -1;
 $a = (bool) -1;
 $a = (object) -1;
-$a = (unset) -1;
 $a = (float) -1;
 $a = (int) -1;
 $a ^= -1;
@@ -99,7 +98,6 @@ function(){yield -$b;};
 $a = (array) -$b;
 $a = (bool) -$b;
 $a = (object) -$b;
-$a = (unset) -$b;
 $a = (float) -$b;
 $a = (int) -$b;
 $a ^= -$b;
diff --git a/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceNoErrors.php b/tests/Sniffs/Operators/data/negationOperatorSpacingRequireSpaceNoErrors.php
@@ -50,7 +50,6 @@ function(){yield - 1;};
 $a = (array) - 1;
 $a = (bool) - 1;
 $a = (object) - 1;
-$a = (unset) - 1;
 $a = (float) - 1;
 $a = (int) - 1;
 $a ^= - 1;
@@ -99,7 +98,6 @@ function(){yield - $b;};
 $a = (array) - $b;
 $a = (bool) - $b;
 $a = (object) - $b;
-$a = (unset) - $b;
 $a = (float) - $b;
 $a = (int) - $b;
 $a ^= - $b;
diff --git a/tests/Sniffs/PHP/data/forbiddenClasses.fixed.php b/tests/Sniffs/PHP/data/forbiddenClasses.fixed.php
@@ -10,7 +10,7 @@ class FooClass extends \FQNExtendedClass implements \ImplementedInterface, \BarN
 	{
 
 		use \FullyQualified\SomeOtherTrait,
-			SomeDifferentTrait, /** Try comments */ \DatabaseTrait /** also after */;
+			SomeDifferentTrait, \DatabaseTrait /** also after */;
 		use SomeTraitA, \SomeTraitB {
 			SomeTraitA::someMethods insteadof \SomeTraitB;
 		}
diff --git a/tests/Sniffs/PHP/data/forbiddenClasses.php b/tests/Sniffs/PHP/data/forbiddenClasses.php
@@ -10,7 +10,7 @@ class FooClass extends \FQNExtendedClass implements \ImplementedInterface, Secon
 	{
 
 		use \FullyQualified\SomeOtherTrait,
-			SomeDifferentTrait, /** Try comments */ \FullyQualified \ /* in this ugly way */ SometTotallyDifferentTrait /** also after */;
+			SomeDifferentTrait, \FullyQualified\SometTotallyDifferentTrait /** also after */;
 		use SomeTraitA, \SomeTraitB {
 			SomeTraitA::someMethods insteadof \SomeTraitB;
 		}
@@ -22,7 +22,7 @@ public function fooMethod()
 
 			$classicClass = new SomeInstanceClass($withParams);
 			$classWithoutParams = new Nested\SomeClass;
-			$classWithoutParamsAndMethodCall = (new \ FullyQualified\ Nested \ SomeClass)->someMethod();
+			$classWithoutParamsAndMethodCall = (new \FullyQualified\Nested\SomeClass)->someMethod();
 
 			$testNewSelf = new self("foo");
 
diff --git a/tests/Sniffs/PHP/data/typeCastErrors.fixed.php b/tests/Sniffs/PHP/data/typeCastErrors.fixed.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint < 8.0
 
 (unset) $foo;
 'abc';
diff --git a/tests/Sniffs/PHP/data/typeCastErrors.php b/tests/Sniffs/PHP/data/typeCastErrors.php
@@ -1,4 +1,4 @@
-<?php
+<?php // lint < 8.0
 
 (unset) $foo;
 (binary) 'abc';
diff --git a/tests/Sniffs/PHP/data/uselessParenthesesErrors.fixed.php b/tests/Sniffs/PHP/data/uselessParenthesesErrors.fixed.php
@@ -1,6 +1,6 @@
 <?php
 
-class Whatever
+class Whatever extends Anything
 {
 
 	public function __construct($parameter)
diff --git a/tests/Sniffs/PHP/data/uselessParenthesesErrors.php b/tests/Sniffs/PHP/data/uselessParenthesesErrors.php
@@ -1,6 +1,6 @@
 <?php
 
-class Whatever
+class Whatever extends Anything
 {
 
 	public function __construct($parameter)
diff --git a/tests/Sniffs/TypeHints/data/nullableTypeForNullDefaultValueErrors.php b/tests/Sniffs/TypeHints/data/nullableTypeForNullDefaultValueErrors.php
@@ -18,7 +18,7 @@ public function doFoo(int $int = null);
 
 }
 
-class FooBar
+class FooBar extends Anything
 {
 
 	public function invalid(bool $bool = null)
diff --git a/tests/Sniffs/TypeHints/data/propertyTypeHintSpacingErrors.fixed.php b/tests/Sniffs/TypeHints/data/propertyTypeHintSpacingErrors.fixed.php
@@ -1,4 +1,4 @@
-<?php // lint >= 7.4
+<?php // lint = 7.4
 
 class Whatever
 {
diff --git a/tests/Sniffs/TypeHints/data/propertyTypeHintSpacingErrors.php b/tests/Sniffs/TypeHints/data/propertyTypeHintSpacingErrors.php
@@ -1,4 +1,4 @@
-<?php // lint >= 7.4
+<?php // lint = 7.4
 
 class Whatever
 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`class FooClass extends \ExtendedClass implements \ImplementedInterface, \SecondImplementedInterface, \ThirdImplementedInterface`
`13`	`13`	`{`
`14`	`14`
`15`		`- use \FullyQualified\SomeOtherTrait, SomeDifferentTrait, \FullyQualified \ SometTotallyDifferentTrait;`
	`15`	`+ use \FullyQualified\SomeOtherTrait, SomeDifferentTrait, \FullyQualified\SometTotallyDifferentTrait;`
`16`	`16`	`use SomeTrait;`
`17`	`17`
`18`	`18`	`/** @ORM\Column(name="foo") */`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public function testErrors(): void`
`19`	`19`
`20`	`20`	`self::assertSame(2, $report->getErrorCount());`
`21`	`21`
`22`		`- self::assertSniffError($report, 5, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "parent", found 0.');`
`23`		`- self::assertSniffError($report, 11, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "parent", found 0.');`
	`22`	`+ self::assertSniffError($report, 6, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "parent", found 0.');`
	`23`	`+ self::assertSniffError($report, 12, ParentCallSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "parent", found 0.');`
`24`	`24`
`25`	`25`	`self::assertAllFixedInFile($report);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class Foo`
	`3`	`+class Foo extends Whatever`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* Created by PhpStorm.`
`5`	`5`	`*/`
`6`		`-class Foo`
	`6`	`+class Foo extends Whatever`
`7`	`7`	`{`
`8`	`8`
`9`	`9`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function testErrors(): void`
`16`	`16`	`{`
`17`	`17`	`$report = self::checkFile(__DIR__ . '/data/negationOperatorSpacingErrors.php');`
`18`	`18`
`19`		`- self::assertSame(97, $report->getErrorCount());`
	`19`	`+ self::assertSame(95, $report->getErrorCount());`
`20`	`20`
`21`	`21`	`self::assertAllFixedInFile($report);`
`22`	`22`	`}`
`@@ -35,7 +35,7 @@ public function testRequireSpaceErrors(): void`
`35`	`35`	`['spacesCount' => 1]`
`36`	`36`	`);`
`37`	`37`
`38`		`- self::assertSame(97, $report->getErrorCount());`
	`38`	`+ self::assertSame(95, $report->getErrorCount());`
`39`	`39`
`40`	`40`	`self::assertAllFixedInFile($report);`
`41`	`41`	`}`