Skip to content

Commit 3e72bd1

Browse files
calebdwcalebdw
committed
fix tests
1 parent c2f2e51 commit 3e72bd1

7 files changed

Lines changed: 123 additions & 57 deletions

‎phpstan-baseline.neon‎

Lines changed: 114 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,21 @@ parameters:
9191
path: src/Analyser/MutatingScope.php
9292

9393
-
94-
rawMessage: 'Call to method getFunctionParameterClosureTypeExtensions() of deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.'
95-
identifier: method.deprecatedInterface
94+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
95+
identifier: classConstant.deprecatedInterface
9696
count: 1
9797
path: src/Analyser/NodeScopeResolver.php
9898

9999
-
100-
rawMessage: 'Call to method getMethodParameterClosureTypeExtensions() of deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.'
101-
identifier: method.deprecatedInterface
100+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
101+
identifier: classConstant.deprecatedInterface
102102
count: 1
103103
path: src/Analyser/NodeScopeResolver.php
104104

105105
-
106-
rawMessage: 'Call to method getStaticMethodParameterClosureTypeExtensions() of deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.'
107-
identifier: method.deprecatedInterface
108-
count: 2
106+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
107+
identifier: classConstant.deprecatedInterface
108+
count: 1
109109
path: src/Analyser/NodeScopeResolver.php
110110

111111
-
@@ -151,13 +151,37 @@ parameters:
151151
path: src/Analyser/NodeScopeResolver.php
152152

153153
-
154-
rawMessage: 'Parameter $parameterClosureTypeExtensionProvider of method PHPStan\Analyser\NodeScopeResolver::__construct() has typehint with deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.'
154+
rawMessage: 'Parameter $functionParameterClosureTypeExtensions of method PHPStan\Analyser\NodeScopeResolver::__construct() has typehint with deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.'
155+
identifier: parameter.deprecatedInterface
156+
count: 1
157+
path: src/Analyser/NodeScopeResolver.php
158+
159+
-
160+
rawMessage: 'Parameter $methodParameterClosureTypeExtensions of method PHPStan\Analyser\NodeScopeResolver::__construct() has typehint with deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.'
161+
identifier: parameter.deprecatedInterface
162+
count: 1
163+
path: src/Analyser/NodeScopeResolver.php
164+
165+
-
166+
rawMessage: 'Parameter $staticMethodParameterClosureTypeExtensions of method PHPStan\Analyser\NodeScopeResolver::__construct() has typehint with deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.'
155167
identifier: parameter.deprecatedInterface
156168
count: 1
157169
path: src/Analyser/NodeScopeResolver.php
158170

159171
-
160-
rawMessage: Property $parameterClosureTypeExtensionProvider references deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider in its type.
172+
rawMessage: Property $functionParameterClosureTypeExtensions references deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension in its type.
173+
identifier: property.deprecatedInterface
174+
count: 1
175+
path: src/Analyser/NodeScopeResolver.php
176+
177+
-
178+
rawMessage: Property $methodParameterClosureTypeExtensions references deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension in its type.
179+
identifier: property.deprecatedInterface
180+
count: 1
181+
path: src/Analyser/NodeScopeResolver.php
182+
183+
-
184+
rawMessage: Property $staticMethodParameterClosureTypeExtensions references deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension in its type.
161185
identifier: property.deprecatedInterface
162186
count: 1
163187
path: src/Analyser/NodeScopeResolver.php
@@ -306,42 +330,6 @@ parameters:
306330
count: 1
307331
path: src/DependencyInjection/NeonAdapter.php
308332

