Skip to content

Commit 25a0380

Browse files
ondrejmirtesondrejmirtes
committed
Call createReflectionProvider() statically
1 parent dee013b commit 25a0380

File tree

216 files changed

+262
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+262
-262
lines changed

‎tests/PHPStan/Analyser/AnalyserIntegrationTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function testExtendingKnownClassWithCheck(): void
8181
$errors = $this->runAnalyse(__DIR__ . '/data/extending-known-class-with-check.php');
8282
$this->assertNoErrors($errors);
8383

84-
$reflectionProvider = $this->createReflectionProvider();
84+
$reflectionProvider = self::createReflectionProvider();
8585
$this->assertTrue($reflectionProvider->hasClass(Foo::class));
8686
}
8787

@@ -372,7 +372,7 @@ public function testBug4713(): void
372372
$this->assertCount(1, $errors);
373373
$this->assertSame('Method Bug4713\Service::createInstance() should return Bug4713\Service but returns object.', $errors[0]->getMessage());
374374

375-
$reflectionProvider = $this->createReflectionProvider();
375+
$reflectionProvider = self::createReflectionProvider();
376376
$class = $reflectionProvider->getClass(Service::class);
377377
$parameter = $class->getNativeMethod('createInstance')->getOnlyVariant()->getParameters()[0];
378378
$defaultValue = $parameter->getDefaultValue();
@@ -385,7 +385,7 @@ public function testBug4288(): void
385385
$errors = $this->runAnalyse(__DIR__ . '/data/bug-4288.php');
386386
$this->assertNoErrors($errors);
387387

388-
$reflectionProvider = $this->createReflectionProvider();
388+
$reflectionProvider = self::createReflectionProvider();
389389
$class = $reflectionProvider->getClass(MyClass::class);
390390
$parameter = $class->getNativeMethod('paginate')->getOnlyVariant()->getParameters()[0];
391391
$defaultValue = $parameter->getDefaultValue();

‎tests/PHPStan/Analyser/AnalyserTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ private function runAnalyser(
672672
new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
673673
self::getContainer()->getByType(RuleErrorTransformer::class),
674674
$this->createScopeFactory(
675-
$this->createReflectionProvider(),
675+
self::createReflectionProvider(),
676676
self::getContainer()->getService('typeSpecifier'),
677677
),
678678
new LocalIgnoresProcessor(),
@@ -700,7 +700,7 @@ private function createAnalyser(): Analyser
700700
]);
701701
$collectorRegistry = new CollectorRegistry([]);
702702

703-
$reflectionProvider = $this->createReflectionProvider();
703+
$reflectionProvider = self::createReflectionProvider();
704704
$fileHelper = $this->getFileHelper();
705705

706706
$typeSpecifier = self::getContainer()->getService('typeSpecifier');

‎tests/PHPStan/Analyser/AnonymousClassNameRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AnonymousClassNameRuleTest extends RuleTestCase
1010

1111
protected function getRule(): Rule
1212
{
13-
$reflectionProvider = $this->createReflectionProvider();
13+
$reflectionProvider = self::createReflectionProvider();
1414
return new AnonymousClassNameRule($reflectionProvider);
1515
}
1616

‎tests/PHPStan/Analyser/Bug9307CallMethodsRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Bug9307CallMethodsRuleTest extends RuleTestCase
2020

