Merge branch '2.15' into 2.16

Author: julienfalque

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 git:
-    depth: 1
+    depth: 10
 
 cache:
     directories:

src/Fixer/Strict/DeclareStrictTypesFixer.php

@@ -82,62 +82,48 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             return;
         }
 
-        $sequence = $this->getDeclareStrictTypeSequence();
-        $sequenceLocation = $tokens->findSequence($sequence, $searchIndex, null, false);
+        $sequenceLocation = $tokens->findSequence([[T_DECLARE, 'declare'], '(', [T_STRING, 'strict_types'], '=', [T_LNUMBER], ')'], $searchIndex, null, false);
         if (null === $sequenceLocation) {
             $this->insertSequence($tokens); // declaration not found, insert one
 
             return;
         }
 
-        $this->fixStrictTypesCasing($tokens, $sequenceLocation);
-    }
-
-    /**
-     * @return Token[]
-     */
-    private function getDeclareStrictTypeSequence()
-    {
-        static $sequence = null;
-
-        // do not look for open tag, closing semicolon or empty lines;
-        // - open tag is tested by isCandidate
-        // - semicolon or end tag must be there to be valid PHP
-        // - empty tokens and comments are dealt with later
-        if (null === $sequence) {
-            $sequence = [
-                new Token([T_DECLARE, 'declare']),
-                new Token('('),
-                new Token([T_STRING, 'strict_types']),
-                new Token('='),
-                new Token([T_LNUMBER, '1']),
-                new Token(')'),
-            ];
-        }
-
-        return $sequence;
+        $this->fixStrictTypesCasingAndValue($tokens, $sequenceLocation);
     }
 
     /**
      * @param array<int, Token> $sequence
      */
-    private function fixStrictTypesCasing(Tokens $tokens, array $sequence)
+    private function fixStrictTypesCasingAndValue(Tokens $tokens, array $sequence)
     {
         /** @var int $index */
         /** @var Token $token */
         foreach ($sequence as $index => $token) {
             if ($token->isGivenKind(T_STRING)) {
                 $tokens[$index] = new Token([T_STRING, strtolower($token->getContent())]);
 
+                continue;
+            }
+            if ($token->isGivenKind(T_LNUMBER)) {
+                $tokens[$index] = new Token([T_LNUMBER, '1']);
+
                 break;
             }
         }
     }
 
     private function insertSequence(Tokens $tokens)
     {
-        $sequence = $this->getDeclareStrictTypeSequence();
-        $sequence[] = new Token(';');
+        $sequence = [
+            new Token([T_DECLARE, 'declare']),
+            new Token('('),
+            new Token([T_STRING, 'strict_types']),
+            new Token('='),
+            new Token([T_LNUMBER, '1']),
+            new Token(')'),
+            new Token(';'),
+        ];
         $endIndex = \count($sequence);
 
         $tokens->insertAt(1, $sequence);

tests/Fixer/Strict/DeclareStrictTypesFixerTest.php

@@ -118,6 +118,10 @@ class A {
 /**/',
                 '<?php /**/',
             ],
+            [
+                '<?php declare(strict_types=1);',
+                '<?php declare(strict_types=0);',
+            ],
         ];
     }