309-
-
310-
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
311-
identifier: classConstant.deprecatedInterface
312-
count: 1
313-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
314-
315-
-
316-
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
317-
identifier: classConstant.deprecatedInterface
318-
count: 1
319-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
320-
321-
-
322-
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
323-
identifier: classConstant.deprecatedInterface
324-
count: 1
325-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
326-
327-
-
328-
rawMessage: Fetching class constant FUNCTION_TAG of deprecated class PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider.
329-
identifier: classConstant.deprecatedClass
330-
count: 1
331-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
332-
333-
-
334-
rawMessage: Fetching class constant METHOD_TAG of deprecated class PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider.
335-
identifier: classConstant.deprecatedClass
336-
count: 1
337-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
338-
339-
-
340-
rawMessage: Fetching class constant STATIC_METHOD_TAG of deprecated class PHPStan\DependencyInjection\Type\LazyParameterClosureTypeExtensionProvider.
341-
identifier: classConstant.deprecatedClass
342-
count: 1
343-
path: src/DependencyInjection/ValidateServiceTagsExtension.php
344-
345333
-
346334
rawMessage: 'Parameter #1 $path of function dirname expects string, string|false given.'
347335
identifier: argument.type
@@ -510,6 +498,12 @@ parameters:
510498
count: 1
511499
path: src/Reflection/BetterReflection/SourceLocator/SkipClassAliasSourceLocator.php
512500

