Merge branch '1.11'

Conflicts:
	README.rst
	Symfony/CS/Console/Command/FixCommand.php
	Symfony/CS/Test/AbstractIntegrationTestCase.php
	Symfony/CS/Tests/FixerTest.php
	Symfony/CS/Tokenizer/Token.php

Author: keradus

.gitignore

@@ -1,4 +1,4 @@
 .php_cs
 composer.lock
-vendor
 phpunit.xml
+vendor

COOKBOOK-FIXERS.md

@@ -67,7 +67,7 @@ use Symfony\CS\Tokenizer\Tokens;
 /**
  * @author Your name <your@email.com>
  */
-class RemoveCommentsFixer extends AbstractFixer
+final class RemoveCommentsFixer extends AbstractFixer
 {
 }
 ```
@@ -99,8 +99,10 @@ use Symfony\CS\Tests\Fixer\AbstractFixerTestBase;
 
 /**
  * @author Your name <your@email.com>
+ *
+ * @internal
  */
-class RemoveCommentsFixerTest extends AbstractFixerTestBase
+final class RemoveCommentsFixerTest extends AbstractFixerTestBase
 {
     /**
      * @dataProvider provideFixCases
@@ -182,8 +184,10 @@ use Symfony\CS\Tests\Fixer\AbstractFixerTestBase;
 
 /**
  * @author Your name <your@email.com>
+ *
+ * @internal
  */
-class RemoveCommentsFixerTest extends AbstractFixerTestBase
+final class RemoveCommentsFixerTest extends AbstractFixerTestBase
 {
     /**
      * @dataProvider provideFixCases
@@ -214,7 +218,7 @@ implement it.
 We need first to create one method to describe what this fixer does:
 `Symfony/CS/Fixer/Contrib/RemoveCommentsFixer.php`:
 ```php
