Merge pull request #10 from petrknap/critical-section-args

Added support for critical sections with arguments

src/CriticalSectionInterface.php

@@ -9,18 +9,19 @@
 use Throwable;
 
 /**
- * @template T
+ * @template T of mixed
  */
 interface CriticalSectionInterface
 {
     /**
-     * @param callable(): T $criticalSection
+     * @param (callable(mixed...): T)|callable $criticalSection
+     * @param mixed ...$args will be forwarded to {@link $criticalSection}
      *
-     * @return ?T returned by {@link $criticalSection} or null when it is occupied (non-blocking mode only)
+     * @return T|null returned by {@link $criticalSection} or null when it is occupied (non-blocking mode only)
      *
      * @throws CouldNotEnterCriticalSection
      * @throws CouldNotLeaveCriticalSection
      * @throws Throwable from {@link $criticalSection}
      */
-    public function __invoke(callable $criticalSection);
+    public function __invoke(callable $criticalSection, mixed ...$args);
 }

src/WrappingCriticalSection.php

@@ -21,17 +21,16 @@ protected function __construct(
     ) {
     }
 
-    /** @inheritDoc */
-    public function __invoke(callable $criticalSection)
+    public function __invoke(callable $criticalSection, mixed ...$args)
     {
         if ($this->enter() === false) {
             return null;
         }
         try {
             if ($this->wrappedCriticalSection) {
-                return ($this->wrappedCriticalSection)(static fn () => $criticalSection());
+                return ($this->wrappedCriticalSection)(static fn () => $criticalSection(...$args));
             }
-            return $criticalSection();
+            return $criticalSection(...$args);
         } finally {
             $this->leave();
         }

tests/WrappingCriticalSectionTest.php

@@ -11,11 +11,28 @@ final class WrappingCriticalSectionTest extends TestCase
 {
     private const FOO = 'bar';
 
+    public function testForwardsArgumentsIntoCriticalSection(): void
+    {
+        $expectedArgs = ['string', 1, null];
+        $receivedArgs = [];
+        (new NonCriticalSection(canEnter: true))(
+            function (string $s, int $i, mixed $n) use (&$receivedArgs): void {
+                $receivedArgs = func_get_args();
+            },
+            ...$expectedArgs,
+        );
+
+        self::assertEquals(
+            $expectedArgs,
+            $receivedArgs,
+        );
+    }
+
     public function testReturnsValueReturnedByExecutedCriticalSection(): void
     {
         self::assertSame(
             self::FOO,
-            (new NonCriticalSection(canEnter: true))(fn () => self::FOO)
+            (new NonCriticalSection(canEnter: true))(fn () => self::FOO),
         );
     }