Updated ECS to commit 3b27602460406202729aa783c2fc448a0d2c5d35

TomasVotruba · TomasVotruba · commit 027894f33be1 · 2026-06-26T09:58:15.000Z
diff --git a/packages/coding-standard/src/Fixer/Commenting/FixTagTypoFixer.php b/packages/coding-standard/src/Fixer/Commenting/FixTagTypoFixer.php
@@ -0,0 +1,34 @@
+<?php
+
+declare (strict_types=1);
+namespace Symplify\CodingStandard\Fixer\Commenting;
+
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+use Symplify\CodingStandard\Utils\Regex;
+/**
+ * Fixes a plural-"s" typo on the @return, @param and @var doc block tags (e.g. a stray "@return" + "s" becomes "@return").
+ *
+ * @see \Symplify\CodingStandard\Tests\Fixer\Commenting\FixTagTypoFixer\FixTagTypoFixerTest
+ */
+final class FixTagTypoFixer extends \Symplify\CodingStandard\Fixer\Commenting\AbstractDocBlockFixer
+{
+    /**
+     * @see https://regex101.com/r/8tFqJp/1
+     * @var string
+     */
+    private const PLURAL_TAG_REGEX = '#@((?:psalm-|phpstan-)?(?:param|return|var))s\b#';
+    public function getDefinition(): FixerDefinitionInterface
+    {
+        return new FixerDefinition('Fix a plural typo in a doc block tag, e.g. "@returns" to "@return"', []);
+    }
+    /**
+     * @param Tokens<Token> $tokens
+     */
+    protected function processDocContent(string $docContent, Tokens $tokens, int $position): string
+    {
+        return Regex::replace($docContent, self::PLURAL_TAG_REGEX, '@$1');
+    }
+}
diff --git a/src/Application/Version/StaticVersionResolver.php b/src/Application/Version/StaticVersionResolver.php
@@ -15,12 +15,12 @@ final class StaticVersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '99562d6ac18239f1e6776c51845392e0668ab9d2';
+    public const PACKAGE_VERSION = '3b27602460406202729aa783c2fc448a0d2c5d35';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-20 18:32:51';
+    public const RELEASE_DATE = '2026-06-26 11:55:44';
     /**
      * @var int
      */
diff --git a/src/Config/Level/DocblockLevel.php b/src/Config/Level/DocblockLevel.php
@@ -34,6 +34,7 @@
 use Symplify\CodingStandard\Fixer\Commenting\AddMissingVarNameFixer;
 use Symplify\CodingStandard\Fixer\Commenting\DoubleAsteriskInlineVarFixer;
 use Symplify\CodingStandard\Fixer\Commenting\FixParamNameTypoFixer;
+use Symplify\CodingStandard\Fixer\Commenting\FixTagTypoFixer;
 use Symplify\CodingStandard\Fixer\Commenting\RemoveDeadParamFixer;
 use Symplify\CodingStandard\Fixer\Commenting\RemoveDeadVarThisFixer;
 use Symplify\CodingStandard\Fixer\Commenting\RemoveParamNameReferenceFixer;
