Merge branch 'master' into dx_AbstractIntegrationTestCase

Dockerfile

@@ -26,6 +26,7 @@ RUN if [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent group "${DOCKER_GROUP_ID}" > /d
     && if [ ! -z "$DOCKER_USER_ID" ] && [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent passwd "${DOCKER_USER_ID}" > /dev/null ]; \
         then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
     fi \
+    && apk add git \
     # php extensions
     && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
     && chmod +x /usr/local/bin/install-php-extensions \

composer.json

@@ -47,7 +47,6 @@
         "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
         "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
         "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": "^6.3.8 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },
     "suggest": {

dev-tools/phpstan/baseline.php

@@ -221,21 +221,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:filterUseDeclarations\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:insertImports\\(\\) has parameter \\$imports with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:prepareImports\\(\\) has parameter \\$global with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\OrderedImportsFixer\\:\\:getNewOrder\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'count' => 1,
@@ -422,7 +407,7 @@
 	'path' => __DIR__ . '/../../src/Tokenizer/Tokens.php',
 ];
 $ignoreErrors[] = [
-	'message' => '#^Parameter \\#1 \\$array \\(array\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\) of method PhpCsFixer\\\\Tokenizer\\\\Tokens\\:\\:fromArray\\(\\) should be contravariant with parameter \\$array \\(array\\<int, mixed\\>\\) of method SplFixedArray\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\:\\:fromArray\\(\\)$#',
+	'message' => '#^Parameter \\#1 \\$array \\(array\\<int, PhpCsFixer\\\\Tokenizer\\\\Token\\>\\) of method PhpCsFixer\\\\Tokenizer\\\\Tokens\\:\\:fromArray\\(\\) should be contravariant with parameter \\$array \\(array\\<int, mixed\\>\\) of method SplFixedArray\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\:\\:fromArray\\(\\)$#',
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Tokenizer/Tokens.php',
 ];

doc/rules/import/fully_qualified_strict_types.rst

@@ -10,6 +10,15 @@ interfaces.
 Configuration
 -------------
 
+``import_symbols``
+~~~~~~~~~~~~~~~~~~
+
+Whether FQCNs found during analysis should be automatically imported.
+
+Allowed types: ``bool``
+
+Default value: ``false``
+
 ``leading_backslash_in_global_namespace``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -122,6 +131,46 @@ With configuration: ``['leading_backslash_in_global_namespace' => true]``.
         }
     }
 
+Example #4
+~~~~~~~~~~
+
+With configuration: ``['import_symbols' => true]``.
+
+.. code-block:: diff
+
+   --- Original
+   +++ New
+    <?php
+
+    namespace Foo\Test;
+   +use Other\BaseClass;
+   +use Other\CaughtThrowable;
+   +use Other\FunctionArgument;
+   +use Other\FunctionReturnType;
+   +use Other\Interface1;
+   +use Other\Interface2;
+   +use Other\PropertyPhpDoc;
+   +use Other\StaticFunctionCall;
+
+   -class Foo extends \Other\BaseClass implements \Other\Interface1, \Other\Interface2
+   +class Foo extends BaseClass implements Interface1, Interface2
+    {
+   -    /** @var \Other\PropertyPhpDoc */
+   +    /** @var PropertyPhpDoc */
+        private $array;
+   -    public function __construct(\Other\FunctionArgument $arg) {}
+   -    public function foo(): \Other\FunctionReturnType
+   +    public function __construct(FunctionArgument $arg) {}
+   +    public function foo(): FunctionReturnType
+        {
+            try {
+   -            \Other\StaticFunctionCall::bar();
+   -        } catch (\Other\CaughtThrowable $e) {}
+   +            StaticFunctionCall::bar();
+   +        } catch (CaughtThrowable $e) {}
+        }
+    }
+
 Rule sets
 ---------
 

phpstan.dist.neon

@@ -21,7 +21,7 @@ parameters:
         -
             message: '#^Method PhpCsFixer\\Tests\\.+::provide.+Cases\(\) return type has no value type specified in iterable type iterable\.$#'
             path: tests
-            count: 1094
+            count: 1039
 
         -
             message: '#Call to static method .+ with .+ will always evaluate to true.$#'

phpunit.xml.dist

@@ -11,6 +11,7 @@
     columns="max"
     defaultTimeLimit="10"
     enforceTimeLimit="true"
+    executionOrder="defects"
     failOnRisky="true"
     failOnWarning="true"
     timeoutForSmallTests="10"
@@ -41,10 +42,6 @@
         </include>
     </coverage>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
-
     <php>
         <ini name="zend.enable_gc" value="0"/>
         <ini name="memory_limit" value="10G"/>

src/AbstractFunctionReferenceFixer.php

@@ -43,7 +43,7 @@ public function isRisky(): bool
      * Looks up Tokens sequence for suitable candidates and delivers boundaries information,
      * which can be supplied by other methods in this abstract class.
      *
