Merge branch '2.16'

# Conflicts:
#	src/Console/Application.php

Author: keradus

src/Documentation/DocumentationGenerator.php

@@ -53,7 +53,7 @@ public function __construct()
             'toFile' => 'New',
         ]));
 
-        $this->path = \dirname(\dirname(__DIR__)).'/doc/rules';
+        $this->path = \dirname(__DIR__, 2).'/doc/rules';
     }
 
     /**
@@ -358,7 +358,7 @@ private function generateSampleDiff(FixerInterface $fixer, CodeSampleInterface $
    the sample is not suitable for current version of PHP (%s).
 RST;
 
-            return sprintf($error, \PHP_VERSION);
+            return sprintf($error, PHP_VERSION);
         }
 
         $old = $sample->getCode();
@@ -380,7 +380,7 @@ private function generateSampleDiff(FixerInterface $fixer, CodeSampleInterface $
                 // Psr0Fixer relies on realpath() which fails for directories
                 // relative to some path when the working directory is a
                 // different path. Using an absolute path prevents this issue.
-                $configuration['dir'] = \dirname(\dirname(__DIR__)).substr($configuration['dir'], 1);
+                $configuration['dir'] = \dirname(__DIR__, 2).substr($configuration['dir'], 1);
             }
 
             $fixer->configure($configuration);

src/Fixer/Alias/NoAliasFunctionsFixer.php

@@ -30,7 +30,7 @@
  */
 final class NoAliasFunctionsFixer extends AbstractFixer implements ConfigurationDefinitionFixerInterface
 {
-    /** @var array<string, string> stores alias (key) - master (value) functions mapping */
+    /** @var array<string, array<int|string>|string> stores alias (key) - master (value) functions mapping */
     private $aliases = [];
 
     /** @var array<string, string> stores alias (key) - master (value) functions mapping */