#223 #224 avoiding output in the CLI, minor CS fixes (alignment)

zendframework · Jan 17, 2017 · 54f3a9a · 54f3a9a
1 parent dcdd787
commit 54f3a9a
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/test/Response/SapiStreamEmitterTest.php b/test/Response/SapiStreamEmitterTest.php
@@ -86,10 +86,11 @@ public function testEmitBody($seekable, $contents, $maxBufferLength, $expectedRe
             return ! isset($contents[$position]);
         });
 
-        $stream->read(Argument::type('integer'))->will(function ($args) use (&$contents, &$position) {
-                $data = substr($contents, $position, $args[0]);
-                $position += strlen($data);
-                return $data;
+        $stream->read(Argument::type('integer'))->will(function ($args) use (& $contents, & $position) {
+            $data      = substr($contents, $position, $args[0]);
+            $position += strlen($data);
+
+            return $data;
         });
 
         $response = (new Response())
@@ -131,20 +132,16 @@ public function testEmitMemoryUsage($seekable, $maxBufferLength, $sizeBlocks, $m
         $peakBufferLength = 0;
         $peakMemoryUsage = 0;
 
+        $position = 0;
+
         if ($rangeBlocks) {
-            $first = $maxBufferLength * $rangeBlocks[0];
-            $last  = $maxBufferLength * $rangeBlocks[1];
+            $first    = $maxBufferLength * $rangeBlocks[0];
+            $last     = $maxBufferLength * $rangeBlocks[1];
             $position = $first;
-        } else {
-            $position = 0;
         }
 
-        $closureTrackMemoryUsage = function () use (&$peakMemoryUsage) {
-            $memoryUsage = memory_get_usage();
-
-            if ($memoryUsage > $peakMemoryUsage) {
-                $peakMemoryUsage = $memoryUsage;
-            }
+        $closureTrackMemoryUsage = function () use (& $peakMemoryUsage) {
+            $peakMemoryUsage = max($peakMemoryUsage, memory_get_usage());
         };
 
         $closureFullContents = function () use (&$sizeBytes) {
@@ -200,7 +197,7 @@ public function testEmitMemoryUsage($seekable, $maxBufferLength, $sizeBlocks, $m
 
         $this->emitter->emit($response, $maxBufferLength);
 
-        ob_end_flush();
+        ob_end_clean();
 
         gc_collect_cycles();