-     * @return null|int[] returns $functionName, $openParenthesis, $closeParenthesis packed into array
+     * @return ?array{int, int, int} returns $functionName, $openParenthesis, $closeParenthesis packed into array
      */
     protected function find(string $functionNameToSearch, Tokens $tokens, int $start = 0, ?int $end = null): ?array
     {

src/AbstractPhpdocToTypeDeclarationFixer.php

@@ -103,7 +103,7 @@ protected function findFunctionDocComment(Tokens $tokens, int $index): ?int
     }
 
     /**
-     * @return Annotation[]
+     * @return list<Annotation>
      */
     protected function getAnnotationsFromDocComment(string $name, Tokens $tokens, int $docCommentIndex): array
     {
@@ -123,7 +123,7 @@ protected function getAnnotationsFromDocComment(string $name, Tokens $tokens, in
     }
 
     /**
-     * @return Token[]
+     * @return list<Token>
      */
     protected function createTypeDeclarationTokens(string $type, bool $isNullable): array
     {

src/AbstractPhpdocTypesFixer.php

@@ -31,7 +31,7 @@ abstract class AbstractPhpdocTypesFixer extends AbstractFixer
     /**
      * The annotation tags search inside.
      *
-     * @var string[]
+     * @var list<string>
      */
     protected array $tags;
 
@@ -93,17 +93,16 @@ private function fixTypes(Annotation $annotation): void
     }
 
     /**
-     * @param string[] $types
+     * @param list<string> $types
      *
-     * @return string[]
+     * @return list<string>
      */
     private function normalizeTypes(array $types): array
     {
-        foreach ($types as $index => $type) {
-            $types[$index] = $this->normalizeType($type);
-        }
-
-        return $types;
+        return array_map(
+            fn (string $type): string => $this->normalizeType($type),
+            $types
+        );
     }
 
     /**

src/Cache/Cache.php

@@ -75,7 +75,7 @@ public function toJson(): string
             'hashes' => $this->hashes,
         ]);
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (JSON_ERROR_NONE !== json_last_error() || false === $json) {
             throw new \UnexpectedValueException(sprintf(
                 'Cannot encode cache signature to JSON, error: "%s". If you have non-UTF8 chars in your signature, like in license for `header_comment`, consider enabling `ext-mbstring` or install `symfony/polyfill-mbstring`.',
                 json_last_error_msg()

src/Console/Command/DescribeCommand.php

@@ -56,7 +56,7 @@ final class DescribeCommand extends Command
     protected static $defaultName = 'describe';
 
     /**
-     * @var string[]
+     * @var ?list<string>
      */
     private $setNames;
 
@@ -400,7 +400,7 @@ private function getFixers(): array
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function getSetNames(): array
     {

src/Console/ConfigurationResolver.php

@@ -531,7 +531,7 @@ public function configFinderIsOverridden(): bool
     /**
      * Compute file candidates for config file.
      *
-     * @return string[]
+     * @return list<string>
      */
     private function computeConfigFiles(): array
     {

src/Console/WarningsDetector.php

@@ -60,7 +60,7 @@ public function detectOldVendor(): void
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getWarnings(): array
     {

src/DocBlock/Annotation.php

@@ -29,7 +29,7 @@ final class Annotation
     /**
      * All the annotation tag names with types.
      *
-     * @var string[]
+     * @var list<string>
      */
     private static array $tags = [
         'method',
@@ -81,7 +81,7 @@ final class Annotation
     /**
      * The cached types.
      *
-     * @var null|string[]
+     * @var null|list<string>
      */
     private $types;
 
@@ -125,7 +125,7 @@ public function __toString(): string
     /**
      * Get all the annotation tag names with types.
      *
-     * @return string[]
+     * @return list<string>
      */
     public static function getTagsWithTypes(): array
     {
@@ -192,7 +192,7 @@ public function getVariableName()
     /**
      * Get the types associated with this annotation.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getTypes(): array
     {
@@ -209,7 +209,7 @@ public function getTypes(): array
     /**
      * Set the types associated with this annotation.
      *
-     * @param string[] $types
+     * @param list<string> $types
      */
     public function setTypes(array $types): void
     {
@@ -223,7 +223,7 @@ public function setTypes(array $types): void
     /**
      * Get the normalized types associated with this annotation, so they can easily be compared.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getNormalizedTypes(): array
     {

src/DocBlock/TypeExpression.php

@@ -210,7 +210,7 @@ public function toString(): string
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getTypes(): array
     {
@@ -594,7 +594,7 @@ private function normalize(string $type): string
     }
 
     /**
-     * @return array<string,string>
+     * @return array<string, string>
      */
     private function getAliases(): array
     {

src/Doctrine/Annotation/DocLexer.php

@@ -75,7 +75,7 @@ final class DocLexer
 
     private int $peek = 0;
 
-    private ?string $regex;
+    private ?string $regex = null;
 
     public function setInput(string $input): void
     {

src/Error/ErrorsManager.php

@@ -24,14 +24,14 @@
 final class ErrorsManager
 {
     /**
-     * @var Error[]
+     * @var list<Error>
      */
     private array $errors = [];
 
     /**
      * Returns errors reported during linting before fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getInvalidErrors(): array
     {
@@ -41,7 +41,7 @@ public function getInvalidErrors(): array
     /**
      * Returns errors reported during fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getExceptionErrors(): array
     {
@@ -51,7 +51,7 @@ public function getExceptionErrors(): array
     /**
      * Returns errors reported during linting after fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getLintErrors(): array
     {

src/Fixer/Alias/BacktickToShellExecFixer.php

@@ -96,8 +96,7 @@ private function fixBackticks(Tokens $tokens, array $backtickTokens): void
         // Track indices for final override
         ksort($backtickTokens);
         $openingBacktickIndex = key($backtickTokens);
-        end($backtickTokens);
-        $closingBacktickIndex = key($backtickTokens);
+        $closingBacktickIndex = array_key_last($backtickTokens);
 
         // Strip enclosing backticks
         array_shift($backtickTokens);

src/Fixer/Alias/PowToExponentiationFixer.php

@@ -205,7 +205,7 @@ private function isParenthesisNeeded(Tokens $tokens, int $argumentStartIndex, in
     }
 
     /**
-     * @return int[]
+     * @return list<int>
      */
     private function getAllowedKinds(): array
     {

src/Fixer/Casing/MagicMethodCasingFixer.php

@@ -24,7 +24,7 @@
 final class MagicMethodCasingFixer extends AbstractFixer
 {
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static array $magicNames = [
         '__call' => '__call',