Skip to content

Commit c595503

Browse files
committed
More service converted to #[AutowiredService] attribute usage
1 parent 6028816 commit c595503

16 files changed

+31
-16
lines changed

conf/config.neon

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,22 +216,6 @@ extensions:
216216
validateIgnoredErrors: PHPStan\DependencyInjection\ValidateIgnoredErrorsExtension
217217
validateExcludePaths: PHPStan\DependencyInjection\ValidateExcludePathsExtension
218218

219-
rules:
220-
- PHPStan\Rules\Debug\DebugScopeRule
221-
- PHPStan\Rules\Debug\DumpPhpDocTypeRule
222-
- PHPStan\Rules\Debug\DumpTypeRule
223-
- PHPStan\Rules\Debug\FileAssertRule
224-
- PHPStan\Rules\RestrictedUsage\RestrictedClassConstantUsageRule
225-
- PHPStan\Rules\RestrictedUsage\RestrictedFunctionUsageRule
226-
- PHPStan\Rules\RestrictedUsage\RestrictedFunctionCallableUsageRule
227-
- PHPStan\Rules\RestrictedUsage\RestrictedMethodUsageRule
228-
- PHPStan\Rules\RestrictedUsage\RestrictedMethodCallableUsageRule
229-
- PHPStan\Rules\RestrictedUsage\RestrictedPropertyUsageRule
230-
- PHPStan\Rules\RestrictedUsage\RestrictedStaticMethodUsageRule
231-
- PHPStan\Rules\RestrictedUsage\RestrictedStaticMethodCallableUsageRule
232-
- PHPStan\Rules\RestrictedUsage\RestrictedStaticPropertyUsageRule
233-
- PHPStan\Rules\RestrictedUsage\RestrictedUsageOfDeprecatedStringCastRule
234-
235219
conditionalTags:
236220
PHPStan\Rules\Exceptions\MissingCheckedExceptionInFunctionThrowsRule:
237221
phpstan.rules.rule: %exceptions.check.missingCheckedExceptionInThrows%

src/DependencyInjection/AutowiredAttributeServicesExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
use Nette\DI\CompilerExtension;
66
use olvlvl\ComposerAttributeCollector\Attributes;
77
use PHPStan\Broker\BrokerFactory;
8+
use PHPStan\Rules\LazyRegistry;
9+
use PHPStan\Rules\Rule;
810
use PHPStan\Type\DynamicFunctionReturnTypeExtension;
911
use ReflectionClass;
1012

@@ -19,6 +21,7 @@ public function loadConfiguration(): void
1921

2022
$interfaceToTag = [
2123
DynamicFunctionReturnTypeExtension::class => BrokerFactory::DYNAMIC_FUNCTION_RETURN_TYPE_EXTENSION_TAG,
24+
Rule::class => LazyRegistry::RULE_TAG,
2225
];
2326

