Merge branch '2.14'

Author: keradus

src/Fixer/CastNotation/ModernizeTypesCastingFixer.php

@@ -110,6 +110,10 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
                 $preserveParenthesises = $countParamTokens > 1;
 
+                $afterCloseParenthesisIndex = $tokens->getNextMeaningfulToken($closeParenthesis);
+                $afterCloseParenthesisToken = $tokens[$afterCloseParenthesisIndex];
+                $wrapInParenthesises = $afterCloseParenthesisToken->equals('[') || $afterCloseParenthesisToken->isGivenKind(T_POW);
+
                 // analyse namespace specification (root one or none) and decide what to do
                 $prevTokenIndex = $tokens->getPrevMeaningfulToken($functionName);
                 if ($tokens[$prevTokenIndex]->isGivenKind(T_NS_SEPARATOR)) {
@@ -123,6 +127,9 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                     new Token($newToken),
                     new Token([T_WHITESPACE, ' ']),
                 ];
+                if ($wrapInParenthesises) {
+                    array_unshift($replacementSequence, new Token('('));
+                }
 
                 if (!$preserveParenthesises) {
                     // closing parenthesis removed with leading spaces
@@ -138,6 +145,10 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                     $tokens->removeTrailingWhitespace($functionName);
                 }
 
+                if ($wrapInParenthesises) {
+                    $tokens->insertAt($closeParenthesis, new Token(')'));
+                }
+
                 $tokens->overrideRange($functionName, $functionName, $replacementSequence);
 
                 // nested transformations support

src/Fixer/LanguageConstruct/NoUnsetOnPropertyFixer.php

@@ -89,7 +89,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
      * @param Tokens $tokens
      * @param int    $index
      *
-     * @return string[]
+     * @return array<array<string, bool|int>>
      */
     private function getUnsetsInfo(Tokens $tokens, $index)
     {
@@ -152,7 +152,7 @@ private function isProperty(Tokens $tokens, $index, $endIndex)
     }
 
     /**
-     * @param string[] $unsetsInfo
+     * @param array<array<string, bool|int>> $unsetsInfo
      *
      * @return bool
      */
@@ -168,9 +168,9 @@ private function isAnyUnsetToTransform(array $unsetsInfo)
     }
 
     /**
-     * @param Tokens   $tokens
-     * @param string[] $unsetInfo
-     * @param bool     $isLastUnset
+     * @param Tokens                  $tokens
+     * @param array<string, bool|int> $unsetInfo
+     * @param bool                    $isLastUnset
      */
     private function updateTokens(Tokens $tokens, array $unsetInfo, $isLastUnset)
     {

src/Fixer/Whitespace/ArrayIndentationFixer.php

@@ -49,7 +49,7 @@ public function isCandidate(Tokens $tokens)
      */
     public function getPriority()
     {
-        // should run after BracesFixer
+        // should run after BracesFixer, MethodChainingIndentationFixer
         return -30;
     }
 
@@ -300,7 +300,7 @@ private function getLineIndentation(Tokens $tokens, $index)
 
     private function extractIndent($content)
     {
-        if (Preg::match('/\R([\t ]*)[^\r\n]*$/', $content, $matches)) {
+        if (Preg::match('/\R([\t ]*)[^\r\n]*$/D', $content, $matches)) {
             return $matches[1];
         }
 

src/Fixer/Whitespace/MethodChainingIndentationFixer.php

@@ -43,7 +43,8 @@ public function getDefinition()
     public function getPriority()
     {
         // Should run after BracesFixer
-        return -30;
+        // Should run before ArrayIndentationFixer
+        return -29;
     }
 
     /**

src/Tokenizer/TokensAnalyzer.php

@@ -64,7 +64,7 @@ public function getClassyElements()
      *
      * @param bool $perNamespace Return namespace uses per namespace
      *
-     * @return array|array[]
+     * @return int[]|int[][]
      */
     public function getImportUseIndexes($perNamespace = false)
     {

tests/AutoReview/FixerFactoryTest.php

@@ -102,6 +102,7 @@ public function provideFixersPriorityCases()
             [$fixers['is_null'], $fixers['yoda_style']],
             [$fixers['list_syntax'], $fixers['binary_operator_spaces']],
             [$fixers['list_syntax'], $fixers['ternary_operator_spaces']],
+            [$fixers['method_chaining_indentation'], $fixers['array_indentation']],
             [$fixers['method_separation'], $fixers['braces']],
             [$fixers['method_separation'], $fixers['indentation_type']],
             [$fixers['no_alias_functions'], $fixers['implode_call']],

tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php

@@ -179,6 +179,36 @@ public function &doubleval($a);
  )#
  ;#',
             ],
+            [
+                '<?php $foo = ((int) $x)**2;',
+                '<?php $foo = intval($x)**2;',
+            ],
+        ];
+    }
+
+    /**
+     * @param string $expected
+     * @param string $input
+     *
+     * @requires PHP 7.0
+     * @dataProvider provideFix70Cases
+     */
+    public function testFix70($expected, $input)
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFix70Cases()
+    {
+        return [
+            [
+                '<?php $foo = ((string) $x)[0];',
+                '<?php $foo = strval($x)[0];',
+            ],
+            [
+                '<?php $foo = ((string) ($x + $y))[0];',
+                '<?php $foo = strval($x + $y)[0];',
+            ],
         ];
     }
 

tests/Fixer/Whitespace/ArrayIndentationFixerTest.php

@@ -724,6 +724,14 @@ class="link"
 INPUT
                 ,
             ],
+            [
+                '<?php
+    '.'
+$foo = [
+    "foo",
+    "bar",
+];',
+            ],
         ]);
     }
 

tests/Fixtures/Integration/priority/method_chaining_indentation,array_indentation.test

@@ -0,0 +1,27 @@
+--TEST--
+Integration of fixers: method_chaining_indentation,array_indentation.
+--RULESET--
+{"array_indentation": true, "method_chaining_indentation": true}
+--EXPECT--
+<?php
+function foo($foo)
+{
+    $foo
+        ->bar()
+        ->baz([
+            'foo' => 'bar',
+        ])
+    ;
+}
+
+--INPUT--
+<?php
+function foo($foo)
+{
+    $foo
+        ->bar()
+           ->baz([
+                'foo' => 'bar',
+            ])
+    ;
+}