Merge pull request #99 from AgencyPMG/ALLI-17433-upgrade-pmg-queue-to-support-php-8-4

Alli 17433 upgrade pmg/queue to support php 8 4

Author: jrughani9

.github/workflows/ci.yml

@@ -8,13 +8,13 @@ on:
 jobs:
   test:
     name: test
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-24.04"
 
     strategy:
       matrix:
         include:
-          - php-version: 8.2
           - php-version: 8.3
+          - php-version: 8.4
 
 
     steps:
@@ -29,13 +29,13 @@ jobs:
 
   examples:
     name: examples
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-24.04"
 
     strategy:
       matrix:
         include:
-          - php-version: 8.2
           - php-version: 8.3
+          - php-version: 8.4
 
     steps:
       - name: checkout

composer.json

@@ -6,9 +6,9 @@
         { "name": "Christopher Davis", "email": "chris@pmg.com" }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "guzzlehttp/promises": "^1.3"
+        "guzzlehttp/promises": "^2.0.3"
 
     },
     "require-dev": {

src/AbstractConsumer.php

@@ -46,15 +46,15 @@ abstract class AbstractConsumer implements Consumer
      */
     private $hasPcntl = null;
 
-    public function __construct(LoggerInterface $logger=null)
+    public function __construct(?LoggerInterface $logger=null)
     {
         $this->logger = $logger;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function run(string $queueName, MessageLifecycle $lifecycle=null) : int
+    public function run(string $queueName, ?MessageLifecycle $lifecycle=null) : int
     {
         $lifecycle = $lifecycle ?? new Lifecycle\NullLifecycle();
         $this->running = true;
@@ -81,7 +81,7 @@ public function run(string $queueName, MessageLifecycle $lifecycle=null) : int
     /**
      * {@inheritdoc}
      */
-    public function stop(int $code=null) : void
+    public function stop(?int $code=null) : void
     {
         $this->running = false;
         $this->exitCode = null === $code ? self::EXIT_SUCCESS : $code;

src/Consumer.php

@@ -31,7 +31,7 @@ interface Consumer
      * @param $lifecycle The message lifecycle to apply to the running consumer.
      * @return int The exit code to be used for the consumer.
      */
-    public function run(string $queueName, MessageLifecycle $lifecycle=null) : int;
+    public function run(string $queueName, ?MessageLifecycle $lifecycle=null) : int;
 
     /**
      * Consume a single job from the given queue. This will block until the
@@ -47,13 +47,13 @@ public function run(string $queueName, MessageLifecycle $lifecycle=null) : int;
      * @return  boolean|null True if the a job was execute successfully. Null if
      *          no job was executed. See the logs.
      */
-    public function once(string $queueName, MessageLifecycle $lifecycle=null) : ?bool;
+    public function once(string $queueName, ?MessageLifecycle $lifecycle=null) : ?bool;
 
     /**
      * Gracefully stop the consumer with the given exit code.
      *
      * @param int $code The exit code passed to `exit`. If null `EXIT_SUCCESS` is used.
      * @return void
      */
-    public function stop(int $code=null) : void;
+    public function stop(?int $code=null) : void;
 }

src/DefaultConsumer.php

@@ -54,8 +54,8 @@ class DefaultConsumer extends AbstractConsumer
     public function __construct(
         Driver $driver,
         MessageHandler $handler,
-        RetrySpec $retries=null,
-        LoggerInterface $logger=null
+        ?RetrySpec $retries=null,
+        ?LoggerInterface $logger=null
     ) {
         parent::__construct($logger);
         $this->driver = $driver;
@@ -66,7 +66,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function once(string $queueName, MessageLifecycle $lifecycle=null) : ?bool
+    public function once(string $queueName, ?MessageLifecycle $lifecycle=null) : ?bool
     {
         $envelope = $this->driver->dequeue($queueName);
         if (!$envelope) {
@@ -96,7 +96,7 @@ public function once(string $queueName, MessageLifecycle $lifecycle=null) : ?boo
     /**
      * {@inheritdoc}
      */
-    public function stop(int $code=null) : void
+    public function stop(?int $code=null) : void
     {
         if ($this->currentPromise) {
             $this->currentPromise->cancel();

src/Handler/PcntlForkingHandler.php

@@ -39,7 +39,7 @@ final class PcntlForkingHandler implements MessageHandler
 
     private Pcntl $pcntl;
 
-    public function __construct(MessageHandler $wrapped, Pcntl $pcntl=null)
+    public function __construct(MessageHandler $wrapped, ?Pcntl $pcntl=null)
     {
         $this->wrapped = $wrapped;
         $this->pcntl = $pcntl ?: new Pcntl();

src/Lifecycle/MappingLifecycle.php

@@ -45,7 +45,7 @@ final class MappingLifecycle implements MessageLifecycle
      * @param $fallback The message lifecycle to which unmatches messages will be applied
      * @throws InvalidArgumentException if $mapping is a bad type
      */
-    public function __construct($mapping, MessageLifecycle $fallback=null)
+    public function __construct($mapping, ?MessageLifecycle $fallback=null)
     {
         if (!is_array($mapping) && !$mapping instanceof \ArrayAccess) {
             throw new InvalidArgumentException(sprintf(

src/Retry/LimitedSpec.php

@@ -29,7 +29,7 @@ final class LimitedSpec implements RetrySpec
     private $maxAttempts;
     private $retryDelay;
 
-    public function __construct(int $maxAttempts=null, int $retryDelay=0)
+    public function __construct(?int $maxAttempts=null, int $retryDelay=0)
     {
         if (null !== $maxAttempts && $maxAttempts < 1) {
             throw new InvalidArgumentException(sprintf(

src/Serializer/NativeSerializer.php

@@ -41,13 +41,13 @@ final class NativeSerializer implements Serializer
      */
     private $signer;
 
-    public function __construct(Signer $signer, array $allowedClasses=null)
+    public function __construct(Signer $signer, ?array $allowedClasses=null)
     {
         $this->signer = $signer;
         $this->allowedClasses = $allowedClasses;
     }
 
-    public static function fromSigningKey(string $key, array $allowedClasses=null)
+    public static function fromSigningKey(string $key, ?array $allowedClasses=null)
     {
         return new self(new HmacSha256($key), $allowedClasses);
     }

test/unit/Driver/AbstractPersistanceDriverTest.php

@@ -24,7 +24,7 @@
 // not called
 abstract class _DriverAbc extends AbstractPersistanceDriver
 {
-    public function __construct(Serializer $serializer=null)
+    public function __construct(?Serializer $serializer=null)
     {
         if ($serializer) {
             parent::__construct($serializer);