phpstan fixes and adding phpstan to github actions

Author: clegginabox

.github/workflows/tests.yaml

@@ -26,6 +26,22 @@ jobs:
       - name: Run phpcs
         run: vendor/bin/phpcs --standard=phpcs.xml -v -p -s --colors
 
+  phpstan:
+    runs-on: ubuntu-latest
+    name: Code Style
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-zookeeper --ignore-platform-req=ext-memcached
+
+      - name: Run phpstan
+        run: vendor/bin/phpstan analyse --memory-limit=1024M
+
   test:
     runs-on: ubuntu-latest
 

examples/src/RedisLotteryQueue/Controller.php

@@ -5,7 +5,6 @@
 namespace App\RedisLotteryQueue;
 
 use App\Infrastructure\ClientIdCookieSubscriber;
-use App\RedisLotteryQueue\Internal\RedisLotteryQueueSimulation;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -47,9 +46,6 @@ public function success(): Response
     #[Route('/redis-lottery-queue/start', methods: [Request::METHOD_POST])]
     public function start(Request $request, RedisLotteryQueueService $service): JsonResponse
     {
-        // Queue simulation only - pre-seed
-        $this->simulation->seedOnce();
-
         $clientId = (string) $request->attributes->get(ClientIdCookieSubscriber::ATTRIBUTE);
         $result = $service->start($clientId);
 

examples/src/RedisLotteryQueue/Internal/RedisLotteryQueueSimulation.php

@@ -5,7 +5,6 @@
 namespace App\RedisLotteryQueue;
 
 use App\Factory\AirlockFactory;
-use App\RedisLotteryQueue\Internal\RedisLotteryQueueSimulation;
 use Clegginabox\Airlock\EntryResult;
 use Clegginabox\Airlock\QueueAirlock;
 
@@ -15,7 +14,6 @@ final class RedisLotteryQueueService
 
     public function __construct(
         private readonly AirlockFactory $airlockFactory,
-        private readonly RedisLotteryQueueSimulation $simulation,
     ) {
         $this->airlock = $this->airlockFactory->redisLotteryQueue();
     }
@@ -36,13 +34,8 @@ private function tryAdmit(string $clientId, int $holdSeconds = 15): EntryResult
 
         if ($result->isAdmitted()) {
             $token = $result->getToken();
+            return $result;
 
-            /**
-             * Handle the user being admitted here
-             */
-
-            // Queue simulation only - handle success
-            $this->simulation->onSuccess($token, $clientId, $holdSeconds);
         }
 
         return $result;

examples/src/RedisLotteryQueue/RedisLotteryQueueService.php

@@ -9,8 +9,6 @@
 use Clegginabox\Airlock\Seal\ReleasableSeal;
 use Clegginabox\Airlock\Seal\Seal;
 use Clegginabox\Airlock\Seal\SealToken;
-use Symfony\Component\Lock\Exception\LockConflictedException;
-use Symfony\Component\Lock\Exception\LockExpiredException;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\LockInterface;
@@ -70,29 +68,27 @@ public function refresh(SealToken $token, ?float $ttlInSeconds = null): SealToke
             $lock->refresh($effectiveTtl);
 
             return $token;
-        } catch (LockExpiredException | LockConflictedException $e) {
-            throw new LeaseExpiredException((string) $token, $e->getMessage());
         } catch (Throwable $e) {
             throw new LeaseExpiredException((string) $token, 'Unexpected error: ' . $e->getMessage());
         }
     }
 
     public function isExpired(SymfonyLockToken $token): bool
     {
-        return $this->resolveLock($token)?->isExpired() ?? true;
+        return $this->resolveLock($token)->isExpired();
     }
 
     public function isAcquired(SymfonyLockToken $token): bool
     {
-        return $this->resolveLock($token)?->isAcquired() ?? false;
+        return $this->resolveLock($token)->isAcquired();
     }
 
     public function getRemainingLifetime(SymfonyLockToken $token): ?float
     {
-        return $this->resolveLock($token)?->getRemainingLifetime();
+        return $this->resolveLock($token)->getRemainingLifetime();
     }
 
-    private function resolveLock(SymfonyLockToken $token): ?LockInterface
+    private function resolveLock(SymfonyLockToken $token): LockInterface
     {
         return $this->factory->createLockFromKey(
             $token->getKey(),

src/Bridge/Symfony/AirlockBundle.php

@@ -89,20 +89,20 @@ public function refresh(SealToken $token, ?float $ttlInSeconds = null): SymfonyS
 
     public function isExpired(SymfonySemaphoreToken $token): bool
     {
-        return $this->resolveSemaphore($token)?->isExpired() ?? true;
+        return $this->resolveSemaphore($token)->isExpired();
     }
 
     public function isAcquired(SymfonySemaphoreToken $token): bool
     {
-        return $this->resolveSemaphore($token)?->isAcquired() ?? false;
+        return $this->resolveSemaphore($token)->isAcquired();
     }
 
     public function getRemainingLifetime(SymfonySemaphoreToken $token): ?float
     {
-        return $this->resolveSemaphore($token)?->getRemainingLifetime();
+        return $this->resolveSemaphore($token)->getRemainingLifetime();
     }
 
-    private function resolveSemaphore(SymfonySemaphoreToken $token): ?SemaphoreInterface
+    private function resolveSemaphore(SymfonySemaphoreToken $token): SemaphoreInterface
     {
         return $this->factory->createSemaphoreFromKey(
             $token->getKey(),

src/Bridge/Symfony/Seal/SymfonyLockSeal.php

@@ -40,7 +40,7 @@ public function release(SealToken $token): void
         $this->seal->release($token);
     }
 
-    public function refresh(SealToken $token, ?float $ttlInSeconds = null): ?SealToken
+    public function refresh(SealToken $token, ?float $ttlInSeconds = null): SealToken
     {
         return $this->seal->refresh($token, $ttlInSeconds);
     }

src/Bridge/Symfony/Seal/SymfonySemaphoreSeal.php

@@ -17,7 +17,7 @@ public function addToBack(string $identifier): int
             $this->queue[] = $identifier;
         }
 
-        return $this->getPosition($identifier);
+        return $this->getPosition($identifier) ?? -1;
     }
 
     public function remove(string $identifier): void

src/OpportunisticAirlock.php

@@ -67,7 +67,7 @@ public function release(SealToken $token): void
         $this->notifier->notify($nextPassenger, $this->topicFor($nextPassenger));
     }
 
-    public function refresh(SealToken $token, ?float $ttlInSeconds = null): ?SealToken
+    public function refresh(SealToken $token, ?float $ttlInSeconds = null): SealToken
     {
         return $this->seal->refresh($token, $ttlInSeconds);
     }