2427
foreach ($autowiredServiceClasses as $class) {

src/Rules/Debug/DebugScopeRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PHPStan\Analyser\MutatingScope;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\Reflection\ReflectionProvider;
910
use PHPStan\Rules\Rule;
1011
use PHPStan\Rules\RuleErrorBuilder;
@@ -16,6 +17,7 @@
1617
/**
1718
* @implements Rule<Node\Expr\FuncCall>
1819
*/
20+
#[AutowiredService]
1921
final class DebugScopeRule implements Rule
2022
{
2123

src/Rules/Debug/DumpPhpDocTypeRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use PhpParser\Node;
66
use PHPStan\Analyser\Scope;
7+
use PHPStan\DependencyInjection\AutowiredService;
78
use PHPStan\PhpDocParser\Printer\Printer;
89
use PHPStan\Reflection\ReflectionProvider;
910
use PHPStan\Rules\Rule;
@@ -15,6 +16,7 @@
1516
/**
1617
* @implements Rule<Node\Expr\FuncCall>
1718
*/
19+
#[AutowiredService]
1820
final class DumpPhpDocTypeRule implements Rule
1921
{
2022

src/Rules/Debug/DumpTypeRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use PhpParser\Node;
66
use PHPStan\Analyser\Scope;
7+
use PHPStan\DependencyInjection\AutowiredService;
78
use PHPStan\Reflection\ReflectionProvider;
89
use PHPStan\Rules\Rule;
910
use PHPStan\Rules\RuleErrorBuilder;
@@ -15,6 +16,7 @@
1516
/**
1617
* @implements Rule<Node\Expr\FuncCall>
1718
*/
19+
#[AutowiredService]
1820
final class DumpTypeRule implements Rule
1921
{
2022

src/Rules/Debug/FileAssertRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Expr\StaticCall;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\Reflection\ReflectionProvider;
910
use PHPStan\Rules\IdentifierRuleError;
1011
use PHPStan\Rules\Rule;
@@ -18,6 +19,7 @@
1819
/**
1920
* @implements Rule<Node\Expr\FuncCall>
2021
*/
22+
#[AutowiredService]
2123
final class FileAssertRule implements Rule
2224
{
2325

src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PhpParser\Node\Identifier;
77
use PhpParser\Node\Name;
88
use PHPStan\Analyser\Scope;
9+
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\DependencyInjection\Container;
1011
use PHPStan\Reflection\ReflectionProvider;
1112
use PHPStan\Rules\Rule;
@@ -17,6 +18,7 @@
1718
/**
1819
* @implements Rule<Node\Expr\ClassConstFetch>
1920
*/
21+
#[AutowiredService]
2022
final class RestrictedClassConstantUsageRule implements Rule
2123
{
2224

src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Name;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\DependencyInjection\Container;
910
use PHPStan\Node\FunctionCallableNode;
1011
use PHPStan\Reflection\ReflectionProvider;
@@ -14,6 +15,7 @@
1415
/**
1516
* @implements Rule<FunctionCallableNode>
1617
*/
18+
#[AutowiredService]
1719
final class RestrictedFunctionCallableUsageRule implements Rule
1820
{
1921

src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Name;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\DependencyInjection\Container;
910
use PHPStan\Reflection\ReflectionProvider;
1011
use PHPStan\Rules\Rule;
@@ -13,6 +14,7 @@
1314
/**
1415
* @implements Rule<Node\Expr\FuncCall>
1516
*/
17+
#[AutowiredService]
1618
final class RestrictedFunctionUsageRule implements Rule
1719
{
1820

src/Rules/RestrictedUsage/RestrictedMethodCallableUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Identifier;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\DependencyInjection\Container;
910
use PHPStan\Node\MethodCallableNode;
1011
use PHPStan\Reflection\ReflectionProvider;
@@ -14,6 +15,7 @@
1415
/**
1516
* @implements Rule<MethodCallableNode>
1617
*/
18+
#[AutowiredService]
1719
final class RestrictedMethodCallableUsageRule implements Rule
1820
{
1921

src/Rules/RestrictedUsage/RestrictedMethodUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PhpParser\Node\Expr\MethodCall;
77
use PhpParser\Node\Identifier;
88
use PHPStan\Analyser\Scope;
9+
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\DependencyInjection\Container;
1011
use PHPStan\Reflection\ReflectionProvider;
1112
use PHPStan\Rules\Rule;
@@ -14,6 +15,7 @@
1415
/**
1516
* @implements Rule<MethodCall>
1617
*/
18+
#[AutowiredService]
1719
final class RestrictedMethodUsageRule implements Rule
1820
{
1921

src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Identifier;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\DependencyInjection\Container;
910
use PHPStan\Reflection\ReflectionProvider;
1011
use PHPStan\Rules\Rule;
@@ -13,6 +14,7 @@
1314
/**
1415
* @implements Rule<Node\Expr\PropertyFetch>
1516
*/
17+
#[AutowiredService]
1618
final class RestrictedPropertyUsageRule implements Rule
1719
{
1820

src/Rules/RestrictedUsage/RestrictedStaticMethodCallableUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PhpParser\Node\Identifier;
77
use PhpParser\Node\Name;
88
use PHPStan\Analyser\Scope;
9+
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\DependencyInjection\Container;
1011
use PHPStan\Node\StaticMethodCallableNode;
1112
use PHPStan\Reflection\ReflectionProvider;
@@ -18,6 +19,7 @@
1819
/**
1920
* @implements Rule<StaticMethodCallableNode>
2021
*/
22+
#[AutowiredService]
2123
final class RestrictedStaticMethodCallableUsageRule implements Rule
2224
{
2325

src/Rules/RestrictedUsage/RestrictedStaticMethodUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PhpParser\Node\Identifier;
77
use PhpParser\Node\Name;
88
use PHPStan\Analyser\Scope;
9+
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\DependencyInjection\Container;
1011
use PHPStan\Reflection\ReflectionProvider;
1112
use PHPStan\Rules\Rule;
@@ -17,6 +18,7 @@
1718
/**
1819
* @implements Rule<Node\Expr\StaticCall>
1920
*/
21+
#[AutowiredService]
2022
final class RestrictedStaticMethodUsageRule implements Rule
2123
{
2224

src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use PhpParser\Node\Identifier;
77
use PhpParser\Node\Name;
88
use PHPStan\Analyser\Scope;
9+
use PHPStan\DependencyInjection\AutowiredService;
910
use PHPStan\DependencyInjection\Container;
1011
use PHPStan\Reflection\ReflectionProvider;
1112
use PHPStan\Rules\Rule;
@@ -17,6 +18,7 @@
1718
/**
1819
* @implements Rule<Node\Expr\StaticPropertyFetch>
1920
*/
21+
#[AutowiredService]
2022
final class RestrictedStaticPropertyUsageRule implements Rule
2123
{
2224

src/Rules/RestrictedUsage/RestrictedUsageOfDeprecatedStringCastRule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Expr\Cast;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\DependencyInjection\AutowiredService;
89
use PHPStan\DependencyInjection\Container;
910
use PHPStan\Reflection\ReflectionProvider;
1011
use PHPStan\Rules\Rule;
@@ -13,6 +14,7 @@
1314
/**
1415
* @implements Rule<Cast\String_>
1516
*/
17+
#[AutowiredService]
1618
final class RestrictedUsageOfDeprecatedStringCastRule implements Rule
1719
{
1820

0 commit comments

Comments
 (0)