Merge branch 'master' into fix/errors-on-property-initialization-for-…

…current-job
vyuldashev · Jan 26, 2024 · 1d20d3c · 1d20d3c
2 parents ba4dd0e + a6f430f
commit 1d20d3c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "php": "^8.0",
         "ext-json": "*",
         "illuminate/queue": "^9.0|^10.0",
-        "php-amqplib/php-amqplib": "^v3.5.2"
+        "php-amqplib/php-amqplib": "^v3.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3",

diff --git a/pint.json b/pint.json
@@ -0,0 +1,8 @@
+{
+  "preset": "laravel",
+  "rules": {
+    "nullable_type_declaration_for_default_null_value": {
+      "use_nullable_type_declaration": false
+    }
+  }
+}
diff --git a/src/Queue/Connection/ConnectionFactory.php b/src/Queue/Connection/ConnectionFactory.php
@@ -126,7 +126,6 @@ protected static function createStreamConnection($connection, AMQPConnectionConf
                     'keepalive' => $config->isKeepalive(),
                     'heartbeat' => $config->getHeartbeat(),
                 ],
-                $config->getNetworkProtocol(),
                 $config
             );
         }

diff --git a/tests/Feature/TestCase.php b/tests/Feature/TestCase.php
@@ -110,7 +110,7 @@ public function testPushAfterCommit(): void
         $this->assertSame(0, Queue::size());
         $this->assertNull(Queue::pop());
 
-        $transaction->commit('FakeDBConnection');
+        $transaction->commit('FakeDBConnection', 1, 0);
 
         sleep(1);