fix: Uncaught Error: Cannot unset readonly property Pheanstalk\Socket…

…\SocketSocket::$socket in SocketSocket.php on line 138 (#258) * make socket property non read-only to fix error: Uncaught Error: Cannot unset readonly property Pheanstalk\Socket\SocketSocket::$socket in SocketSocket.php on line 138 * add test case for disconnect -> dispatchCommand not throwing errors * [fix-disconnect-error] change from abstract class to trait * [fix-disconnect-error] fix code style error --------- Co-authored-by: Anna Damm <anna.damm@check24.de>
pheanstalk · Nov 23, 2023 · bee66a8 · bee66a8
1 parent d98d10d
commit bee66a8
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 13 deletions.
diff --git a/src/Socket/SocketSocket.php b/src/Socket/SocketSocket.php
@@ -16,7 +16,7 @@
  */
 final class SocketSocket implements SocketInterface
 {
-    private readonly null|\Socket $socket;
+    private null|\Socket $socket;
 
     public function __construct(
         string $host,

diff --git a/tests/Integration/ConstructWithConnectionObjectTests.php b/tests/Integration/ConstructWithConnectionObjectTests.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pheanstalk\Tests\Integration;
+
+use Pheanstalk\Command\UseCommand;
+use Pheanstalk\Connection;
+use Pheanstalk\Pheanstalk;
+use Pheanstalk\Values\TubeName;
+
+/**
+ * @psalm-require-extends PheanstalkTestBase
+ */
+trait ConstructWithConnectionObjectTests
+{
+    public function testDispatchCommandAfterDisconnect(): void
+    {
+        $this->expectNotToPerformAssertions();
+        $connection = $this->getConnection();
+        $connection->connect();
+        $connection->disconnect();
+
+        $connection->dispatchCommand(new UseCommand(new TubeName('tube5')));
+    }
+
+    protected function getPheanstalk(): Pheanstalk
+    {
+        return new Pheanstalk($this->getConnection());
+    }
+
+    abstract protected function getConnection(): Connection;
+}
diff --git a/tests/Integration/SocketPheanstalkTest.php b/tests/Integration/SocketPheanstalkTest.php
@@ -5,7 +5,6 @@
 namespace Pheanstalk\Tests\Integration;
 
 use Pheanstalk\Connection;
-use Pheanstalk\Pheanstalk;
 use Pheanstalk\SocketFactory;
 use Pheanstalk\Values\SocketImplementation;
 use Pheanstalk\Values\Timeout;
@@ -18,8 +17,10 @@
  */
 final class SocketPheanstalkTest extends PheanstalkTestBase
 {
-    protected function getPheanstalk(): Pheanstalk
+    use ConstructWithConnectionObjectTests;
+
+    protected function getConnection(): Connection
     {
-        return new Pheanstalk(new Connection(new SocketFactory($this->getHost(), 11300, SocketImplementation::SOCKET, connectTimeout: new Timeout(1))));
+        return new Connection(new SocketFactory($this->getHost(), 11300, SocketImplementation::SOCKET, connectTimeout: new Timeout(1)));
     }
 }
diff --git a/tests/Integration/SocketUnixPheanstalkTest.php b/tests/Integration/SocketUnixPheanstalkTest.php
@@ -5,7 +5,6 @@
 namespace Pheanstalk\Tests\Integration;
 
 use Pheanstalk\Connection;
-use Pheanstalk\Pheanstalk;
 use Pheanstalk\SocketFactory;
 use Pheanstalk\Values\SocketImplementation;
 use Pheanstalk\Values\Timeout;
@@ -18,8 +17,10 @@
  */
 final class SocketUnixPheanstalkTest extends PheanstalkTestBase
 {
-    protected function getPheanstalk(): Pheanstalk
+    use ConstructWithConnectionObjectTests;
+
+    protected function getConnection(): Connection
     {
-        return new Pheanstalk(new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::SOCKET, connectTimeout: new Timeout(1))));
+        return new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::SOCKET, connectTimeout: new Timeout(1)));
     }
 }
diff --git a/tests/Integration/StreamPheanstalkTest.php b/tests/Integration/StreamPheanstalkTest.php
@@ -5,7 +5,6 @@
 namespace Pheanstalk\Tests\Integration;
 
 use Pheanstalk\Connection;
-use Pheanstalk\Pheanstalk;
 use Pheanstalk\SocketFactory;
 use Pheanstalk\Values\SocketImplementation;
 use Pheanstalk\Values\Timeout;
@@ -19,8 +18,10 @@
  */
 final class StreamPheanstalkTest extends PheanstalkTestBase
 {
-    protected function getPheanstalk(): Pheanstalk
+    use ConstructWithConnectionObjectTests;
+
+    protected function getConnection(): Connection
     {
-        return new Pheanstalk(new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::STREAM, connectTimeout: new Timeout(1))));
+        return new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::STREAM, connectTimeout: new Timeout(1)));
     }
 }
diff --git a/tests/Integration/StreamUnixPheanstalkTest.php b/tests/Integration/StreamUnixPheanstalkTest.php
@@ -5,7 +5,6 @@
 namespace Pheanstalk\Tests\Integration;
 
 use Pheanstalk\Connection;
-use Pheanstalk\Pheanstalk;
 use Pheanstalk\SocketFactory;
 use Pheanstalk\Values\SocketImplementation;
 use Pheanstalk\Values\Timeout;
@@ -19,8 +18,10 @@
  */
 final class StreamUnixPheanstalkTest extends PheanstalkTestBase
 {
-    protected function getPheanstalk(): Pheanstalk
+    use ConstructWithConnectionObjectTests;
+
+    protected function getConnection(): Connection
     {
-        return new Pheanstalk(new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::STREAM, connectTimeout: new Timeout(1))));
+        return new Connection(new SocketFactory($this->getHost(), implementation: SocketImplementation::STREAM, connectTimeout: new Timeout(1)));
     }
 }