501+
-
502+
rawMessage: 'Class PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber constructor invoked with 4 parameters, 2-3 required.'
503+
identifier: arguments.count
504+
count: 1
505+
path: src/Reflection/BetterReflection/SourceStubber/PhpStormStubsSourceStubberFactory.php
506+
513507
-
514508
rawMessage: '''
515509
Call to deprecated method isSubclassOf() of class PHPStan\Reflection\ClassReflection:
@@ -861,6 +855,42 @@ parameters:
861855
count: 1
862856
path: src/Testing/LevelsTestCase.php
863857

858+
-
859+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
860+
identifier: classConstant.deprecatedInterface
861+
count: 1
862+
path: src/Testing/RuleTestCase.php
863+
864+
-
865+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
866+
identifier: classConstant.deprecatedInterface
867+
count: 1
868+
path: src/Testing/RuleTestCase.php
869+
870+
-
871+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
872+
identifier: classConstant.deprecatedInterface
873+
count: 1
874+
path: src/Testing/RuleTestCase.php
875+
876+
-
877+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
878+
identifier: classConstant.deprecatedInterface
879+
count: 1
880+
path: src/Testing/TypeInferenceTestCase.php
881+
882+
-
883+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
884+
identifier: classConstant.deprecatedInterface
885+
count: 1
886+
path: src/Testing/TypeInferenceTestCase.php
887+
888+
-
889+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
890+
identifier: classConstant.deprecatedInterface
891+
count: 1
892+
path: src/Testing/TypeInferenceTestCase.php
893+
864894
-
865895
rawMessage: 'Doing instanceof PHPStan\Type\ConstantScalarType is error-prone and deprecated. Use Type::isConstantScalarValue() or Type::getConstantScalarTypes() or Type::getConstantScalarValues() instead.'
866896
identifier: phpstanApi.instanceofType
@@ -1888,7 +1918,19 @@ parameters:
18881918
path: src/Type/VoidType.php
18891919

18901920
-
1891-
rawMessage: Access to constant on deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.
1921+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
1922+
identifier: classConstant.deprecatedInterface
1923+
count: 1
1924+
path: tests/PHPStan/Analyser/AnalyserTest.php
1925+
1926+
-
1927+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
1928+
identifier: classConstant.deprecatedInterface
1929+
count: 1
1930+
path: tests/PHPStan/Analyser/AnalyserTest.php
1931+
1932+
-
1933+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
18921934
identifier: classConstant.deprecatedInterface
18931935
count: 1
18941936
path: tests/PHPStan/Analyser/AnalyserTest.php
@@ -1918,13 +1960,37 @@ parameters:
19181960
path: tests/PHPStan/Analyser/EvaluationOrderTest.php
19191961

19201962
-
1921-
rawMessage: Access to constant on deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.
1963+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
19221964
identifier: classConstant.deprecatedInterface
19231965
count: 1
19241966
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverRuleTest.php
19251967

19261968
-
1927-
rawMessage: Access to constant on deprecated interface PHPStan\DependencyInjection\Type\ParameterClosureTypeExtensionProvider.
1969+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
1970+
identifier: classConstant.deprecatedInterface
1971+
count: 1
1972+
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverRuleTest.php
1973+
1974+
-
1975+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
1976+
identifier: classConstant.deprecatedInterface
1977+
count: 1
1978+
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverRuleTest.php
1979+
1980+
-
1981+
rawMessage: Access to constant on deprecated interface PHPStan\Type\FunctionParameterClosureTypeExtension.
1982+
identifier: classConstant.deprecatedInterface
1983+
count: 1
1984+
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverTest.php
1985+
1986+
-
1987+
rawMessage: Access to constant on deprecated interface PHPStan\Type\MethodParameterClosureTypeExtension.
1988+
identifier: classConstant.deprecatedInterface
1989+
count: 1
1990+
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverTest.php
1991+
1992+
-
1993+
rawMessage: Access to constant on deprecated interface PHPStan\Type\StaticMethodParameterClosureTypeExtension.
19281994
identifier: classConstant.deprecatedInterface
19291995
count: 1
19301996
path: tests/PHPStan/Analyser/Fiber/FiberNodeScopeResolverTest.php

‎tests/PHPStan/Analyser/DynamicParameterTypeExtensionArraysTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PHPUnit\Framework\Attributes\DataProvider;
77
use PHPUnit\Framework\Attributes\RequiresPhp;
88

9-
#[RequiresPhp('>= 8.0')]
9+
#[RequiresPhp('>= 8.0.0')]
1010
class DynamicParameterTypeExtensionArraysTest extends TypeInferenceTestCase
1111
{
1212

‎tests/PHPStan/Analyser/DynamicParameterTypeExtensionClosuresTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PHPUnit\Framework\Attributes\DataProvider;
77
use PHPUnit\Framework\Attributes\RequiresPhp;
88

9-
#[RequiresPhp('>= 8.0')]
9+
#[RequiresPhp('>= 8.0.0')]
1010
class DynamicParameterTypeExtensionClosuresTest extends TypeInferenceTestCase
1111
{
1212

‎tests/PHPStan/Analyser/data/dynamic-parameter-type-extension-arrays.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php // lint >= 8.0
22

33
namespace DynamicParameterTypeExtensionArrays;
44

‎tests/PHPStan/Analyser/data/dynamic-parameter-type-extension-closures-errors.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php // lint >= 8.0
22

33
namespace DynamicParameterTypeExtensionClosuresErrors;
44

‎tests/PHPStan/Analyser/data/dynamic-parameter-type-extension-closures.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php // lint >= 8.0
22

33
namespace DynamicParameterTypeExtensionClosures;
44

‎tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,19 +745,19 @@ public function testPregReplaceCallback(): void
745745
{
746746
$this->analyse([__DIR__ . '/data/preg_replace_callback.php'], [
747747
[
748-
'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',
748+
'Parameter #2 $callback of function preg_replace_callback expects Closure(array{non-falsy-string}): string, Closure(string): string given.',
749749
6,
750750
],
751751
[
752-
'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(string): string given.',
752+
'Parameter #2 $callback of function preg_replace_callback expects Closure(array{non-falsy-string}): string, Closure(string): string given.',
753753
13,
754754
],
755755
[
756-
'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(array): void given.',
756+
'Parameter #2 $callback of function preg_replace_callback expects Closure(array{non-falsy-string}): string, Closure(array): void given.',
757757
20,
758758
],
759759
[
760-
'Parameter #2 $callback of function preg_replace_callback expects callable(array<string>): string, Closure(): void given.',
760+
'Parameter #2 $callback of function preg_replace_callback expects Closure(array{non-falsy-string}): string, Closure(): void given.',
761761
25,
762762
],
763763
]);

0 commit comments

Comments
 (0)