using immutable objects for a stream result is a bad idea because of …

…gc cycles (#86)
genkgo · Sep 29, 2020 · 1e8cf3c · 1e8cf3c
1 parent fdf4380
commit 1e8cf3c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 26 deletions.
diff --git a/src/Protocol/Imap/Response/AggregateResponse.php b/src/Protocol/Imap/Response/AggregateResponse.php
@@ -106,41 +106,39 @@ public function hasCompleted(): bool
      */
     public function withLine(string $line): AggregateResponse
     {
-        $clone = clone $this;
-
         switch (\substr($line, 0, 2)) {
             case '+ ':
-                $clone->lines[] = new CommandContinuationRequestResponse(
+                $this->lines[] = new CommandContinuationRequestResponse(
                     \substr($line, 2)
                 );
                 break;
             case '* ':
-                $clone->lines[] = new UntaggedResponse(
+                $this->lines[] = new UntaggedResponse(
                     \substr($line, 2)
                 );
                 break;
             default:
                 try {
-                    $clone->lines[] = new TaggedResponse(
+                    $this->lines[] = new TaggedResponse(
                         $this->tag,
                         $this->tag->extractBodyFromLine($line)
                     );
                 } catch (\InvalidArgumentException $e) {
-                    if (empty($clone->lines)) {
+                    if (empty($this->lines)) {
                         throw new \UnexpectedValueException(
                             'Expected line to begin with +, * or tag. Got: ' . $line
                         );
                     }
 
-                    $keys = \array_keys($clone->lines);
+                    $keys = \array_keys($this->lines);
                     $lastKey = \end($keys);
-                    $clone->lines[$lastKey] = $clone->lines[$lastKey]->withAddedBody($line);
+                    $this->lines[$lastKey]->withAddedBody($line);
                 }
                 break;
 
         }
 
-        return $clone;
+        return $this;
     }
 
     /**

diff --git a/src/Protocol/Imap/Response/CommandContinuationRequestResponse.php b/src/Protocol/Imap/Response/CommandContinuationRequestResponse.php
@@ -35,9 +35,8 @@ public function __toString(): string
      */
     public function withAddedBody(string $data): ResponseInterface
     {
-        $clone = clone $this;
-        $clone->line .= $data;
-        return $clone;
+        $this->line .= $data;
+        return $this;
     }
 
     /**

diff --git a/src/Protocol/Imap/Response/TaggedResponse.php b/src/Protocol/Imap/Response/TaggedResponse.php
@@ -43,9 +43,8 @@ public function __toString(): string
      */
     public function withAddedBody(string $data): ResponseInterface
     {
-        $clone = clone $this;
-        $clone->line .= $data;
-        return $clone;
+        $this->line .= $data;
+        return $this;
     }
 
     /**

diff --git a/src/Protocol/Imap/Response/UntaggedResponse.php b/src/Protocol/Imap/Response/UntaggedResponse.php
@@ -40,9 +40,8 @@ public function __toString(): string
      */
     public function withAddedBody(string $data): ResponseInterface
     {
-        $clone = clone $this;
-        $clone->line .= $data;
-        return $clone;
+        $this->line .= $data;
+        return $this;
     }
 
     /**

diff --git a/test/Unit/Protocol/Imap/Response/AggregateResponseTest.php b/test/Unit/Protocol/Imap/Response/AggregateResponseTest.php
@@ -27,10 +27,10 @@ public function it_can_be_iterated(): void
     /**
      * @test
      */
-    public function it_is_immutable(): void
+    public function it_is_mutable(): void
     {
         $response = new AggregateResponse(Tag::fromNonce(1));
-        $this->assertNotSame($response, $response->withLine('* Untagged'));
+        $this->assertSame($response, $response->withLine('* Untagged'));
     }
 
     /**

diff --git a/test/Unit/Protocol/Imap/Response/CommandContinuationRequestResponseTest.php b/test/Unit/Protocol/Imap/Response/CommandContinuationRequestResponseTest.php
@@ -24,10 +24,10 @@ public function it_can_be_casted_to_string(): void
     /**
      * @test
      */
-    public function it_is_immutable(): void
+    public function it_is_mutable(): void
     {
         $response = new CommandContinuationRequestResponse('OK successful');
-        $this->assertNotSame($response, $response->withAddedBody('body'));
+        $this->assertSame($response, $response->withAddedBody('body'));
     }
 
     /**

diff --git a/test/Unit/Protocol/Imap/Response/TaggedResponseTest.php b/test/Unit/Protocol/Imap/Response/TaggedResponseTest.php
@@ -25,10 +25,10 @@ public function it_can_be_casted_to_string(): void
     /**
      * @test
      */
-    public function it_is_immutable(): void
+    public function it_is_mutable(): void
     {
         $response = new TaggedResponse(Tag::fromNonce(1), 'OK successful');
-        $this->assertNotSame($response, $response->withAddedBody('body'));
+        $this->assertSame($response, $response->withAddedBody('body'));
     }
 
     /**

diff --git a/test/Unit/Protocol/Imap/Response/UntaggedResponseTest.php b/test/Unit/Protocol/Imap/Response/UntaggedResponseTest.php
@@ -24,10 +24,10 @@ public function it_can_be_casted_to_string(): void
     /**
      * @test
      */
-    public function it_is_immutable(): void
+    public function it_is_mutable(): void
     {
         $response = new UntaggedResponse('OK successful');
-        $this->assertNotSame($response, $response->withAddedBody('body'));
+        $this->assertSame($response, $response->withAddedBody('body'));
     }
 
     /**