Move tests to valid ones

reactphp · Feb 28, 2017 · 3c9ab0a · 3c9ab0a
1 parent 7e904b7
commit 3c9ab0a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/ChunkedStreamDecoder.php b/src/ChunkedStreamDecoder.php
@@ -111,7 +111,12 @@ protected function iterateBuffer()
             if (strpos($lengthChunk, ';') !== false) {
                 list($lengthChunk) = explode(';', $lengthChunk, 2);
             }
-            $lengthChunk = ltrim($lengthChunk, "0");
+            if ($lengthChunk !== '') {
+                $lengthChunk = ltrim($lengthChunk, "0");
+                if ($lengthChunk === '') {
+                    $lengthChunk = "0";
+                }
+            }
             if (dechex(hexdec($lengthChunk)) !== $lengthChunk) {
                 $this->emit('error', [
                     new Exception('Unable to validate "' . $lengthChunk . '" as chunk length header'),

diff --git a/tests/DecodeChunkedStreamTest.php b/tests/DecodeChunkedStreamTest.php
@@ -64,6 +64,15 @@ public function provideChunkedEncoding()
             ],
             'varnish-type-response-random' => [
                 [str_repeat("0", rand(0, 10)), "4\r\nWiki\r\n", str_repeat("0", rand(0, 10)), "5\r\npedia\r\n", str_repeat("0", rand(0, 10)), "e\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n"]
+            ],
+            'end-chunk-zero-check-1' => [
+                ["4\r\nWiki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n00\r\n\r\n"]
+            ],
+            'end-chunk-zero-check-2' => [
+                ["4\r\nWiki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n000\r\n\r\n"]
+            ],
+            'end-chunk-zero-check-3' => [
+                ["00004\r\nWiki\r\n005\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n0000\r\n\r\n"]
             ]
         ];
     }
@@ -100,15 +109,6 @@ public function provideInvalidChunkedEncoding()
             ],
             'header-chunk-to-long' => [
                 str_split(str_repeat('a', 2015) . "\r\nWi\r\nki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n")
-            ],
-            'end-chunk-zero-check-1' => [
-                ["4\r\nWiki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n00\r\n\r\n"]
-            ],
-            'end-chunk-zero-check-2' => [
-                ["4\r\nWiki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n000\r\n\r\n"]
-            ],
-            'end-chunk-zero-check-3' => [
-                ["00004\r\nWiki\r\n005\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n0000\r\n\r\n"]
             ]
         ];
     }