Merge branch '2.15' into 2.16

* 2.15:
  2.15 - clean ups
  ReturnAssignmentFixer - Support more cases
  Remove duplicate "function_to_constant" from RuleSet

# Conflicts:
#	src/Fixer/Comment/CommentToPhpdocFixer.php

Author: SpacePossum

README.rst

@@ -733,7 +733,7 @@ Choose from the list of available rules:
   Configuration options:
 
   - ``functions`` (a subset of ``['get_called_class', 'get_class',
-    'php_sapi_name', 'phpversion', 'pi', 'get_class_this']``): list of
+    'get_class_this', 'php_sapi_name', 'phpversion', 'pi']``): list of
     function names to fix; defaults to ``['get_class', 'php_sapi_name',
     'phpversion', 'pi']``
 

composer.json

@@ -46,6 +46,7 @@
         "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
     },
     "suggest": {
+        "ext-dom": "For handling output formats in XML",
         "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
         "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
         "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",

php-cs-fixer

@@ -46,7 +46,7 @@ foreach (['json', 'tokenizer'] as $extension) {
 }
 unset($extension);
 
-set_error_handler(function ($severity, $message, $file, $line) {
+set_error_handler(static function ($severity, $message, $file, $line) {
     if ($severity & error_reporting()) {
         throw new ErrorException($message, 0, $severity, $file, $line);
     }

src/Console/Command/DescribeCommand.php

@@ -197,7 +197,7 @@ private function describeRule(OutputInterface $output, $name)
                     }
                 } else {
                     $allowed = array_map(
-                        function ($type) {
+                        static function ($type) {
                             return '<comment>'.$type.'</comment>';
                         },
                         $option->getAllowedTypes()

src/Console/Command/HelpCommand.php

@@ -534,7 +534,7 @@ static function (FixerOptionInterface $optionA, FixerOptionInterface $optionB) {
                             }
                         } else {
                             $allowed = array_map(
-                                function ($type) {
+                                static function ($type) {
                                     return '<comment>'.$type.'</comment>';
                                 },
                                 $option->getAllowedTypes()

src/Differ/DiffConsoleFormatter.php

@@ -71,7 +71,7 @@ static function ($line) use ($isDecorated, $lineTemplate) {
                                     '/^(\-.*)/',
                                     '/^(@.*)/',
                                 ],
-                                function ($matches) {
+                                static function ($matches) {
                                     if ('+' === $matches[0][0]) {
                                         $colour = 'green';
                                     } elseif ('-' === $matches[0][0]) {

src/DocBlock/Annotation.php

@@ -286,7 +286,7 @@ private function getTypesContent()
             }
 
             $matchingResult = Preg::match(
-                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:[ \t].*)?$}sx',
+                '{^(?:\s*\*|/\*\*)\s*@'.$name.'\s+'.self::REGEX_TYPES.'(?:\h.*)?$}sx',
                 $this->lines[0]->getContent(),
                 $matches
             );

src/DocBlock/DocBlock.php

@@ -78,9 +78,7 @@ public function getLines()
      */
     public function getLine($pos)
     {
-        if (isset($this->lines[$pos])) {
-            return $this->lines[$pos];
-        }
+        return isset($this->lines[$pos]) ? $this->lines[$pos] : null;
     }
 
     /**
@@ -184,9 +182,7 @@ public function getAnnotation($pos)
     {
         $annotations = $this->getAnnotations();
 
-        if (isset($annotations[$pos])) {
-            return $annotations[$pos];
-        }
+        return isset($annotations[$pos]) ? $annotations[$pos] : null;
     }
 
     /**

src/DocBlock/Line.php

@@ -133,7 +133,7 @@ public function remove()
      */
     public function addBlank()
     {
-        $matched = Preg::match('/^([ \t]*\*)[^\r\n]*(\r?\n)$/', $this->content, $matches);
+        $matched = Preg::match('/^(\h*\*)[^\r\n]*(\r?\n)$/', $this->content, $matches);
 
         if (1 !== $matched) {
             return;

src/DocBlock/ShortDescription.php

@@ -59,5 +59,7 @@ public function getEnd()
                 $reachedContent = true;
             }
         }
+
+        return null;
     }
 }