Merge pull request #277 from laminas/3.20.x-merge-up-into-3.21.x_r2Ci…

…lk9f Merge release 3.20.1 into 3.21.x
laminas · Sep 15, 2024 · 610aef2 · 610aef2
2 parents a50af07 + 91ac71b
commit 610aef2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Annotation/AbstractBuilder.php b/src/Annotation/AbstractBuilder.php
@@ -310,7 +310,7 @@ protected function checkForExclude(AnnotationCollection $annotations): bool
 
         // @codingStandardsIgnoreStart
         $results = $this->getEventManager()->triggerEventUntil(
-            static fn(bool $r): bool => true === $r,
+            static fn(?bool $r): bool => true === $r,
             $event
         );
         // @codingStandardsIgnoreEnd

diff --git a/test/Annotation/AbstractBuilderTestCase.php b/test/Annotation/AbstractBuilderTestCase.php
@@ -30,6 +30,7 @@
 use LaminasTest\Form\TestAsset\Annotation\Form;
 use LaminasTest\Form\TestAsset\Annotation\InputFilter;
 use LaminasTest\Form\TestAsset\Annotation\InputFilterInput;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use Throwable;
@@ -573,4 +574,17 @@ public function testLegacyStyleValidatorAnnotations(): void
             ErrorHandler::restoreErrorHandler();
         }
     }
+
+    #[DoesNotPerformAssertions]
+    public function testAllowsEventListenerReturnVoid(): void
+    {
+        $entity  = new TestAsset\Annotation\Entity();
+        $builder = $this->createBuilder();
+
+        $builder->getEventManager()->attach('*', function () {
+            // return void;
+        });
+
+        $builder->createForm($entity);
+    }
 }