Improve DeclareAfterOpeningTagFixer (#658)

Author: kubawerlos

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3058-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3060-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/DeclareAfterOpeningTagFixer.php

@@ -54,20 +54,24 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
         }
 
         $openingTagTokenContent = $tokens[0]->getContent();
-        if ($openingTagTokenContent === '<?php ' && $tokens[1]->isGivenKind(\T_DECLARE)) {
+
+        $tokens[0] = new Token([\T_OPEN_TAG, \substr($openingTagTokenContent, 0, 5) . ' ']);
+
+        /** @var int $declareIndex */
+        $declareIndex = $tokens->getNextTokenOfKind(0, [[\T_DECLARE]]);
+        if ($declareIndex <= 2) {
+            $tokens->clearRange(1, $declareIndex - 1);
+
             return;
         }
 
-        $tokens[0] = new Token([\T_OPEN_TAG, \substr($openingTagTokenContent, 0, 5) . ' ']);
         if ($tokens[1]->isGivenKind(\T_WHITESPACE)) {
             $tokens[1] = new Token([\T_WHITESPACE, \substr($openingTagTokenContent, 5) . $tokens[1]->getContent()]);
         } else {
             $tokens->insertAt(1, new Token([\T_WHITESPACE, \substr($openingTagTokenContent, 5)]));
+            $declareIndex++;
         }
 
-        /** @var int $declareIndex */
-        $declareIndex = $tokens->getNextTokenOfKind(0, [[\T_DECLARE]]);
-
         /** @var int $openParenthesisIndex */
         $openParenthesisIndex = $tokens->getNextMeaningfulToken($declareIndex);
         $closeParenthesisIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $openParenthesisIndex);

tests/Fixer/DeclareAfterOpeningTagFixerTest.php

@@ -50,7 +50,19 @@ public static function provideFixCases(): iterable
             ',
         ];
 
-        yield 'fix and clean up empty lines' => [
+        yield 'fix uppercase opening tag' => [
+            '<?PHP declare(strict_types=1);
+// Foo
+class Foo {}
+            ',
+            '<?PHP
+// Foo
+declare(strict_types=1);
+class Foo {}
+            ',
+        ];
+
+        yield 'fix and clean up empty lines left' => [
             '<?php declare(strict_types=1);
 
 /*
@@ -70,5 +82,19 @@ public static function provideFixCases(): iterable
 // code starts here
             ',
         ];
+
+        yield 'fix and clean up empty lines above' => [
+            '<?php declare(strict_types=1);
+
+// Foo
+            ',
+            '<?php
+
+
+declare(strict_types=1);
+
+// Foo
+            ',
+        ];
     }
 }

tests/priority_fixtures/blank_line_after_opening_tag,Custom_declare_after_opening_tag.test

@@ -2,7 +2,6 @@
 { "blank_line_after_opening_tag": true, "PhpCsFixerCustomFixers/declare_after_opening_tag": true }
 --EXPECTED--
 <?php declare(strict_types=1);
-
 class Foo {}
 
 --INPUT--