DX: cleanup - remove special treatment for PHP <5.6

PHP-CS-Fixer · Jul 12, 2018 · 46a95e6 · 46a95e6
1 parent 1e6392d
commit 46a95e6
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 93 deletions.
diff --git a/src/Fixer/ClassNotation/SelfAccessorFixer.php b/src/Fixer/ClassNotation/SelfAccessorFixer.php
@@ -114,12 +114,8 @@ private function replaceNameOccurrences(Tokens $tokens, $name, $startIndex, $end
 
             $token = $tokens[$i];
 
-            if (
-                // skip anonymous classes
-                ($token->isGivenKind(T_CLASS) && $tokensAnalyzer->isAnonymousClass($i)) ||
-                // skip lambda functions (PHP < 5.4 compatibility)
-                ($token->isGivenKind(T_FUNCTION) && $tokensAnalyzer->isLambda($i))
-            ) {
+            // skip anonymous classes
+            if ($token->isGivenKind(T_CLASS) && $tokensAnalyzer->isAnonymousClass($i)) {
                 $i = $tokens->getNextTokenOfKind($i, ['{']);
                 $i = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $i);
 

diff --git a/src/Utils.php b/src/Utils.php
@@ -177,7 +177,7 @@ static function (FixerInterface $fixer) {
                 return $fixer->getPriority();
             },
             static function ($a, $b) {
-                return Utils::cmpInt($b, $a);
+                return self::cmpInt($b, $a);
             }
         );
     }

diff --git a/tests/Console/Command/SelfUpdateCommandTest.php b/tests/Console/Command/SelfUpdateCommandTest.php
@@ -97,8 +97,6 @@ public function provideCommandNameCases()
      * @param string $expectedDisplay
      *
      * @dataProvider provideExecuteCases
-     *
-     * @requires PHP 5.4
      */
     public function testExecute(
         $latestVersion,

diff --git a/tests/Fixer/ClassNotation/SelfAccessorFixerTest.php b/tests/Fixer/ClassNotation/SelfAccessorFixerTest.php
@@ -83,7 +83,7 @@ public function provideFixCases()
                 '<?php class Foo { function bar() { new Foo\Baz(); } }',
             ],
             [
-                // PHP < 5.4 compatibility: "self" is not available in closures
+                '<?php class Foo { function bar() { function ($a = self::BAZ) { new self(); }; } }',
                 '<?php class Foo { function bar() { function ($a = Foo::BAZ) { new Foo(); }; } }',
             ],
             [

diff --git a/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php b/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php
@@ -510,7 +510,6 @@ public function provideFixClassConstCases()
                     class foo
                     {
                         public const A = 1, B =2, C =3;
-                        // As of PHP 5.6.0
                         public const TWO = ONE * 2;
                         public const THREE = ONE + self::TWO;
                         public const SENTENCE = "The value of THREE is ".self::THREE;
@@ -520,7 +519,6 @@ class foo
                     class foo
                     {
                         const A = 1, B =2, C =3;
-                        // As of PHP 5.6.0
                         const TWO = ONE * 2;
                         const THREE = ONE + self::TWO;
                         const SENTENCE = "The value of THREE is ".self::THREE;

diff --git a/tests/Fixer/ControlStructure/YodaStyleFixerTest.php b/tests/Fixer/ControlStructure/YodaStyleFixerTest.php
@@ -585,6 +585,10 @@ function foo() {
                 '<?php $a = -/* bar */1 === reset($foo);',
                 '<?php $a = reset($foo) === -/* bar */1;',
             ],
+            [
+                '<?php $a **= 4 === $b ? 2 : 3;',
+                '<?php $a **= $b === 4 ? 2 : 3;',
+            ],
         ];
     }
 
@@ -691,47 +695,6 @@ public function testDefinition()
         $this->assertInstanceOf(\PhpCsFixer\FixerDefinition\FixerDefinitionInterface::class, $this->fixer->getDefinition());
     }
 
-    /**
-     * @param string $expected
-     * @param string $input
-     *
-     * @dataProvider providePHP56Cases
-     * @requires PHP 5.6
-     */
-    public function testFixPHP56($expected, $input)
-    {
-        $this->fixer->configure(['equal' => true, 'identical' => true]);
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * Test with the inverse config.
-     *
-     * @param string $expected
-     * @param string $input
-     *
-     * @dataProvider providePHP56Cases
-     * @requires PHP 5.6
-     */
-    public function testFixPHP56Inverse($expected, $input)
-    {
-        $this->fixer->configure(['equal' => false, 'identical' => false]);
-        $this->doTest($input, $expected);
-    }
-
-    /**
-     * @return array<string, string[]>
-     */
-    public function providePHP56Cases()
-    {
-        return [
-            '5.6 Simple non-Yoda conditions that need to be fixed' => [
-                '<?php $a **= 4 === $b ? 2 : 3;',
-                '<?php $a **= $b === 4 ? 2 : 3;',
-            ],
-        ];
-    }
-
     /**
      * @param string      $expected
      * @param null|string $input

diff --git a/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php b/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php
@@ -177,24 +177,6 @@ class Bar {
                 }
                 ',
             ],
-        ];
-    }
-
-    /**
-     * @param string      $expected
-     * @param null|string $input
-     *
-     * @dataProvider provideFix56Cases
-     * @requires PHP 5.6
-     */
-    public function testFix56($expected, $input = null)
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public function provideFix56Cases()
-    {
-        return [
             [
                 '<?php
                     use function a\b;

diff --git a/tests/Fixer/Strict/StrictParamFixerTest.php b/tests/Fixer/Strict/StrictParamFixerTest.php
@@ -128,24 +128,6 @@ public function provideFixCases()
                 '<?php
     mb_detect_encoding($foo);',
             ],
-        ];
-    }
-
-    /**
-     * @param string      $expected
-     * @param null|string $input
-     *
-     * @dataProvider provideFix56Cases
-     * @requires PHP 5.6
-     */
-    public function testFix56($expected, $input = null)
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public function provideFix56Cases()
-    {
-        return [
             [
                 '<?php
     use function in_array;

diff --git a/tests/Test/AbstractIntegrationTestCase.php b/tests/Test/AbstractIntegrationTestCase.php
@@ -48,8 +48,6 @@
  * {"indent": "    ", "lineEnding": "\n"}
  * --SETTINGS--*
  * {"key": "value"} # optional extension point for custom IntegrationTestCase class
- * --REQUIREMENTS--*
- * {"php": 50600**}
  * --EXPECT--
  * Expected code after fixing
  * --INPUT--*

diff --git a/tests/Tokenizer/TokensAnalyzerTest.php b/tests/Tokenizer/TokensAnalyzerTest.php
@@ -1039,7 +1039,6 @@ public function provideIsArrayCases()
                 2,
             ],
             [
-                // short array PHP 5.4 single line
                 '<?php
                     ["a" => 2];
                 ',
@@ -1054,7 +1053,6 @@ public function provideIsArrayCases()
                 2, true,
             ],
             [
-                // short array PHP 5.4 multi line
                 '<?php
                     [
                         "a" => 4