Skip to content

Commit 71ad52c

Browse files
committed
Fix types
Signed-off-by: Witold Wasiczko <[email protected]>
1 parent 4d91da2 commit 71ad52c

File tree

3 files changed

+7
-67
lines changed

3 files changed

+7
-67
lines changed

psalm-baseline.xml

Lines changed: 3 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.10.0@916b098b008f6de4543892b1e0651c1c3b92cbfa">
2+
<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
33
<file src="src/Composer/FileSystemBasedComposerPackage.php">
44
<MixedArrayAssignment occurrences="1">
55
<code>$package[$key]['psr-4']</code>
@@ -331,9 +331,6 @@
331331
<PossiblyFalseOperand occurrences="1">
332332
<code>strrpos($class, '\\')</code>
333333
</PossiblyFalseOperand>
334-
<RedundantCastGivenDocblockType occurrences="1">
335-
<code>(bool) $container-&gt;has(TemplateRendererInterface::class)</code>
336-
</RedundantCastGivenDocblockType>
337334
</file>
338335
<file src="test/Composer/FileSystemBasedComposerPackageTest.php">
339336
<MixedArgument occurrences="1">
@@ -350,9 +347,6 @@
350347
</file>
351348
<file src="test/CreateHandler/CreateActionCommandTest.php">
352349
<InvalidArgument occurrences="1"/>
353-
<MissingClosureParamType occurrences="1">
354-
<code>$input</code>
355-
</MissingClosureParamType>
356350
<MixedArgument occurrences="1">
357351
<code>$this-&gt;mockApplication('Foo\TestAction')-&gt;reveal()</code>
358352
</MixedArgument>
@@ -369,47 +363,16 @@
369363
</UndefinedMagicMethod>
370364
</file>
371365
<file src="test/CreateHandler/CreateHandlerCommandTest.php">
372-
<ImplicitToStringCast occurrences="19">
373-
<code>Argument::containingString('Created class Foo\TestHandler, in file ' . __DIR__)</code>
374-
<code>Argument::containingString('Created class Foo\TestHandler, in file ' . __DIR__)</code>
375-
<code>Argument::containingString('Created class Foo\TestHandler, in file ' . __DIR__)</code>
376-
<code>Argument::containingString('Created class Foo\TestHandler, in file ' . __DIR__)</code>
377-
<code>Argument::containingString('Created template ' . $generatedTemplate . ' in file ' . __FILE__)</code>
378-
<code>Argument::containingString('Created template ' . $generatedTemplate . ' in file ' . __FILE__)</code>
379-
<code>Argument::containingString('Created template')</code>
380-
<code>Argument::containingString('Creating request handler Foo\TestHandler')</code>
381-
<code>Argument::containingString('Creating request handler Foo\TestHandler')</code>
382-
<code>Argument::containingString('Creating request handler Foo\TestHandler')</code>
383-
<code>Argument::containingString('Creating request handler Foo\TestHandler')</code>
384-
<code>Argument::containingString('Creating request handler Foo\TestHandler')</code>
385-
<code>Argument::containingString('Creating request handler InvalidTestHandler')</code>
386-
<code>Argument::containingString('Success')</code>
387-
<code>Argument::containingString('Success')</code>
388-
<code>Argument::containingString('Success')</code>
389-
<code>Argument::containingString('Success')</code>
390-
<code>Argument::containingString('Success')</code>
391-
<code>Argument::containingString('Success')</code>
392-
</ImplicitToStringCast>
393366
<InvalidArgument occurrences="1"/>
394-
<InvalidPropertyAssignmentValue occurrences="3">
395-
<code>$this-&gt;prophesize(ConsoleOutputInterface::class)</code>
396-
<code>$this-&gt;prophesize(ContainerInterface::class)</code>
397-
<code>$this-&gt;prophesize(InputInterface::class)</code>
398-
</InvalidPropertyAssignmentValue>
399-
<MissingClosureParamType occurrences="1">
400-
<code>$input</code>
401-
</MissingClosureParamType>
402-
<MixedArgument occurrences="8">
403-
<code>$this-&gt;container-&gt;reveal()</code>
404-
<code>$this-&gt;container-&gt;reveal()</code>
367+
<MixedArgument occurrences="6">
405368
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
406369
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
407370
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
408371
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
409372
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
410373
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
411374
</MixedArgument>
412-
<MixedMethodCall occurrences="21">
375+
<MixedMethodCall occurrences="16">
413376
<code>andReturn</code>
414377
<code>andReturn</code>
415378
<code>andReturn</code>
@@ -418,11 +381,6 @@
418381
<code>andReturn</code>
419382
<code>andThrow</code>
420383
<code>andThrow</code>
421-
<code>willReturn</code>
422-
<code>willReturn</code>
423-
<code>willReturn</code>
424-
<code>willReturn</code>
425-
<code>willReturn</code>
426384
<code>with</code>
427385
<code>with</code>
428386
<code>with</code>
@@ -546,9 +504,6 @@
546504
<code>Argument::containingString('Success')</code>
547505
</ImplicitToStringCast>
548506
<InvalidArgument occurrences="1"/>
549-
<MissingClosureParamType occurrences="1">
550-
<code>$input</code>
551-
</MissingClosureParamType>
552507
<MixedArgument occurrences="2">
553508
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
554509
<code>$this-&gt;mockApplication()-&gt;reveal()</code>
@@ -762,9 +717,6 @@
762717
<code>Argument::containingString('Done!')</code>
763718
</ImplicitToStringCast>
764719
<InvalidScalarArgument occurrences="1"/>
765-
<MissingClosureParamType occurrences="1">
766-
<code>$arg</code>
767-
</MissingClosureParamType>
768720
<MixedArgument occurrences="1">
769721
<code>$arg</code>
770722
</MixedArgument>
@@ -788,13 +740,6 @@
788740
</UndefinedMagicMethod>
789741
</file>
790742
<file src="test/MigrateMiddlewareToRequestHandler/ProjectSetupTrait.php">
791-
<MissingClosureParamType occurrences="5">
792-
<code>$arg</code>
793-
<code>$arg</code>
794-
<code>$arg</code>
795-
<code>$arg</code>
796-
<code>$arg</code>
797-
</MissingClosureParamType>
798743
<MixedArgument occurrences="6">
799744
<code>$arg</code>
800745
<code>$arg</code>
@@ -856,9 +801,6 @@
856801
<code>$this-&gt;prophesize(ConsoleOutputInterface::class)</code>
857802
<code>$this-&gt;prophesize(InputInterface::class)</code>
858803
</InvalidPropertyAssignmentValue>
859-
<MissingClosureParamType occurrences="1">
860-
<code>$input</code>
861-
</MissingClosureParamType>
862804
<MixedArgument occurrences="10">
863805
<code>$config</code>
864806
<code>$parameters</code>

src/TemplateResolutionTrait.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ private function getTemplateNameFromClass(string $class): string
7979
*/
8080
private function containerDefinesRendererService(ContainerInterface $container): bool
8181
{
82-
// Casting to bool so that test prophecies work without needing to define
83-
// explicit expectations in every situation.
84-
return (bool) $container->has(TemplateRendererInterface::class);
82+
return $container->has(TemplateRendererInterface::class);
8583
}
8684

8785
private function getRendererServiceTypeFromContainer(ContainerInterface $container): ?string

test/CreateHandler/CreateHandlerCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ class CreateHandlerCommandTest extends TestCase
3838
use MockeryPHPUnitIntegration;
3939
use ProphecyTrait;
4040

41-
/** @var ContainerInterface&ObjectProphecy */
41+
/** @var ObjectProphecy<ContainerInterface> */
4242
private $container;
4343

44-
/** @var InputInterface&ObjectProphecy */
44+
/** @var ObjectProphecy<InputInterface> */
4545
private $input;
4646

47-
/** @var ConsoleOutputInterface&ObjectProphecy */
47+
/** @var ObjectProphecy<ConsoleOutputInterface> */
4848
private $output;
4949

5050
protected function setUp(): void

0 commit comments

Comments
 (0)