Don't use nulls for empty output.

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

Hide file tree

Showing 4 changed files with 6 additions and 10 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 (null !== $outputBuffer) {
+            if ('' !== $outputBuffer) {
                 $bucket->data = $outputBuffer;
                 stream_bucket_append($output, $bucket);
                 $hasOutput = true;

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

diff --git a/test/src/Base64DecodeTransform.php b/test/src/Base64DecodeTransform.php
@@ -17,17 +17,17 @@ public function transform($data, &$context, $isEnd = false)
     {
         $consume = $this->blocksSize(strlen($data), 4, $isEnd);
         if (!$consume) {
-            return array(null, 0, null);
+            return array('', 0, null);
         }
 
         $consumedData = substr($data, 0, $consume);
         if (1 === strlen(rtrim($consumedData, '=')) % 4) {
-            return array(null, 0, new Exception('Base64 decode failed.'));
+            return array('', 0, new Exception('Base64 decode failed.'));
         }
 
         $outputBuffer = base64_decode($consumedData, true);
         if (false === $outputBuffer) {
-            return array(null, 0, new Exception('Base64 decode failed.'));
+            return array('', 0, new Exception('Base64 decode failed.'));
         }
 
         return array($outputBuffer, $consume, null);

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 = null;
+            $output = '';
         }
 
         return array($output, strlen($data), null);