Skip to content

Commit 39fb3c1

Browse files
tux-rampagetux-rampage
committed
Update psalm baseline with deprecated notices
Signed-off-by: tux-rampage <tuxrampage@gmail.com>
1 parent 4cd298c commit 39fb3c1

File tree

2 files changed

+195
-38
lines changed

2 files changed

+195
-38
lines changed

‎psalm-baseline.xml‎

Lines changed: 194 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<code><![CDATA[new AutoloadGenerator($this->namespace)]]></code>
5757
<code><![CDATA[new FactoryGenerator($config, $resolver, $this->namespace . '\Factory')]]></code>
5858
</DeprecatedClass>
59+
<DeprecatedMethod>
60+
<code><![CDATA[getConfiguredTypeNames]]></code>
61+
</DeprecatedMethod>
5962
<DeprecatedTrait>
6063
<code><![CDATA[GeneratorTrait]]></code>
6164
</DeprecatedTrait>
@@ -75,6 +78,11 @@
7578
<code><![CDATA[$contextClass]]></code>
7679
</RiskyTruthyFalsyComparison>
7780
</file>
81+
<file src="src/Config/Exception/UndefinedClassException.php">
82+
<PossiblyUnusedProperty>
83+
<code><![CDATA[$className]]></code>
84+
</PossiblyUnusedProperty>
85+
</file>
7886
<file src="src/ConfigInterface.php">
7987
<PossiblyUnusedReturnValue>
8088
<code><![CDATA[mixed]]></code>
@@ -102,6 +110,7 @@
102110
</file>
103111
<file src="src/Container/ConfigFactory.php">
104112
<DeprecatedClass>
113+
<code><![CDATA[new Config($data)]]></code>
105114
<code><![CDATA[new LegacyConfig($legacyData)]]></code>
106115
</DeprecatedClass>
107116
</file>
@@ -134,6 +143,9 @@
134143
</UnusedParam>
135144
</file>
136145
<file src="src/Injector.php">
146+
<DeprecatedClass>
147+
<code><![CDATA[new Config()]]></code>
148+
</DeprecatedClass>
137149
<InvalidReturnStatement>
138150
<code><![CDATA[$instance]]></code>
139151
</InvalidReturnStatement>
@@ -154,6 +166,10 @@
154166
<ConstructorSignatureMismatch>
155167
<code><![CDATA[public function __construct($config)]]></code>
156168
</ConstructorSignatureMismatch>
169+
<DeprecatedClass>
170+
<code><![CDATA[Config]]></code>
171+
<code><![CDATA[parent::__construct([])]]></code>
172+
</DeprecatedClass>
157173
<InvalidExtendClass>
158174
<code><![CDATA[Config]]></code>
159175
</InvalidExtendClass>
@@ -199,6 +215,11 @@
199215
<code><![CDATA[string]]></code>
200216
</PossiblyUnusedReturnValue>
201217
</file>
218+
<file src="src/Util.php">
219+
<UnusedConstructor>
220+
<code><![CDATA[__construct]]></code>
221+
</UnusedConstructor>
222+
</file>
202223
<file src="test/CodeGenerator/AbstractInjectorTest.php">
203224
<ArgumentTypeCoercion>
204225
<code><![CDATA[$provider]]></code>
@@ -237,6 +258,10 @@
237258
</file>
238259
<file src="test/CodeGenerator/FactoryGeneratorTest.php">
239260
<DeprecatedClass>
261+
<code><![CDATA[new Config()]]></code>
262+
<code><![CDATA[new Config()]]></code>
263+
<code><![CDATA[new Config()]]></code>
264+
<code><![CDATA[new Config()]]></code>
240265
<code><![CDATA[new FactoryGenerator($config, $resolver, self::DEFAULT_NAMESPACE)]]></code>
241266
<code><![CDATA[new FactoryGenerator($config, $resolver, self::DEFAULT_NAMESPACE)]]></code>
242267
<code><![CDATA[new FactoryGenerator($config, $resolver, self::DEFAULT_NAMESPACE)]]></code>
@@ -265,6 +290,12 @@
265290
]]]></code>
266291
</ArgumentTypeCoercion>
267292
<DeprecatedClass>
293+
<code><![CDATA[new Config()]]></code>
294+
<code><![CDATA[new Config()]]></code>
295+
<code><![CDATA[new Config()]]></code>
296+
<code><![CDATA[new Config()]]></code>
297+
<code><![CDATA[new Config()]]></code>
298+
<code><![CDATA[new Config()]]></code>
268299
<code><![CDATA[new InjectorGenerator($config, $resolver, $expected)]]></code>
269300
<code><![CDATA[new InjectorGenerator($config, $resolver, $namespace)]]></code>
270301
<code><![CDATA[new InjectorGenerator($config, $resolver, $namespace)]]></code>
@@ -284,6 +315,19 @@
284315
</DeprecatedClass>
285316
</file>
286317
<file src="test/ConfigTest.php">
318+
<DeprecatedClass>
319+
<code><![CDATA[new Config($this->fixture)]]></code>
320+
<code><![CDATA[new Config($this->fixture)]]></code>
321+
<code><![CDATA[new Config($this->fixture)]]></code>
322+
<code><![CDATA[new Config($this->fixture)]]></code>
323+
<code><![CDATA[new Config($this->fixture)]]></code>
324+
<code><![CDATA[new Config()]]></code>
325+
<code><![CDATA[new Config()]]></code>
326+
<code><![CDATA[new Config()]]></code>
327+
<code><![CDATA[new Config()]]></code>
328+
<code><![CDATA[new Config()]]></code>
329+
<code><![CDATA[new Config(new stdClass())]]></code>
330+
</DeprecatedClass>
287331
<MixedAssignment>
288332
<code><![CDATA[$this->fixture]]></code>
289333
</MixedAssignment>
@@ -299,19 +343,9 @@
299343
</MissingReturnType>
300344
</file>
301345
<file src="test/Container/ConfigFactoryTest.php">
302-
<MissingReturnType>
303-
<code><![CDATA[testCreateRequestsContainerForConfigServiceGracefully]]></code>
304-
<code><![CDATA[testCreateUsesConfigFromContainer]]></code>
305-
<code><![CDATA[testInvokeCreatesConfigInstance]]></code>
306-
<code><![CDATA[testLegacyConfigIsRespected]]></code>
307-
</MissingReturnType>
308-
<PossiblyNullPropertyAssignmentValue>
309-
<code><![CDATA[null]]></code>
310-
</PossiblyNullPropertyAssignmentValue>
311-
<RiskyTruthyFalsyComparison>
312-
<code><![CDATA[! strstr($errstr, 'legacy DI config')]]></code>
313-
<code><![CDATA[strstr($errstr, 'legacy DI config')]]></code>
314-
</RiskyTruthyFalsyComparison>
346+
<DeprecatedClass>
347+
<code><![CDATA[Config::class]]></code>
348+
</DeprecatedClass>
315349
</file>
316350
<file src="test/Container/GeneratorFactoryTest.php">
317351
<DeprecatedClass>
@@ -321,6 +355,7 @@
321355
<code><![CDATA[GeneratorFactory::class]]></code>
322356
<code><![CDATA[InjectorGenerator::class]]></code>
323357
<code><![CDATA[InjectorGenerator::class]]></code>
358+
<code><![CDATA[new Config()]]></code>
324359
<code><![CDATA[new GeneratorFactory()]]></code>
325360
<code><![CDATA[new GeneratorFactory()]]></code>
326361
<code><![CDATA[new GeneratorFactory()]]></code>
@@ -411,6 +446,67 @@
411446
<code><![CDATA[array]]></code>
412447
</MixedInferredReturnType>
413448
</file>
449+
<file src="test/InjectorTest.php">
450+
<DeprecatedClass>
451+
<code><![CDATA[new Config([
452+
'preferences' => [
453+
TreeTestAsset\Level2::class => TreeTestAsset\Level2Preference::class,
454+
],
455+
])]]></code>
456+
<code><![CDATA[new Config([
457+
'types' => [
458+
$aliasName => [
459+
'typeOf' => $className,
460+
],
461+
],
462+
])]]></code>
463+
<code><![CDATA[new Config([
464+
'types' => [
465+
'Some.Custom.Name' => [
466+
'typeOf' => 'LaminasTest\Di\TestAsset\NoSuchClassName',
467+
],
468+
],
469+
])]]></code>
470+
<code><![CDATA[new Config([
471+
'types' => [
472+
TreeTestAsset\AdditionalLevel1::class => [
473+
'preferences' => [
474+
TreeTestAsset\Level2::class => TreeTestAsset\Level2Preference::class,
475+
],
476+
],
477+
],
478+
])]]></code>
479+
<code><![CDATA[new Config([
480+
'types' => [
481+
TreeTestAsset\Level2::class => [
482+
'parameters' => [
483+
'opt' => $expected1,
484+
],
485+
],
486+
'Level2.Alias' => [
487+
'typeOf' => TreeTestAsset\Level2::class,
488+
'parameters' => [
489+
'opt' => $expected2,
490+
],
491+
],
492+
TreeTestAsset\AdditionalLevel1::class => [
493+
'preferences' => [
494+
TreeTestAsset\Level2::class => 'Level2.Alias',
495+
],
496+
],
497+
],
498+
])]]></code>
499+
<code><![CDATA[new Config([
500+
'types' => [
501+
TreeTestAsset\Level2::class => [
502+
'parameters' => [
503+
'opt' => $expected,
504+
],
505+
],
506+
],
507+
])]]></code>
508+
</DeprecatedClass>
509+
</file>
414510
<file src="test/LegacyConfigTest.php">
415511
<DeprecatedClass>
416512
<code><![CDATA[new LegacyConfig($config)]]></code>
@@ -434,6 +530,91 @@
434530
</UnresolvableInclude>
435531
</file>
436532
<file src="test/Resolver/DependencyResolverTest.php">
533+
<DeprecatedClass>
534+
<code><![CDATA[new Config($config)]]></code>
535+
<code><![CDATA[new Config()]]></code>
536+
<code><![CDATA[new Config()]]></code>
537+
<code><![CDATA[new Config()]]></code>
538+
<code><![CDATA[new Config()]]></code>
539+
<code><![CDATA[new Config()]]></code>
540+
<code><![CDATA[new Config()]]></code>
541+
<code><![CDATA[new Config()]]></code>
542+
<code><![CDATA[new Config()]]></code>
543+
<code><![CDATA[new Config()]]></code>
544+
<code><![CDATA[new Config()]]></code>
545+
<code><![CDATA[new Config()]]></code>
546+
<code><![CDATA[new Config()]]></code>
547+
<code><![CDATA[new Config()]]></code>
548+
<code><![CDATA[new Config()]]></code>
549+
<code><![CDATA[new Config()]]></code>
550+
<code><![CDATA[new Config([
551+
'types' => [
552+
$class => [
553+
'parameters' => [
554+
$paramName => 'Callable.Alias',
555+
],
556+
],
557+
'Callable.Alias' => [
558+
'typeOf' => TestAsset\Pseudotypes\CallableImplementation::class,
559+
],
560+
],
561+
])]]></code>
562+
<code><![CDATA[new Config([
563+
'types' => [
564+
$class => [
565+
'parameters' => [
566+
$paramName => TestAsset\Pseudotypes\CallableImplementation::class,
567+
],
568+
],
569+
'Callable.Alias' => [
570+
'typeOf' => TestAsset\Pseudotypes\CallableImplementation::class,
571+
],
572+
],
573+
])]]></code>
574+
<code><![CDATA[new Config([
575+
'types' => [
576+
$class => [
577+
'parameters' => [
578+
$paramName => $iterableClassName,
579+
],
580+
],
581+
],
582+
])]]></code>
583+
<code><![CDATA[new Config([
584+
'types' => [
585+
$class => [
586+
'parameters' => [
587+
$paramName => $value,
588+
],
589+
],
590+
],
591+
])]]></code>
592+
<code><![CDATA[new Config([
593+
'types' => [
594+
$class => [
595+
'parameters' => [
596+
$paramName => TestAsset\Hierarchy\InterfaceC::class,
597+
],
598+
],
599+
],
600+
])]]></code>
601+
<code><![CDATA[new Config([
602+
'types' => [
603+
TestAsset\B::class => [
604+
'parameters' => ['a' => 'my-service'],
605+
],
606+
],
607+
])]]></code>
608+
<code><![CDATA[new Config([
609+
'types' => [
610+
TestAsset\RequiresA::class => [
611+
'parameters' => [
612+
'p' => $expected,
613+
],
614+
],
615+
],
616+
])]]></code>
617+
</DeprecatedClass>
437618
<InternalMethod>
438619
<code><![CDATA[toValue]]></code>
439620
<code><![CDATA[toValue]]></code>
@@ -444,24 +625,6 @@
444625
<MissingClosureParamType>
445626
<code><![CDATA[$class]]></code>
446627
</MissingClosureParamType>
447-
<MissingReturnType>
448-
<code><![CDATA[testConfiguredExtendedInterfaceParameterSatisfiesRequiredInterfaceType]]></code>
449-
<code><![CDATA[testConfiguredInvokableAliasParameterSatisfiesCallable]]></code>
450-
<code><![CDATA[testConfiguredInvokableTypeParameterSatisfiesCallable]]></code>
451-
<code><![CDATA[testConfiguredTraversableTypeParameterSatisfiesIterable]]></code>
452-
<code><![CDATA[testParametresResolverShouldNotCheckTheTypeForString]]></code>
453-
<code><![CDATA[testResolvePreferenceFallsBackToGlobalPreferenceWhenNotSuitableForClassRequirement]]></code>
454-
<code><![CDATA[testResolvePreferenceFallsBackToGlobalPreferenceWhenNotSuitableForInterfaceRequirement]]></code>
455-
<code><![CDATA[testResolvePreferenceReturnsNullWhenNothingIsSuitableForClassRequirement]]></code>
456-
<code><![CDATA[testResolvePreferenceReturnsNullWhenNothingIsSuitableForInterfaceRequirement]]></code>
457-
<code><![CDATA[testResolvePreferenceUsesDefinedClassForInterfaceRequirements]]></code>
458-
<code><![CDATA[testResolvePreferenceUsesInterfaces]]></code>
459-
<code><![CDATA[testResolvePreferenceUsesSupertypes]]></code>
460-
<code><![CDATA[testResolveSucceedsWithoutContainer]]></code>
461-
<code><![CDATA[testResolveWithContainerFailsWhenMissing]]></code>
462-
<code><![CDATA[testResolveWithoutConfig]]></code>
463-
<code><![CDATA[testUsableConfigParametersAreAccepted]]></code>
464-
</MissingReturnType>
465628
<MissingTemplateParam>
466629
<code><![CDATA[IteratorAggregate]]></code>
467630
</MissingTemplateParam>
@@ -495,7 +658,6 @@
495658
<code><![CDATA[[$requested, $expectedResult, $context]]]></code>
496659
</MixedAssignment>
497660
<MixedInferredReturnType>
498-
<code><![CDATA[PHPUnit_Framework_MockObject_MockObject|ContainerInterface]]></code>
499661
<code><![CDATA[array]]></code>
500662
<code><![CDATA[array]]></code>
501663
<code><![CDATA[array]]></code>
@@ -505,18 +667,12 @@
505667
<MixedOperand>
506668
<code><![CDATA[$key]]></code>
507669
</MixedOperand>
508-
<PossiblyInvalidArgument>
509-
<code><![CDATA[$this->getEmptyContainerMock()]]></code>
510-
</PossiblyInvalidArgument>
511670
<RedundantCondition>
512671
<code><![CDATA[assertIsArray]]></code>
513672
<code><![CDATA[assertIsArray]]></code>
514673
<code><![CDATA[assertIsArray]]></code>
515674
<code><![CDATA[assertIsArray]]></code>
516675
</RedundantCondition>
517-
<UndefinedDocblockClass>
518-
<code><![CDATA[PHPUnit_Framework_MockObject_MockObject|ContainerInterface]]></code>
519-
</UndefinedDocblockClass>
520676
<UnresolvableInclude>
521677
<code><![CDATA[include $configFile]]></code>
522678
</UnresolvableInclude>

‎psalm.xml.dist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
77
errorBaseline="psalm-baseline.xml"
88
findUnusedPsalmSuppress="true"
9+
findUnusedBaselineEntry="true"
910
findUnusedCode="true"
1011
>
1112
<projectFiles>

0 commit comments

Comments
 (0)