2121
protected function getRule(): Rule
2222
{
23-
$reflectionProvider = $this->createReflectionProvider();
23+
$reflectionProvider = self::createReflectionProvider();
2424
$ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, false, true, true, false, false, true);
2525
return new CallMethodsRule(
2626
new MethodCallCheck($reflectionProvider, $ruleLevelHelper, true, true),

‎tests/PHPStan/Analyser/TypeSpecifierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class TypeSpecifierTest extends PHPStanTestCase
5858

5959
protected function setUp(): void
6060
{
61-
$reflectionProvider = $this->createReflectionProvider();
61+
$reflectionProvider = self::createReflectionProvider();
6262
$this->printer = new Printer();
6363
$this->typeSpecifier = self::getContainer()->getService('typeSpecifier');
6464
$this->scope = $this->createScopeFactory($reflectionProvider, $this->typeSpecifier)->create(ScopeContext::create(''));

‎tests/PHPStan/Build/AttributeNamedArgumentsRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AttributeNamedArgumentsRuleTest extends RuleTestCase
1313

1414
protected function getRule(): Rule
1515
{
16-
return new AttributeNamedArgumentsRule($this->createReflectionProvider());
16+
return new AttributeNamedArgumentsRule(self::createReflectionProvider());
1717
}
1818

1919
public function testRule(): void

‎tests/PHPStan/Build/NamedArgumentsRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class NamedArgumentsRuleTest extends RuleTestCase
1515

1616
protected function getRule(): Rule
1717
{
18-
return new NamedArgumentsRule($this->createReflectionProvider(), new PhpVersion(PHP_VERSION_ID));
18+
return new NamedArgumentsRule(self::createReflectionProvider(), new PhpVersion(PHP_VERSION_ID));
1919
}
2020

2121
public function testRule(): void

‎tests/PHPStan/Reflection/Annotations/AnnotationsMethodsClassReflectionExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ public static function dataMethods(): array
963963
*/
964964
public function testMethods(string $className, array $methods): void
965965
{
966-
$reflectionProvider = $this->createReflectionProvider();
966+
$reflectionProvider = self::createReflectionProvider();
967967
$class = $reflectionProvider->getClass($className);
968968
$scope = $this->createMock(Scope::class);
969969
$scope->method('isInClass')->willReturn(true);
@@ -1025,7 +1025,7 @@ public function testMethods(string $className, array $methods): void
10251025

10261026
public function testOverridingNativeMethodsWithAnnotationsDoesNotBreakGetNativeMethod(): void
10271027
{
1028-
$reflectionProvider = $this->createReflectionProvider();
1028+
$reflectionProvider = self::createReflectionProvider();
10291029
$class = $reflectionProvider->getClass(Bar::class);
10301030
$this->assertTrue($class->hasNativeMethod('overridenMethodWithAnnotation'));
10311031
$this->assertInstanceOf(PhpMethodReflection::class, $class->getNativeMethod('overridenMethodWithAnnotation'));

‎tests/PHPStan/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static function dataProperties(): array
277277
*/
278278
public function testProperties(string $className, array $properties): void
279279
{
280-
$reflectionProvider = $this->createReflectionProvider();
280+
$reflectionProvider = self::createReflectionProvider();
281281
$class = $reflectionProvider->getClass($className);
282282
$scope = $this->createMock(Scope::class);
283283
$scope->method('isInClass')->willReturn(true);
@@ -322,7 +322,7 @@ public function testProperties(string $className, array $properties): void
322322

323323
public function testOverridingNativePropertiesWithAnnotationsDoesNotBreakGetNativeProperty(): void
324324
{
325-
$reflectionProvider = $this->createReflectionProvider();
325+
$reflectionProvider = self::createReflectionProvider();
326326
$class = $reflectionProvider->getClass(Bar::class);
327327
$this->assertTrue($class->hasNativeProperty('overridenPropertyWithAnnotation'));
328328
$this->assertSame('AnnotationsProperties\Foo', $class->getNativeProperty('overridenPropertyWithAnnotation')->getReadableType()->describe(VerbosityLevel::precise()));

‎tests/PHPStan/Reflection/Annotations/DeprecatedAnnotationsTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static function dataDeprecatedAnnotations(): array
9393
*/
9494
public function testDeprecatedAnnotations(bool $deprecated, string $className, ?string $classDeprecation, array $deprecatedAnnotations): void
9595
{
96-
$reflectionProvider = $this->createReflectionProvider();
96+
$reflectionProvider = self::createReflectionProvider();
9797
$class = $reflectionProvider->getClass($className);
9898
$scope = $this->createMock(Scope::class);
9999
$scope->method('isInClass')->willReturn(true);
@@ -128,15 +128,15 @@ public function testDeprecatedUserFunctions(): void
128128
{
129129
require_once __DIR__ . '/data/annotations-deprecated.php';
130130

131-
$reflectionProvider = $this->createReflectionProvider();
131+
$reflectionProvider = self::createReflectionProvider();
132132

133133
$this->assertFalse($reflectionProvider->getFunction(new Name\FullyQualified('DeprecatedAnnotations\foo'), null)->isDeprecated()->yes());
134134
$this->assertTrue($reflectionProvider->getFunction(new Name\FullyQualified('DeprecatedAnnotations\deprecatedFoo'), null)->isDeprecated()->yes());
135135
}
136136

137137
public function testNonDeprecatedNativeFunctions(): void
138138
{
139-
$reflectionProvider = $this->createReflectionProvider();
139+
$reflectionProvider = self::createReflectionProvider();
140140

141141
$this->assertFalse($reflectionProvider->getFunction(new Name('str_replace'), null)->isDeprecated()->yes());
142142
$this->assertFalse($reflectionProvider->getFunction(new Name('get_class'), null)->isDeprecated()->yes());
@@ -145,14 +145,14 @@ public function testNonDeprecatedNativeFunctions(): void
145145

146146
public function testDeprecatedMethodsFromInterface(): void
147147
{
148-
$reflectionProvider = $this->createReflectionProvider();
148+
$reflectionProvider = self::createReflectionProvider();
149149
$class = $reflectionProvider->getClass(DeprecatedBar::class);
150150
$this->assertTrue($class->getNativeMethod('superDeprecated')->isDeprecated()->yes());
151151
}
152152

153153
public function testNotDeprecatedChildMethods(): void
154154
{
155-
$reflectionProvider = $this->createReflectionProvider();
155+
$reflectionProvider = self::createReflectionProvider();
156156

157157
$this->assertTrue($reflectionProvider->getClass(BazInterface::class)->getNativeMethod('superDeprecated')->isDeprecated()->yes());
158158
$this->assertTrue($reflectionProvider->getClass(SubBazInterface::class)->getNativeMethod('superDeprecated')->isDeprecated()->no());
@@ -197,7 +197,7 @@ public function testDeprecatedAttributeAboveFunction(string $functionName, Trina
197197
{
198198
require_once __DIR__ . '/data/deprecated-attribute-functions.php';
199199

200-
$reflectionProvider = $this->createReflectionProvider();
200+
$reflectionProvider = self::createReflectionProvider();
201201
$function = $reflectionProvider->getFunction(new Name($functionName), null);
202202
$this->assertSame($isDeprecated->describe(), $function->isDeprecated()->describe());
203203
$this->assertSame($deprecatedDescription, $function->getDeprecatedDescription());
@@ -236,7 +236,7 @@ public static function dataDeprecatedAttributeAboveMethod(): iterable
236236
*/
237237
public function testDeprecatedAttributeAboveMethod(string $className, string $methodName, TrinaryLogic $isDeprecated, ?string $deprecatedDescription): void
238238
{
239-
$reflectionProvider = $this->createReflectionProvider();
239+
$reflectionProvider = self::createReflectionProvider();
240240
$class = $reflectionProvider->getClass($className);
241241
$method = $class->getNativeMethod($methodName);
242242
$this->assertSame($isDeprecated->describe(), $method->isDeprecated()->describe());
@@ -299,7 +299,7 @@ public static function dataDeprecatedAttributeAboveClassConstant(): iterable
299299
*/
300300
public function testDeprecatedAttributeAboveClassConstant(string $className, string $constantName, TrinaryLogic $isDeprecated, ?string $deprecatedDescription): void
301301
{
302-
$reflectionProvider = $this->createReflectionProvider();
302+
$reflectionProvider = self::createReflectionProvider();
303303
$class = $reflectionProvider->getClass($className);
304304
$constant = $class->getConstant($constantName);
305305
$this->assertSame($isDeprecated->describe(), $constant->isDeprecated()->describe());
@@ -337,7 +337,7 @@ public function testDeprecatedAttributeAboveEnumCase(string $className, string $
337337
$this->markTestSkipped('Test requires PHP 8.1.');
338338
}
339339

340-
$reflectionProvider = $this->createReflectionProvider();
340+
$reflectionProvider = self::createReflectionProvider();
341341
$class = $reflectionProvider->getClass($className);
342342
$case = $class->getEnumCase($caseName);
343343
$this->assertSame($isDeprecated->describe(), $case->isDeprecated()->describe());
@@ -393,7 +393,7 @@ public function testDeprecatedAttributeAbovePropertyHook(string $className, stri
393393
$this->markTestSkipped('Test requires PHP 8.4.');
394394
}
395395

396-
$reflectionProvider = $this->createReflectionProvider();
396+
$reflectionProvider = self::createReflectionProvider();
397397
$class = $reflectionProvider->getClass($className);
398398
$property = $class->getNativeProperty($propertyName);
399399
$hook = $property->getHook($hookName);

‎tests/PHPStan/Reflection/Annotations/FinalAnnotationsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static function dataFinalAnnotations(): array
4242
*/
4343
public function testFinalAnnotations(bool $final, string $className, array $finalAnnotations): void
4444
{
45-
$reflectionProvider = $this->createReflectionProvider();
45+
$reflectionProvider = self::createReflectionProvider();
4646
$class = $reflectionProvider->getClass($className);
4747
$scope = $this->createMock(Scope::class);
4848
$scope->method('isInClass')->willReturn(true);

‎tests/PHPStan/Reflection/Annotations/InternalAnnotationsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static function dataInternalAnnotations(): array
115115
*/
116116
public function testInternalAnnotations(bool $internal, string $className, array $internalAnnotations): void
117117
{
118-
$reflectionProvider = $this->createReflectionProvider();
118+
$reflectionProvider = self::createReflectionProvider();
119119
$class = $reflectionProvider->getClass($className);
120120
$scope = $this->createMock(Scope::class);
121121
$scope->method('isInClass')->willReturn(true);
@@ -146,7 +146,7 @@ public function testInternalUserFunctions(): void
146146
{
147147
require_once __DIR__ . '/data/annotations-internal.php';
148148

149-
$reflectionProvider = $this->createReflectionProvider();
149+
$reflectionProvider = self::createReflectionProvider();
150150

151151
$this->assertFalse($reflectionProvider->getFunction(new Name\FullyQualified('InternalAnnotations\foo'), null)->isInternal()->yes());
152152
$this->assertTrue($reflectionProvider->getFunction(new Name\FullyQualified('InternalAnnotations\internalFoo'), null)->isInternal()->yes());

‎tests/PHPStan/Reflection/Annotations/ThrowsAnnotationsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static function dataThrowsAnnotations(): array
7373
*/
7474
public function testThrowsAnnotations(string $className, array $throwsAnnotations): void
7575
{
76-
$reflectionProvider = $this->createReflectionProvider();
76+
$reflectionProvider = self::createReflectionProvider();
7777
$class = $reflectionProvider->getClass($className);
7878
$scope = $this->createMock(Scope::class);
7979

@@ -88,7 +88,7 @@ public function testThrowsOnUserFunctions(): void
8888
{
8989
require_once __DIR__ . '/data/annotations-throws.php';
9090

91-
$reflectionProvider = $this->createReflectionProvider();
91+
$reflectionProvider = self::createReflectionProvider();
9292

9393
$this->assertNull($reflectionProvider->getFunction(new Name\FullyQualified('ThrowsAnnotations\withoutThrows'), null)->getThrowType());
9494

‎tests/PHPStan/Reflection/AttributeReflectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AttributeReflectionTest extends PHPStanTestCase
1515

1616
public static function dataAttributeReflections(): iterable
1717
{
18-
$reflectionProvider = $this->createReflectionProvider();
18+
$reflectionProvider = self::createReflectionProvider();
1919

2020
yield [
2121
$reflectionProvider->getFunction(new Name('AttributeReflectionTest\\myFunction'), null)->getAttributes(),

‎tests/PHPStan/Reflection/ClassReflectionTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function dataHasTraitUse(): array
5858
*/
5959
public function testHasTraitUse(string $className, bool $has): void
6060
{
61-
$reflectionProvider = $this->createReflectionProvider();
61+
$reflectionProvider = self::createReflectionProvider();
6262
$classReflection = $reflectionProvider->getClass($className);
6363
$this->assertSame($has, $classReflection->hasTraitUse(FooTrait::class));
6464
}
@@ -105,7 +105,7 @@ public function testClassHierarchyDistances(
105105
array $expectedDistances,
106106
): void
107107
{
108-
$reflectionProvider = $this->createReflectionProvider();
108+
$reflectionProvider = self::createReflectionProvider();
109109
$classReflection = $reflectionProvider->getClass($class);
110110
$this->assertSame(
111111
$expectedDistances,
@@ -115,7 +115,7 @@ public function testClassHierarchyDistances(
115115

116116
public function testVariadicTraitMethod(): void
117117
{
118-
$reflectionProvider = $this->createReflectionProvider();
118+
$reflectionProvider = self::createReflectionProvider();
119119
$fooReflection = $reflectionProvider->getClass(Foo::class);
120120
$variadicMethod = $fooReflection->getNativeMethod('variadicMethod');
121121
$methodVariant = $variadicMethod->getOnlyVariant();
@@ -124,7 +124,7 @@ public function testVariadicTraitMethod(): void
124124

125125
public function testGenericInheritance(): void
126126
{
127-
$reflectionProvider = $this->createReflectionProvider();
127+
$reflectionProvider = self::createReflectionProvider();
128128
$reflection = $reflectionProvider->getClass(C::class);
129129

130130
$this->assertSame('GenericInheritance\\C', $reflection->getDisplayName());
@@ -143,7 +143,7 @@ public function testGenericInheritance(): void
143143

144144
public function testIsGenericWithStubPhpDoc(): void
145145
{
146-
$reflectionProvider = $this->createReflectionProvider();
146+
$reflectionProvider = self::createReflectionProvider();
147147
$reflection = $reflectionProvider->getClass(ReflectionClass::class);
148148
$this->assertTrue($reflection->isGeneric());
149149
}
@@ -177,7 +177,7 @@ public static function dataIsAttributeClass(): array
177177
*/
178178
public function testIsAttributeClass(string $className, bool $expected, int $expectedFlags = Attribute::TARGET_ALL): void
179179
{
180-
$reflectionProvider = $this->createReflectionProvider();
180+
$reflectionProvider = self::createReflectionProvider();
181181
$reflection = $reflectionProvider->getClass($className);
182182
$this->assertSame($expected, $reflection->isAttributeClass());
183183
if (!$expected) {
@@ -188,7 +188,7 @@ public function testIsAttributeClass(string $className, bool $expected, int $exp
188188

189189
public function testDeprecatedConstantFromAnotherFile(): void
190190
{
191-
$reflectionProvider = $this->createReflectionProvider();
191+
$reflectionProvider = self::createReflectionProvider();
192192
$reflection = $reflectionProvider->getClass(SecuredRouter::class);
193193
$constant = $reflection->getConstant('SECURED');
194194
$this->assertTrue($constant->isDeprecated()->yes());
@@ -201,7 +201,7 @@ public function testDeprecatedConstantFromAnotherFile(): void
201201
*/
202202
public function testGetTraits(string $className, array $expected, bool $recursive): void
203203
{
204-
$reflectionProvider = $this->createReflectionProvider();
204+
$reflectionProvider = self::createReflectionProvider();
205205

206206
$this->assertSame(
207207
array_map(
@@ -293,7 +293,7 @@ public function testEnumIsFinal(): void
293293
$this->markTestSkipped('Test requires PHP 8.1.');
294294
}
295295

296-
$reflectionProvider = $this->createReflectionProvider();
296+
$reflectionProvider = self::createReflectionProvider();
297297
$enum = $reflectionProvider->getClass('PHPStan\Fixture\TestEnum');
298298
$this->assertTrue($enum->isEnum());
299299
$this->assertInstanceOf('ReflectionEnum', $enum->getNativeReflection()); // @phpstan-ignore-line Exact error differs on PHP 7.4 and others
@@ -307,7 +307,7 @@ public function testBackedEnumType(): void
307307
$this->markTestSkipped('Test requires PHP 8.1.');
308308
}
309309

310-
$reflectionProvider = $this->createReflectionProvider();
310+
$reflectionProvider = self::createReflectionProvider();
311311
$enum = $reflectionProvider->getClass('PHPStan\Fixture\TestEnum');
312312
$this->assertInstanceOf(IntegerType::class, $enum->getBackedEnumType());
313313
}
@@ -316,7 +316,7 @@ public function testIs(): void
316316
{
317317
$className = static::class;
318318

319-
$reflectionProvider = $this->createReflectionProvider();
319+
$reflectionProvider = self::createReflectionProvider();
320320
$classReflection = $reflectionProvider->getClass($className);
321321

322322
$this->assertTrue($classReflection->is($className));
@@ -331,7 +331,7 @@ public static function dataPropertyHooks(): iterable
331331
return;
332332
}
333333

334-
$reflectionProvider = $this->createReflectionProvider();
334+
$reflectionProvider = self::createReflectionProvider();
335335

336336
yield [
337337
$reflectionProvider->getClass('PropertyHooksTypes\\Foo'),

‎tests/PHPStan/Reflection/Constant/RuntimeConstantReflectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testDeprecatedConstants(Name $constName, TrinaryLogic $isDepreca
4848
{
4949
require_once __DIR__ . '/data/deprecated-constant.php';
5050

51-
$reflectionProvider = $this->createReflectionProvider();
51+
$reflectionProvider = self::createReflectionProvider();
5252

5353
$this->assertTrue($reflectionProvider->hasConstant($constName, null));
5454
$this->assertSame($isDeprecated->describe(), $reflectionProvider->getConstant($constName, null)->isDeprecated()->describe());

0 commit comments

Comments
 (0)