Merge branch '2.15' into 2.16

* 2.15:
  HelpCommandTest - toString nested array
  Allow composer/semver ^2.0 and ^3.0
  LinebreakAfterOpeningTagFixer - do not change code if linebreak already present

Author: SpacePossum

composer.json

@@ -17,7 +17,7 @@
         "php": "^5.6 || ^7.0",
         "ext-json": "*",
         "ext-tokenizer": "*",
-        "composer/semver": "^1.4",
+        "composer/semver": "^1.4 || ^2.0 || ^3.0",
         "composer/xdebug-handler": "^1.2",
         "doctrine/annotations": "^1.2",
         "php-cs-fixer/diff": "^1.3",

src/Console/Command/HelpCommand.php

@@ -317,38 +317,10 @@ static function ($line) { return '    $ '.$line; },
      */
     public static function toString($value)
     {
-        if (\is_array($value)) {
-            // Output modifications:
-            // - remove new-lines
-            // - combine multiple whitespaces
-            // - switch array-syntax to short array-syntax
-            // - remove whitespace at array opening
-            // - remove trailing array comma and whitespace at array closing
-            // - remove numeric array indexes
-            static $replaces = [
-                ['#\r|\n#', '#\s{1,}#', '#array\s*\((.*)\)#s', '#\[\s+#', '#,\s*\]#', '#\d+\s*=>\s*#'],
-                ['', ' ', '[$1]', '[', ']', ''],
-            ];
-
-            $str = var_export($value, true);
-            do {
-                $strNew = Preg::replace(
-                    $replaces[0],
-                    $replaces[1],
-                    $str
-                );
-
-                if ($strNew === $str) {
-                    break;
-                }
-
-                $str = $strNew;
-            } while (true);
-        } else {
-            $str = var_export($value, true);
-        }
-
-        return Preg::replace('/\bNULL\b/', 'null', $str);
+        return \is_array($value)
+            ? static::arrayToString($value)
+            : static::scalarToString($value)
+        ;
     }
 
     /**
@@ -634,4 +606,62 @@ private static function wordwrap($string, $width)
             return implode(' ', $line);
         }, $result);
     }
+
+    /**
+     * @param mixed $value
+     *
+     * @return string
+     */
+    private static function scalarToString($value)
+    {
+        $str = var_export($value, true);
+
+        return Preg::replace('/\bNULL\b/', 'null', $str);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return string
+     */
+    private static function arrayToString(array $value)
+    {
+        if (0 === \count($value)) {
+            return '[]';
+        }
+
+        $isHash = static::isHash($value);
+        $str = '[';
+
+        foreach ($value as $k => $v) {
+            if ($isHash) {
+                $str .= static::scalarToString($k).' => ';
+            }
+
+            $str .= \is_array($v)
+                ? static::arrayToString($v).', '
+                : static::scalarToString($v).', '
+            ;
+        }
+
+        return substr($str, 0, -2).']';
+    }
+
+    /**
+     * @return bool
+     */
+    private static function isHash(array $array)
+    {
+        $i = 0;
+
+        foreach ($array as $k => $v) {
+            if ($k !== $i) {
+                return true;
+            }
+
+            ++$i;
+        }
+
+        return false;
+    }
 }

src/Fixer/PhpTag/LinebreakAfterOpeningTagFixer.php

@@ -53,6 +53,11 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             return;
         }
 
+        // ignore if linebreak already present
+        if (false !== strpos($tokens[0]->getContent(), "\n")) {
+            return;
+        }
+
         $newlineFound = false;
         foreach ($tokens as $token) {
             if ($token->isWhitespace() && false !== strpos($token->getContent(), "\n")) {
@@ -67,7 +72,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             return;
         }
 
-        $token = $tokens[0];
-        $tokens[0] = new Token([$token->getId(), rtrim($token->getContent()).$this->whitespacesConfig->getLineEnding()]);
+        $tokens[0] = new Token([T_OPEN_TAG, rtrim($tokens[0]->getContent()).$this->whitespacesConfig->getLineEnding()]);
     }
 }

tests/Console/Command/HelpCommandTest.php

@@ -14,6 +14,8 @@
 
 use PhpCsFixer\Console\Application;
 use PhpCsFixer\Console\Command\HelpCommand;
+use PhpCsFixer\FixerConfiguration\FixerOption;
+use PhpCsFixer\FixerConfiguration\FixerOptionInterface;
 use PhpCsFixer\Tests\TestCase;
 
 /**
@@ -23,6 +25,50 @@
  */
 final class HelpCommandTest extends TestCase
 {
+    /**
+     * @param string $expected
+     * @param mixed  $input
+     *
+     * @dataProvider provideToStringCases
+     */
+    public function testToString($expected, $input)
+    {
+        static::assertSame($expected, HelpCommand::toString($input));
+    }
+
+    public function provideToStringCases()
+    {
+        yield ["['a' => 3, 'b' => 'c']", ['a' => 3, 'b' => 'c']];
+        yield ['[[1], [2]]', [[1], [2]]];
+        yield ['[0 => [1], \'a\' => [2]]', [[1], 'a' => [2]]];
+        yield ['[1, 2, \'foo\', null]', [1, 2, 'foo', null]];
+        yield ['[1, 2]', [1, 2]];
+        yield ['[]', []];
+        yield ['1.5', 1.5];
+        yield ['false', false];
+        yield ['true', true];
+        yield ['1', 1];
+        yield ["'foo'", 'foo'];
+    }
+
+    /**
+     * @param null|string $expected
+     *
+     * @dataProvider provideGetDisplayableAllowedValuesCases
+     */
+    public function testGetDisplayableAllowedValues($expected, FixerOptionInterface $input)
+    {
+        static::assertSame($expected, HelpCommand::getDisplayableAllowedValues($input));
+    }
+
+    public function provideGetDisplayableAllowedValuesCases()
+    {
+        yield [null, new FixerOption('foo', 'bar', false, null, ['int'], [])];
+        yield [['A', 'B', 'x', 'z'], new FixerOption('foo', 'bar', false, null, ['string'], ['z', 'x', 'B', 'A'])];
+        yield [[0, 3, 9], new FixerOption('foo', 'bar', false, null, ['int'], [0, 3, 9, static function () {}])];
+        yield [null, new FixerOption('foo', 'bar')];
+    }
+
     public function testGetLatestReleaseVersionFromChangeLog()
     {
         $helpVersion = HelpCommand::getLatestReleaseVersionFromChangeLog();

tests/Fixer/PhpTag/LinebreakAfterOpeningTagFixerTest.php

@@ -81,6 +81,11 @@ public function provideFixCases()
 $foo = $bar;
 ?>',
             ],
+            [
+                str_replace("\n", "\r\n", '<?php
+// linebreak already present in file with Windows line endings
+'),
+            ],
         ];
     }