qa: add return types to some functions

Signed-off-by: Maximilian Bösing <[email protected]>
laminas · Sep 14, 2021 · 69bc237 · 69bc237
1 parent 1e4a3d3
commit 69bc237
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -406,7 +406,7 @@
     <InternalMethod occurrences="1">
       <code>getContainer</code>
     </InternalMethod>
-    <InvalidArgument occurrences="6"/>
+    <InvalidArgument occurrences="5"/>
     <MissingClosureParamType occurrences="14">
       <code>$callback</code>
       <code>$container</code>

diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
@@ -365,10 +365,11 @@ public function testValidateWillFallBackToValidatePluginWhenDefinedAndEmitDeprec
         $pluginManager->assertion = $assertion;
 
         $errorHandlerCalled = false;
-        set_error_handler(function (int $errno, string $errmsg) use (&$errorHandlerCalled) {
+        set_error_handler(function (int $errno, string $errmsg) use (&$errorHandlerCalled): bool {
             $this->assertEquals(E_USER_DEPRECATED, $errno);
             $this->assertStringContainsString('3.0', $errmsg);
             $errorHandlerCalled = true;
+            return true;
         }, E_USER_DEPRECATED);
         $pluginManager->validate($instance);
         restore_error_handler();

diff --git a/test/CommonServiceLocatorBehaviorsTrait.php b/test/CommonServiceLocatorBehaviorsTrait.php
@@ -459,7 +459,7 @@ public function testCanConfigureAllServiceTypes(): void
             ],
             'delegators'         => [
                 stdClass::class => [
-                    function (ContainerInterface $container, string $name, callable $callback) {
+                    function (ContainerInterface $container, string $name, callable $callback): object {
                         $instance = $callback();
                         self::assertInstanceOf(stdClass::class, $instance);
                         $instance->foo = 'bar';
@@ -921,9 +921,9 @@ public function testAllowOverrideFlagIsMutable(ServiceManager $container): void
     public function testCanRetrieveParentContainerViaGetServiceLocatorWithDeprecationNotice(): void
     {
         $container = $this->createContainer();
-        /** @psalm-suppress InvalidArgument */
-        set_error_handler(function (int $errno) {
+        set_error_handler(function (int $errno): bool {
             $this->assertEquals(E_USER_DEPRECATED, $errno);
+            return true;
         }, E_USER_DEPRECATED);
         $this->assertSame($this->creationContext, $container->getServiceLocator());
         restore_error_handler();