Skip to content

Commit 077acd5

Browse files
committed
Updated ECS to commit 5ae3d2176d6d78c458849a254598ace8f66142ce
1 parent be4ee13 commit 077acd5

6 files changed

Lines changed: 54 additions & 3 deletions

File tree

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace Symplify\CodingStandard\Fixer\Commenting;
5+
6+
use PhpCsFixer\DocBlock\DocBlock;
7+
use PhpCsFixer\FixerDefinition\FixerDefinition;
8+
use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
9+
use PhpCsFixer\Tokenizer\Token;
10+
use PhpCsFixer\Tokenizer\Tokens;
11+
use Symplify\CodingStandard\Utils\Regex;
12+
/**
13+
* Removes a dead inline var doc block that types the "$this" variable - it carries no
14+
* information, as the type of "$this" is already known from the surrounding class.
15+
*
16+
* @see \Symplify\CodingStandard\Tests\Fixer\Commenting\RemoveDeadVarThisFixer\RemoveDeadVarThisFixerTest
17+
*/
18+
final class RemoveDeadVarThisFixer extends \Symplify\CodingStandard\Fixer\Commenting\AbstractDocBlockFixer
19+
{
20+
/**
21+
* @var string
22+
*/
23+
private const ERROR_MESSAGE = 'Remove a dead inline "@var ... $this" doc block';
24+
/**
25+
* @see https://regex101.com/r/Hk4lFc/2
26+
* @var string
27+
*/
28+
private const VAR_THIS_REGEX = '#@(?:psalm-|phpstan-)?var\b[^\n]*\$this\b#';
29+
public function getDefinition(): FixerDefinitionInterface
30+
{
31+
return new FixerDefinition(self::ERROR_MESSAGE, []);
32+
}
33+
/**
34+
* @param Tokens<Token> $tokens
35+
*/
36+
protected function processDocContent(string $docContent, Tokens $tokens, int $position): string
37+
{
38+
$docBlock = new DocBlock($docContent);
39+
foreach ($docBlock->getLines() as $line) {
40+
if (!Regex::match($line->getContent(), self::VAR_THIS_REGEX)) {
41+
continue;
42+
}
43+
$line->remove();
44+
}
45+
return $docBlock->getContent();
46+
}
47+
}

src/Application/Version/StaticVersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ final class StaticVersionResolver
1515
* @api
1616
* @var string
1717
*/
18-
public const PACKAGE_VERSION = 'ceabc1afefe0a0dab3e6544bce960f1fb296220e';
18+
public const PACKAGE_VERSION = '5ae3d2176d6d78c458849a254598ace8f66142ce';
1919
/**
2020
* @api
2121
* @var string
2222
*/
23-
public const RELEASE_DATE = '2026-06-13 18:38:23';
23+
public const RELEASE_DATE = '2026-06-13 21:33:19';
2424
/**
2525
* @var int
2626
*/

src/Config/Level/DocblockLevel.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Symplify\CodingStandard\Fixer\Commenting\DoubleAsteriskInlineVarFixer;
2222
use Symplify\CodingStandard\Fixer\Commenting\FixParamNameTypoFixer;
2323
use Symplify\CodingStandard\Fixer\Commenting\RemoveDeadParamFixer;
24+
use Symplify\CodingStandard\Fixer\Commenting\RemoveDeadVarThisFixer;
2425
use Symplify\CodingStandard\Fixer\Commenting\RemoveParamNameReferenceFixer;
2526
use Symplify\CodingStandard\Fixer\Commenting\RemoveSuperfluousReturnNameFixer;
2627
use Symplify\CodingStandard\Fixer\Commenting\RemoveSuperfluousVarNameFixer;
@@ -42,6 +43,7 @@ final class DocblockLevel
4243
public const RULES = [
4344
// inline @var
4445
DoubleAsteriskInlineVarFixer::class,
46+
RemoveDeadVarThisFixer::class,
4547
SingleLineInlineVarDocBlockFixer::class,
4648
AddMissingVarNameFixer::class,
4749
// @param

vendor/composer/autoload_classmap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,7 @@
13721372
'Symplify\\CodingStandard\\Fixer\\Commenting\\FixParamNameTypoFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/FixParamNameTypoFixer.php',
13731373
'Symplify\\CodingStandard\\Fixer\\Commenting\\ParamReturnAndVarTagMalformsFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer.php',
13741374
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadParamFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadParamFixer.php',
1375+
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadVarThisFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadVarThisFixer.php',
13751376
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveParamNameReferenceFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveParamNameReferenceFixer.php',
13761377
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveSuperfluousReturnNameFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveSuperfluousReturnNameFixer.php',
13771378
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveSuperfluousVarNameFixer' => $baseDir . '/packages/coding-standard/src/Fixer/Commenting/RemoveSuperfluousVarNameFixer.php',

vendor/composer/autoload_static.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,6 +1573,7 @@ class ComposerStaticInit140cfe36c3b88e9853e9126c396a1c8e
15731573
'Symplify\\CodingStandard\\Fixer\\Commenting\\FixParamNameTypoFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/FixParamNameTypoFixer.php',
15741574
'Symplify\\CodingStandard\\Fixer\\Commenting\\ParamReturnAndVarTagMalformsFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/ParamReturnAndVarTagMalformsFixer.php',
15751575
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadParamFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadParamFixer.php',
1576+
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveDeadVarThisFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveDeadVarThisFixer.php',
15761577
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveParamNameReferenceFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveParamNameReferenceFixer.php',
15771578
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveSuperfluousReturnNameFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveSuperfluousReturnNameFixer.php',
15781579
'Symplify\\CodingStandard\\Fixer\\Commenting\\RemoveSuperfluousVarNameFixer' => __DIR__ . '/../..' . '/packages/coding-standard/src/Fixer/Commenting/RemoveSuperfluousVarNameFixer.php',

vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)