Fixed handling of empty output in abstract stream filter.

eloquent · Apr 8, 2014 · 1c63f4b · 1c63f4b
1 parent d422ad2
commit 1c63f4b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/AbstractNativeStreamFilter.php b/src/AbstractNativeStreamFilter.php
@@ -64,7 +64,7 @@ public function filter($input, $output, &$consumed, $isEnd)
                 $this->buffer = substr($this->buffer, $thisConsumed);
             }
 
-            if ('' !== $outputBuffer) {
+            if (null !== $outputBuffer) {
                 $bucket->data = $outputBuffer;
                 stream_bucket_append($output, $bucket);
                 $hasOutput = true;

diff --git a/src/CompoundTransform.php b/src/CompoundTransform.php
@@ -88,15 +88,15 @@ public function transform($data, &$context, $isEnd = false)
             $currentContext = $context[$transform];
             $currentContext->buffer .= $data;
 
-            list($data, $bytesConsumed, $error) = $transform->transform(
+            list($data, $consumed, $error) = $transform->transform(
                 $currentContext->buffer,
                 $currentContext->context,
                 $isEnd
             );
 
             $currentContext->buffer = substr(
                 $currentContext->buffer,
-                $bytesConsumed
+                $consumed
             );
 
             if (false === $currentContext->buffer) {

diff --git a/src/TransformStream.php b/src/TransformStream.php
@@ -204,7 +204,11 @@ private function transformBuffer()
                 $this->buffer = substr($this->buffer, $consumed);
             }
 
-            if (null !== $output) {
+            if ($this->isEnding || null !== $output) {
+                if (null === $output) {
+                    $output = '';
+                }
+
                 $this->emit('data', array($output, $this));
             }
 

diff --git a/test/src/Base64DecodeTransform.php b/test/src/Base64DecodeTransform.php
@@ -17,7 +17,7 @@ public function transform($data, &$context, $isEnd = false)
     {
         $consume = $this->blocksSize(strlen($data), 4, $isEnd);
         if (!$consume) {
-            return array('', 0, null);
+            return array(null, 0, null);
         }
 
         $consumedData = substr($data, 0, $consume);

diff --git a/test/src/Md5Transform.php b/test/src/Md5Transform.php
@@ -24,7 +24,7 @@ public function transform($data, &$context, $isEnd = false)
         if ($isEnd) {
             $output = hash_final($context);
         } else {
-            $output = '';
+            $output = null;
         }
 
         return array($output, strlen($data), null);