reset stream counters on close it for fix #6

src/Stream/LoggerStream.php

@@ -40,6 +40,7 @@ public function open()
     public function close()
     {
         // do nothing
+        $this->counter = 0;
     }
 
     /**

src/Stream/MultiStream.php

@@ -55,6 +55,7 @@ public function close()
         foreach ($this->streams as $stream) {
             $stream->close();
         }
+        $this->counter = 0;
     }
 
     /**

src/Stream/OutputStream.php

@@ -18,10 +18,6 @@
 
 class OutputStream implements Stream
 {
-    const LINKS_LIMIT = 50000;
-
-    const BYTE_LIMIT = 52428800; // 50 Mb
-
     /**
      * @var SitemapRender
      */
@@ -68,6 +64,8 @@ public function close()
     {
         $this->state->close();
         $this->send($this->end_string);
+        $this->counter = 0;
+        $this->used_bytes = 0;
     }
 
     /**

src/Stream/RenderBzip2FileStream.php

@@ -18,10 +18,6 @@
 
 class RenderBzip2FileStream implements FileStream
 {
-    const LINKS_LIMIT = 50000;
-
-    const BYTE_LIMIT = 52428800; // 50 Mb
-
     /**
      * @var SitemapRender
      */
@@ -91,6 +87,7 @@ public function close()
         $this->state->close();
         $this->write($this->end_string);
         bzclose($this->handle);
+        $this->counter = 0;
     }
 
     /**

src/Stream/RenderFileStream.php

@@ -19,10 +19,6 @@
 
 class RenderFileStream implements FileStream
 {
-    const LINKS_LIMIT = 50000;
-
-    const BYTE_LIMIT = 52428800; // 50 Mb
-
     /**
      * @var SitemapRender
      */
@@ -97,6 +93,8 @@ public function close()
         $this->state->close();
         $this->write($this->end_string);
         fclose($this->handle);
+        $this->counter = 0;
+        $this->used_bytes = 0;
     }
 
     /**

src/Stream/RenderGzipFileStream.php

@@ -19,10 +19,6 @@
 
 class RenderGzipFileStream implements FileStream
 {
-    const LINKS_LIMIT = 50000;
-
-    const BYTE_LIMIT = 52428800; // 50 Mb
-
     /**
      * @var SitemapRender
      */
@@ -104,6 +100,7 @@ public function close()
         $this->state->close();
         $this->write($this->end_string);
         gzclose($this->handle);
+        $this->counter = 0;
     }
 
     /**

src/Stream/RenderIndexFileStream.php

@@ -94,6 +94,7 @@ public function close()
 
         file_put_contents($this->filename, $this->buffer.$this->render->end());
         $this->buffer = '';
+        $this->counter = 0;
     }
 
     /**

src/Stream/Stream.php

@@ -13,6 +13,10 @@
 
 interface Stream extends \Countable
 {
+    const LINKS_LIMIT = 50000;
+
+    const BYTE_LIMIT = 52428800; // 50 Mb
+
     public function open();
 
     public function close();

tests/Unit/Stream/LoggerStreamTest.php

@@ -45,7 +45,7 @@ public function testPush()
         $this->logger
             ->expects($this->at(0))
             ->method('debug')
-            ->with(sprintf('URL "%s" is added to sitemap', $url1->getLoc()), [
+            ->with(sprintf('URL "%s" was added to sitemap.xml', $url1->getLoc()), [
                 'changefreq' => $url1->getChangeFreq(),
                 'lastmod' => $url1->getLastMod(),
                 'priority' => $url1->getPriority(),
@@ -54,7 +54,7 @@ public function testPush()
         $this->logger
             ->expects($this->at(1))
             ->method('debug')
-            ->with(sprintf('URL "%s" is added to sitemap', $url2->getLoc()), [
+            ->with(sprintf('URL "%s" was added to sitemap.xml', $url2->getLoc()), [
                 'changefreq' => $url2->getChangeFreq(),
                 'lastmod' => $url2->getLastMod(),
                 'priority' => $url2->getPriority(),
@@ -66,4 +66,13 @@ public function testPush()
 
         $this->assertEquals(2, count($this->stream));
     }
+
+    public function testReset()
+    {
+        $this->stream->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->stream->close();
+        $this->assertEquals(0, count($this->stream));
+    }
 }

tests/Unit/Stream/MultiStreamTest.php

@@ -107,6 +107,30 @@ public function testPush(array $substreams)
         $this->assertEquals(count($urls), count($stream));
     }
 
+    /**
+     * @dataProvider streams
+     *
+     * @param \PHPUnit_Framework_MockObject_MockObject[]|Stream[] $substreams
+     */
+    public function testReset(array $substreams)
+    {
+        $url = new Url('/foo');
+
+        $stream = $this->getMultiStream($substreams);
+        foreach ($substreams as $substream) {
+            $substream
+                ->expects($this->at(0))
+                ->method('push')
+                ->with($url)
+            ;
+        }
+        $stream->push($url);
+
+        $this->assertEquals(1, count($stream));
+        $stream->close();
+        $this->assertEquals(0, count($stream));
+    }
+
     /**
      * @param Stream[] $substreams
      *

tests/Unit/Stream/OutputStreamTest.php

@@ -201,6 +201,15 @@ public function testOverflowSize()
         }
     }
 
+    public function testReset()
+    {
+        $this->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->close();
+        $this->assertEquals(0, count($this->stream));
+    }
+
     private function open()
     {
         $this->render

tests/Unit/Stream/RenderBzip2FileStreamTest.php

@@ -199,6 +199,15 @@ public function testNotWritable()
         }
     }
 
+    public function testReset()
+    {
+        $this->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->close();
+        $this->assertEquals(0, count($this->stream));
+    }
+
     private function open()
     {
         $this->render

tests/Unit/Stream/RenderFileStreamTest.php

@@ -233,6 +233,15 @@ public function testNotWritable()
         }
     }
 
+    public function testReset()
+    {
+        $this->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->close();
+        $this->assertEquals(0, count($this->stream));
+    }
+
     private function open()
     {
         $this->render

tests/Unit/Stream/RenderGzipFileStreamTest.php

@@ -223,6 +223,15 @@ public function testNotWritable()
         }
     }
 
+    public function testReset()
+    {
+        $this->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->close();
+        $this->assertEquals(0, count($this->stream));
+    }
+
     private function open()
     {
         $this->render

tests/Unit/Stream/RenderIndexFileStreamTest.php

@@ -187,6 +187,15 @@ public function testPush()
         $this->close();
     }
 
+    public function testReset()
+    {
+        $this->open();
+        $this->stream->push(new Url('/'));
+        $this->assertEquals(1, count($this->stream));
+        $this->close();
+        $this->assertEquals(0, count($this->stream));
+    }
+
     private function open()
     {
         ++$this->index;