-class RemoveCommentsFixer extends AbstractFixer
+final class RemoveCommentsFixer extends AbstractFixer
 {
     /**
      * {@inheritdoc}
@@ -229,7 +233,7 @@ class RemoveCommentsFixer extends AbstractFixer
 Next, we must filter what type of tokens we want to fix. Here, we are interested in code that contains `T_COMMENT` tokens:
 `Symfony/CS/Fixer/Contrib/RemoveCommentsFixer.php`:
 ```php
-class RemoveCommentsFixer extends AbstractFixer
+final class RemoveCommentsFixer extends AbstractFixer
 {
     ...
     /**
@@ -294,7 +298,7 @@ We do not want all symbols to be analysed. Only `T_COMMENT`. So let us
 iterate the token(s) we are interested in.
 `Symfony/CS/Fixer/Contrib/RemoveCommentsFixer.php`:
 ```php
-class RemoveCommentsFixer extends AbstractFixer
+final class RemoveCommentsFixer extends AbstractFixer
 {
     /**
      * {@inheritdoc}
@@ -317,7 +321,7 @@ OK, now for each `T_COMMENT`, all we need to do is check if the previous
 token is a semicolon.
 `Symfony/CS/Fixer/Contrib/RemoveCommentsFixer.php`:
 ```php
-class RemoveCommentsFixer extends AbstractFixer
+final class RemoveCommentsFixer extends AbstractFixer
 {
     /**
      * {@inheritdoc}
@@ -363,7 +367,7 @@ use Symfony\CS\Tokenizer\Tokens;
 /**
  * @author Your name <your@email.com>
  */
-class RemoveCommentsFixer extends AbstractFixer {
+final class RemoveCommentsFixer extends AbstractFixer {
     /**
      * {@inheritdoc}
      */

README.rst

@@ -224,6 +224,11 @@ Choose from the list of available fixers:
 * **duplicate_semicolon** [@Symfony]
                         Remove duplicated semicolons.
 
+* **echo_to_print**
+                        Converts echo language
+                        construct to print if
+                        possible.
+
 * **elseif** [@PSR2, @Symfony]
                         The keyword elseif should be
                         used instead of else if so
@@ -507,6 +512,10 @@ Choose from the list of available fixers:
                         incrementation/decrementation
                         should be used if possible.
 
+* **print_to_echo**
+                        Converts print language
+                        construct to echo if possible.
+
 * **psr0**
                         Classes must be in a path that
                         matches their namespace, be at

Symfony/CS/AbstractPhpdocTypesFixer.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\CS;
 
+use Symfony\CS\DocBlock\Annotation;
 use Symfony\CS\DocBlock\DocBlock;
-use Symfony\CS\DocBlock\Line;
 use Symfony\CS\Tokenizer\Tokens;
 
 /**
@@ -27,9 +27,19 @@ abstract class AbstractPhpdocTypesFixer extends AbstractFixer
     /**
      * The annotation tags search inside.
      *
-     * @var string[]
+     * @var string[]|null
      */
-    protected static $tags = array('param', 'property', 'property-read', 'property-write', 'return', 'type', 'var');
+    protected static $tags;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        if (null === static::$tags) {
+            static::$tags = Annotation::getTagsWithTypes();
+        }
+    }
 
     /**
      * {@inheritdoc}
@@ -57,7 +67,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens)
             }
 
             foreach ($annotations as $annotation) {
-                $this->fixTypes($doc->getLine($annotation->getStart()), $annotation->getTag()->getName());
+                $this->fixTypes($annotation);
             }
 
             $token->setContent($doc->getContent());
@@ -69,27 +79,18 @@ public function fix(\SplFileInfo $file, Tokens $tokens)
      *
      * We must be super careful not to modify parts of words.
      *
-     * @param Line   $line
-     * @param string $tag
+     * This will be nicely handled behind the scenes for us by the annotation class.
+     *
+     * @param Annotation $annotation
      */
-    private function fixTypes(Line $line, $tag)
+    private function fixTypes(Annotation $annotation)
     {
-        $content = $line->getContent();
-        $tagSplit = preg_split('/\s*\@'.$tag.'\s*/', $content, 2);
-        $spaceSplit = preg_split('/\s/', $tagSplit[1], 2);
-        $usefulContent = $spaceSplit[0];
-
-        if (strpos($usefulContent, '|') !== false) {
-            $newContent = implode('|', $this->normalizeTypes(explode('|', $usefulContent)));
-        } else {
-            $newContent = $this->normalizeType($usefulContent);
-        }
+        $types = $annotation->getTypes();
+
+        $new = $this->normalizeTypes($types);
 
-        if ($newContent !== $usefulContent) {
-            // limiting to 1 replacement to prevent errors like
-            // "integer $integer" being converted to "int $int"
-            // when they should be converted to "int $integer"
-            $line->setContent(preg_replace('/'.preg_quote($usefulContent).'/', $newContent, $content, 1));
+        if ($types !== $new) {
+            $annotation->setTypes($new);
         }
     }
 

Symfony/CS/Console/Command/FixCommand.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -334,6 +335,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
+        if ($output instanceof ConsoleOutputInterface && extension_loaded('xdebug')) {
+            $stdErr = $output->getErrorOutput();
+            $stdErr->writeln(sprintf($stdErr->isDecorated() ? '<bg=yellow;fg=black;>%s</>' : '%s', 'You are running composer with xdebug enabled. This has a major impact on runtime performance.'));
+        }
+
         $showProgress = $resolver->getProgress();
 
         if ($showProgress) {

Symfony/CS/DocBlock/Annotation.php

@@ -19,29 +19,80 @@
 class Annotation
 {
     /**
-     * The lines that make up the annotation.
+     * All the annotation tag names with types.
      *
-     * Note that the array indexes represent the position in the docblock.
+     * @var string[]
+     */
+    private static $tags = array(
+        'method',
+        'param',
+        'property',
+        'property-read',
+        'property-write',
+        'return',
+        'throws',
+        'type',
+        'var',
+    );
+
+    /**
+     * The lines that make up the annotation.
      *
      * @var Line[]
      */
     private $lines;
 
+    /**
+     * The position of the first line of the annotation in the docblock.
+     *
+     * @var int
+     */
+    private $start;
+
+    /**
+     * The position of the last line of the annotation in the docblock.
+     *
+     * @var int
+     */
+    private $end;
+
     /**
      * The associated tag.
      *
      * @var Tag|null
      */
     private $tag;
 
+    /**
+     * The cached types content.
+     *
+     * @var string|null
+     */
+    private $typesContent;
+
     /**
      * Create a new line instance.
      *
      * @param Line[] $lines
      */
     public function __construct(array $lines)
     {
-        $this->lines = $lines;
+        $this->lines = array_values($lines);
+
+        $keys = array_keys($lines);
+
+        $this->start = $keys[0];
+        $this->end = end($keys);
+    }
+
+    /**
+     * Get all the annotation tag names with types.
+     *
+     * @var string[]
+     */
+    public static function getTagsWithTypes()
+    {
+        return self::$tags;
     }
 
     /**
@@ -51,9 +102,7 @@ public function __construct(array $lines)
      */
     public function getStart()
     {
-        $keys = array_keys($this->lines);
-
-        return $keys[0];
+        return $this->start;
     }
 
     /**
@@ -63,9 +112,7 @@ public function getStart()
      */
     public function getEnd()
     {
-        $keys = array_keys($this->lines);
-
-        return end($keys);
+        return $this->end;
     }
 
     /**
@@ -83,6 +130,55 @@ public function getTag()
         return $this->tag;
     }
 
+    /**
+     * Get the current types content.
+     *
+     * Be careful modifying the underlying line as that won't flush the cache.
+     *
+     * @return string
+     */
+    private function getTypesContent()
+    {
+        if (null === $this->typesContent) {
+            $name = $this->getTag()->getName();
+
+            if (!in_array($name, self::$tags, true)) {
+                throw new \RuntimeException('This tag does not support types');
+            }
+
+            $tagSplit = preg_split('/\s*\@'.$name.'\s*/', $this->lines[0]->getContent(), 2);
+            $spaceSplit = preg_split('/\s/', $tagSplit[1], 2);
+
+            $this->typesContent = $spaceSplit[0];
+        }
+
+        return $this->typesContent;
+    }
+
+    /**
+     * Get the types associated with this annotation.
+     *
+     * @return string[]
+     */
+    public function getTypes()
+    {
+        return explode('|', $this->getTypesContent());
+    }
+
+    /**
+     * Set the types associated with this annotation.
+     *
+     * @param string[] $types
+     */
+    public function setTypes(array $types)
+    {
+        $pattern = '/'.preg_quote($this->getTypesContent()).'/';
+
+        $this->lines[0]->setContent(preg_replace($pattern, implode('|', $types), $this->lines[0]->getContent(), 1));
+
+        $this->typesContent = null;
+    }
+
     /**
      * Remove this annotation by removing all its lines.
      */