@@ -55,6 +56,8 @@ final class DocblockLevel
      * @var array<class-string<Sniff|FixerInterface>>
      */
     public const RULES = [
+        // tag name typos (@returns → @return), run early so later rules see correct tags
+        FixTagTypoFixer::class,
         // inline @var
         DoubleAsteriskInlineVarFixer::class,
         RemoveDeadVarThisFixer::class,
diff --git a/src/Configuration/ConfigInitializer.php b/src/Configuration/ConfigInitializer.php
@@ -6,6 +6,7 @@
 use ECSPrefix202606\Nette\Utils\FileSystem;
 use Symplify\EasyCodingStandard\Application\FileProcessorCollector;
 use Symplify\EasyCodingStandard\Console\Style\EasyCodingStandardStyle;
+use Symplify\EasyCodingStandard\Contract\Application\FileProcessorInterface;
 final class ConfigInitializer
 {
     /**
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -1211,6 +1211,7 @@
     'Symplify\\CodingStandard\\Fixer\\Commenting\\AddMissingVarNameFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/AddMissingVarNameFixer.php',
     'Symplify\\CodingStandard\\Fixer\\Commenting\\DoubleAsteriskInlineVarFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/DoubleAsteriskInlineVarFixer.php',
     'Symplify\\CodingStandard\\Fixer\\Commenting\\FixParamNameTypoFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/FixParamNameTypoFixer.php',
+    'Symplify\\CodingStandard\\Fixer\\Commenting\\FixTagTypoFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/FixTagTypoFixer.php',
     'Symplify\\CodingStandard\\Fixer\\Commenting\\ParamReturnAndVarTagMalformsFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer.php',
     'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadParamFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadParamFixer.php',
     'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadVarThisFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadVarThisFixer.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -1380,6 +1380,7 @@ class ComposerStaticInitc23700a8507cf45c476c8104d331b180
         'Symplify\\CodingStandard\\Fixer\\Commenting\\AddMissingVarNameFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/AddMissingVarNameFixer.php',
         'Symplify\\CodingStandard\\Fixer\\Commenting\\DoubleAsteriskInlineVarFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/DoubleAsteriskInlineVarFixer.php',
         'Symplify\\CodingStandard\\Fixer\\Commenting\\FixParamNameTypoFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/FixParamNameTypoFixer.php',
+        'Symplify\\CodingStandard\\Fixer\\Commenting\\FixTagTypoFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/FixTagTypoFixer.php',
         'Symplify\\CodingStandard\\Fixer\\Commenting\\ParamReturnAndVarTagMalformsFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer.php',
         'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadParamFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadParamFixer.php',
         'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadVarThisFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadVarThisFixer.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -536,17 +536,17 @@
         },
         {
             "name": "friendsofphp\/php-cs-fixer",
-            "version": "v3.95.10",
-            "version_normalized": "3.95.10.0",
+            "version": "v3.95.11",
+            "version_normalized": "3.95.11.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/PHP-CS-Fixer\/PHP-CS-Fixer.git",
-                "reference": "93e1ab3e1f153024bd3ab23c8a349556063c6f17"
+                "reference": "35f98e1293283397824d7f349ce5afb8747c3cd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/PHP-CS-Fixer\/PHP-CS-Fixer\/zipball\/93e1ab3e1f153024bd3ab23c8a349556063c6f17",
-                "reference": "93e1ab3e1f153024bd3ab23c8a349556063c6f17",
+                "url": "https:\/\/api.github.com\/repos\/PHP-CS-Fixer\/PHP-CS-Fixer\/zipball\/35f98e1293283397824d7f349ce5afb8747c3cd5",
+                "reference": "35f98e1293283397824d7f349ce5afb8747c3cd5",
                 "shasum": ""
             },
             "require": {
@@ -580,7 +580,7 @@
             "require-dev": {
                 "facile-it\/paraunit": "^1.3.1 || ^2.11.0",
                 "infection\/infection": "^0.32.7",
-                "justinrainbow\/json-schema": "^6.9.0",
+                "justinrainbow\/json-schema": "^6.10.0",
                 "keradus\/cli-executor": "^2.3",
                 "mikey179\/vfsstream": "^1.6.12",
                 "php-coveralls\/php-coveralls": "^2.9.1",
@@ -595,7 +595,7 @@
                 "ext-dom": "For handling output formats in XML",
                 "ext-mbstring": "For handling non-UTF8 characters."
             },
-            "time": "2026-06-19T14:45:22+00:00",
+            "time": "2026-06-25T14:17:04+00:00",
             "bin": [
                 "php-cs-fixer"
             ],
@@ -632,7 +632,7 @@
             ],
             "support": {
                 "issues": "https:\/\/github.com\/PHP-CS-Fixer\/PHP-CS-Fixer\/issues",
-                "source": "https:\/\/github.com\/PHP-CS-Fixer\/PHP-CS-Fixer\/tree\/v3.95.10"
+                "source": "https:\/\/github.com\/PHP-CS-Fixer\/PHP-CS-Fixer\/tree\/v3.95.11"
             },
             "funding": [
                 {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
diff --git a/vendor/friendsofphp/php-cs-fixer/composer.json b/vendor/friendsofphp/php-cs-fixer/composer.json
@@ -50,7 +50,7 @@
     "require-dev": {
         "facile-it\/paraunit": "^1.3.1 || ^2.11.0",
         "infection\/infection": "^0.32.7",
-        "justinrainbow\/json-schema": "^6.9.0",
+        "justinrainbow\/json-schema": "^6.10.0",
         "keradus\/cli-executor": "^2.3",
         "mikey179\/vfsstream": "^1.6.12",
         "php-coveralls\/php-coveralls": "^2.9.1",
diff --git a/vendor/friendsofphp/php-cs-fixer/src/Console/Application.php b/vendor/friendsofphp/php-cs-fixer/src/Console/Application.php
@@ -48,7 +48,7 @@
 final class Application extends BaseApplication
 {
     public const NAME = 'PHP CS Fixer';
-    public const VERSION = '3.95.10';
+    public const VERSION = '3.95.11';
     public const VERSION_CODENAME = 'Adalbertus';
     /**
      * @readonly
diff --git a/vendor/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/NoBreakCommentFixer.php b/vendor/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/NoBreakCommentFixer.php
@@ -27,6 +27,7 @@
 use PhpCsFixer\Tokenizer\FCT;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
+use PhpCsFixer\Tokenizer\TokensAnalyzer;
 use ECSPrefix202606\Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use ECSPrefix202606\Symfony\Component\OptionsResolver\Options;
 /**
@@ -108,13 +109,14 @@ protected function createConfigurationDefinition(): FixerConfigurationResolverIn
     }
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
+        $analyzer = new TokensAnalyzer($tokens);
         for ($index = \count($tokens) - 1; $index >= 0; --$index) {
             if ($tokens[$index]->isGivenKind(\T_DEFAULT)) {
                 if ($tokens[$tokens->getNextMeaningfulToken($index)]->isGivenKind(\T_DOUBLE_ARROW)) {
                     continue;
                     // this is "default" from "match"
                 }
-            } elseif (!$tokens[$index]->isGivenKind(\T_CASE)) {
+            } elseif (!$tokens[$index]->isGivenKind(\T_CASE) || $analyzer->isEnumCase($index)) {
                 continue;
             }
             $this->fixCase($tokens, $tokens->getNextTokenOfKind($index, [':', ';']));
diff --git a/vendor/friendsofphp/php-cs-fixer/src/Tokenizer/TokensAnalyzer.php b/vendor/friendsofphp/php-cs-fixer/src/Tokenizer/TokensAnalyzer.php
@@ -520,8 +520,18 @@ public function isEnumCase(int $caseIndex): bool
         if (!$tokens->isTokenKindFound(\PhpCsFixer\Tokenizer\FCT::T_ENUM)) {
             return \false;
         }
-        $prevIndex = $tokens->getPrevTokenOfKind($caseIndex, [[\T_ENUM], [\T_SWITCH]]);
-        return null !== $prevIndex && $tokens[$prevIndex]->isGivenKind(\T_ENUM);
+        $prevIndex = $caseIndex;
+        // get the T_ENUM or T_SWITCH that is matching the T_CASE, detecting and skipping the {...} blocks in between, as they may have nested switch-case
+        while (\true) {
+            $prevIndex = $tokens->getPrevTokenOfKind($prevIndex, ['}', [\T_ENUM], [\T_SWITCH]]);
+            \assert(null !== $prevIndex);
+            if ($tokens[$prevIndex]->equals('}')) {
+                $prevIndex = $tokens->findBlockStart(\PhpCsFixer\Tokenizer\Tokens::BLOCK_TYPE_BRACE, $prevIndex);
+            } else {
+                break;
+            }
+        }
+        return $tokens[$prevIndex]->isGivenKind(\T_ENUM);
     }
     public function isSuperGlobal(int $index): bool
     {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use ECSPrefix202606\Nette\Utils\FileSystem;`
`7`	`7`	`use Symplify\EasyCodingStandard\Application\FileProcessorCollector;`
`8`	`8`	`use Symplify\EasyCodingStandard\Console\Style\EasyCodingStandardStyle;`
	`9`	`+use Symplify\EasyCodingStandard\Contract\Application\FileProcessorInterface;`
`9`	`10`	`final class ConfigInitializer`
`10`	`11`	`{`
`11`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`final class Application extends BaseApplication`
`49`	`49`	`{`
`50`	`50`	`public const NAME = 'PHP CS Fixer';`
`51`		`- public const VERSION = '3.95.10';`
	`51`	`+ public const VERSION = '3.95.11';`
`52`	`52`	`public const VERSION_CODENAME = 'Adalbertus';`
`53`	`53`	`/**`
`54`	`54`	`* @readonly`