Run phpcbf - Fix extra lines

loginesta · loginesta · commit d4631408d070 · 2021-12-16T10:58:48.000+01:00
diff --git a/Magento2/Tests/Eslint/AbstractEslintTestCase.php b/Magento2/Tests/Eslint/AbstractEslintTestCase.php
@@ -17,6 +17,8 @@
 abstract class AbstractEslintTestCase extends TestCase
 {
     /**
+     * Assert that file contains a specific error.
+     *
      * @param string $testFile
      * @param array $expectedMessages
      */
diff --git a/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/AbstractPrivateMethodsUnitTest.php
@@ -56,7 +56,6 @@ public function dataForbiddenAbstractPrivateMethods()
         ];
     }
 
-
     /**
      * Verify that the sniff throws an error for abstract private methods in traits for PHP 7.4
      * and doesn't for PHP 8.0.
@@ -91,7 +90,6 @@ public function dataNewTraitAbstractPrivateMethods()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -128,7 +126,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/BaseSniffTest.php b/Magento2/Tests/PHPCompatibility/BaseSniffTest.php
@@ -39,7 +39,7 @@ class BaseSniffTest extends TestCase
      *
      * @var string
      */
-    const STANDARD_NAME = 'Magento2';
+    private const STANDARD_NAME = 'Magento2';
 
     /**
      * The PHP_CodeSniffer object used for testing.
diff --git a/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php b/Magento2/Tests/PHPCompatibility/ChangedIntToBoolParamTypeUnitTest.php
@@ -63,7 +63,6 @@ public function dataChangedIntToBoolParamType()
         ];
     }
 
-
     /**
      * Verify no false positives are thrown for valid code.
      *
@@ -98,7 +97,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php b/Magento2/Tests/PHPCompatibility/ForbiddenFinalPrivateMethodsUnitTest.php
@@ -57,7 +57,6 @@ public function dataForbiddenFinalPrivateMethods()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -91,7 +90,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php b/Magento2/Tests/PHPCompatibility/NewAttributesUnitTest.php
@@ -107,7 +107,6 @@ public function dataNewAttributes()
         return $data;
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -142,7 +141,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicClassConstantUnitTest.php
@@ -62,7 +62,6 @@ public function dataNewMagicClassConstant()
         ];
     }
 
-
     /**
      * Verify that no false positives are thrown for valid code.
      *
@@ -95,7 +94,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Test correctly identifying the magic class constant when used on instantiated objects.
      *
@@ -135,7 +133,6 @@ public function dataNewMagicClassConstantOnObject()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php b/Magento2/Tests/PHPCompatibility/NewMagicConstantDereferencingUnitTest.php
@@ -59,7 +59,6 @@ public function dataNewMagicConstantDereferencing()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code, nor for code which is still invalid.
      *
@@ -98,7 +97,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNestedStaticAccessUnitTest.php
@@ -69,7 +69,6 @@ public function dataNestedStaticAccess()
         ];
     }
 
-
     /**
      * Verify that class constant dereferencing emits an error in PHP 7.4.
      *
@@ -100,7 +99,6 @@ public function dataClassConstantDereferencing()
         ];
     }
 
-
     /**
      * Verify the sniff doesn't throw false positives.
      *
@@ -133,7 +131,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php b/Magento2/Tests/PHPCompatibility/NewNonCapturingCatchUnitTest.php
@@ -56,7 +56,6 @@ public function dataNewNonCapturingCatch()
         ];
     }
 
-
     /**
      * Verify no false positives are thrown for valid code.
      *
@@ -89,7 +88,6 @@ public function dataNoFalsePositives()
         ];
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php b/Magento2/Tests/PHPCompatibility/NewTrailingCommaUnitTest.php
@@ -58,7 +58,6 @@ public function dataTrailingComma()
         ];
     }
 
-
     /**
      * Test correctly identifying trailing comma's in closure use lists.
      *
@@ -90,7 +89,6 @@ public function dataTrailingCommaClosureUse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -127,7 +125,6 @@ public function dataNoFalsePositives()
         return $data;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedAssertStringAssertionUnitTest.php
@@ -60,7 +60,6 @@ public function dataRemovedAssertStringAssertion()
         ];
     }
 
-
     /**
      * Verify there are no false positives on code this sniff should ignore.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedCallingDestructAfterConstructorExitUnitTest.php
@@ -65,7 +65,6 @@ public function dataRemovedCallingDestructAfterConstructorExit()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -106,7 +105,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedGetDefinedFunctionsExcludeDisabledFalseUnitTest.php
@@ -52,7 +52,6 @@ public function dataRemovedGetDefinedFunctionsExcludeDisabledFalse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -68,7 +67,6 @@ public function testNoFalsePositives()
         }
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedOptionalBeforeRequiredParamUnitTest.php
@@ -58,7 +58,6 @@ public function dataRemovedOptionalBeforeRequiredParam()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -103,7 +102,6 @@ public function dataNoFalsePositives()
         return $cases;
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *
diff --git a/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php b/Magento2/Tests/PHPCompatibility/RemovedSplAutoloadRegisterThrowFalseUnitTest.php
@@ -52,7 +52,6 @@ public function dataRemovedSplAutoloadRegisterThrowFalse()
         ];
     }
 
-
     /**
      * Verify the sniff does not throw false positives for valid code.
      *
@@ -68,7 +67,6 @@ public function testNoFalsePositives()
         }
     }
 
-
     /**
      * Verify no notices are thrown at all.
      *

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`abstract class AbstractEslintTestCase extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
	`20`	`+ * Assert that file contains a specific error.`
	`21`	`+ *`
`20`	`22`	`* @param string $testFile`
`21`	`23`	`* @param array $expectedMessages`
`22`	`24`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public function dataForbiddenAbstractPrivateMethods()`
`56`	`56`	`];`
`57`	`57`	`}`
`58`	`58`
`59`		`-`
`60`	`59`	`/**`
`61`	`60`	`* Verify that the sniff throws an error for abstract private methods in traits for PHP 7.4`
`62`	`61`	`* and doesn't for PHP 8.0.`
`@@ -91,7 +90,6 @@ public function dataNewTraitAbstractPrivateMethods()`
`91`	`90`	`];`
`92`	`91`	`}`
`93`	`92`
`94`		`-`
`95`	`93`	`/**`
`96`	`94`	`* Verify the sniff does not throw false positives for valid code.`
`97`	`95`	`*`
`@@ -128,7 +126,6 @@ public function dataNoFalsePositives()`
`128`	`126`	`return $cases;`
`129`	`127`	`}`
`130`	`128`
`131`		`-`
`132`	`129`	`/**`
`133`	`130`	`* Verify no notices are thrown at all.`
`134`	`131`	`*`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class BaseSniffTest extends TestCase`
`39`	`39`	`*`
`40`	`40`	`* @var string`
`41`	`41`	`*/`
`42`		`- const STANDARD_NAME = 'Magento2';`
	`42`	`+ private const STANDARD_NAME = 'Magento2';`
`43`	`43`
`44`	`44`	`/**`
`45`	`45`	`* The PHP_CodeSniffer object used for testing.`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ public function dataChangedIntToBoolParamType()`
`63`	`63`	`];`
`64`	`64`	`}`
`65`	`65`
`66`		`-`
`67`	`66`	`/**`
`68`	`67`	`* Verify no false positives are thrown for valid code.`
`69`	`68`	`*`
`@@ -98,7 +97,6 @@ public function dataNoFalsePositives()`
`98`	`97`	`return $data;`
`99`	`98`	`}`
`100`	`99`
`101`		`-`
`102`	`100`	`/**`
`103`	`101`	`* Verify no notices are thrown at all.`
`104`	`102`	`*`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ public function dataForbiddenFinalPrivateMethods()`
`57`	`57`	`];`
`58`	`58`	`}`
`59`	`59`
`60`		`-`
`61`	`60`	`/**`
`62`	`61`	`* Verify the sniff does not throw false positives for valid code.`
`63`	`62`	`*`
`@@ -91,7 +90,6 @@ public function dataNoFalsePositives()`
`91`	`90`	`return $cases;`
`92`	`91`	`}`
`93`	`92`
`94`		`-`
`95`	`93`	`/**`
`96`	`94`	`* Verify no notices are thrown at all.`
`97`	`95`	`*`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public function dataNewAttributes()`
`107`	`107`	`return $data;`
`108`	`108`	`}`
`109`	`109`
`110`		`-`
`111`	`110`	`/**`
`112`	`111`	`* Verify the sniff does not throw false positives for valid code.`
`113`	`112`	`*`
`@@ -142,7 +141,6 @@ public function dataNoFalsePositives()`
`142`	`141`	`return $data;`
`143`	`142`	`}`
`144`	`143`
`145`		`-`
`146`	`144`	`/**`
`147`	`145`	`* Verify no notices are thrown at all.`
`148`	`146`	`*`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ public function dataNewMagicClassConstant()`
`62`	`62`	`];`
`63`	`63`	`}`
`64`	`64`
`65`		`-`
`66`	`65`	`/**`
`67`	`66`	`* Verify that no false positives are thrown for valid code.`
`68`	`67`	`*`
`@@ -95,7 +94,6 @@ public function dataNoFalsePositives()`
`95`	`94`	`];`
`96`	`95`	`}`
`97`	`96`
`98`		`-`
`99`	`97`	`/**`
`100`	`98`	`* Test correctly identifying the magic class constant when used on instantiated objects.`
`101`	`99`	`*`
`@@ -135,7 +133,6 @@ public function dataNewMagicClassConstantOnObject()`
`135`	`133`	`];`
`136`	`134`	`}`
`137`	`135`
`138`		`-`
`139`	`136`	`/**`
`140`	`137`	`* Verify no notices are thrown at all.`
`141`	`138`	`*`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ public function dataNewMagicConstantDereferencing()`
`59`	`59`	`];`
`60`	`60`	`}`
`61`	`61`
`62`		`-`
`63`	`62`	`/**`
`64`	`63`	`* Verify the sniff does not throw false positives for valid code, nor for code which is still invalid.`
`65`	`64`	`*`
`@@ -98,7 +97,6 @@ public function dataNoFalsePositives()`
`98`	`97`	`];`
`99`	`98`	`}`
`100`	`99`
`101`		`-`
`102`	`100`	`/**`
`103`	`101`	`* Verify no notices are thrown at all.`
`104`	`102`	`*`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ public function dataNestedStaticAccess()`
`69`	`69`	`];`
`70`	`70`	`}`
`71`	`71`
`72`		`-`
`73`	`72`	`/**`
`74`	`73`	`* Verify that class constant dereferencing emits an error in PHP 7.4.`
`75`	`74`	`*`
`@@ -100,7 +99,6 @@ public function dataClassConstantDereferencing()`
`100`	`99`	`];`
`101`	`100`	`}`
`102`	`101`
`103`		`-`
`104`	`102`	`/**`
`105`	`103`	`* Verify the sniff doesn't throw false positives.`
`106`	`104`	`*`
`@@ -133,7 +131,6 @@ public function dataNoFalsePositives()`
`133`	`131`	`];`
`134`	`132`	`}`
`135`	`133`
`136`		`-`
`137`	`134`	`/**`
`138`	`135`	`* Verify no notices are thrown at all.`
`139`	`136`	`*`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public function dataNewNonCapturingCatch()`
`56`	`56`	`];`
`57`	`57`	`}`
`58`	`58`
`59`		`-`
`60`	`59`	`/**`
`61`	`60`	`* Verify no false positives are thrown for valid code.`
`62`	`61`	`*`
`@@ -89,7 +88,6 @@ public function dataNoFalsePositives()`
`89`	`88`	`];`
`90`	`89`	`}`
`91`	`90`
`92`		`-`
`93`	`91`	`/**`
`94`	`92`	`* Verify no notices are thrown at all.`
`95`	`93`	`*`