ZF-10881: use ob_get_clean instead of ob_get_contents + ob_end_clean

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23590 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Cache/Frontend/Function.php

@@ -104,8 +104,7 @@ class Zend_Cache_Frontend_Function extends Zend_Cache_Core
             ob_start();
             ob_implicit_flush(false);
             $return = call_user_func_array($callback, $parameters);
-            $output = ob_get_contents();
-            ob_end_clean();
+            $output = ob_get_clean();
             $data = array($output, $return);
             $this->save($data, $id, $tags, $specificLifetime, $priority);
         }

library/Zend/Cache/Frontend/Output.php

@@ -88,8 +88,7 @@ class Zend_Cache_Frontend_Output extends Zend_Cache_Core
     public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8)
     {
         if ($forcedDatas === null) {
-            $data = ob_get_contents();
-            ob_end_clean();
+            $data = ob_get_clean();
         } else {
             $data =& $forcedDatas;
         }

library/Zend/Soap/Client/Local.php

@@ -83,8 +83,7 @@ class Zend_Soap_Client_Local extends Zend_Soap_Client
         // Perform request as is
         ob_start();
         $this->_server->handle($request);
-        $response = ob_get_contents();
-        ob_end_clean();
+        $response = ob_get_clean();
 
         return $response;
     }

tests/Zend/Cache/ClassFrontendTest.php

@@ -138,8 +138,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance1->foobar('param1', 'param2');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('bar', $return);
         $this->assertEquals('foo', $data);
@@ -150,8 +149,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance1->foobar('param3', 'param4');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param3, param4)', $return);
         $this->assertEquals('foobar_output(param3, param4)', $data);
@@ -162,8 +160,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance2->foobar2('param1', 'param2');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('bar', $return);
         $this->assertEquals('foo', $data);
@@ -174,8 +171,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance2->foobar2('param3', 'param4');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar2_return(param3, param4)', $return);
         $this->assertEquals('hello !foobar2_output(param3, param4)', $data);
@@ -188,8 +184,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance1->foobar('param1', 'param2');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2)', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);
@@ -204,8 +199,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance1->foobar('param1', 'param2');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('bar', $return);
         $this->assertEquals('foo', $data);
@@ -220,8 +214,7 @@ class Zend_Cache_ClassFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance1->foobar('param1', 'param2');
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2)', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);

tests/Zend/Cache/FunctionFrontendTest.php

@@ -101,8 +101,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance->call('foobar', array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('bar', $return);
         $this->assertEquals('foo', $data);
@@ -113,8 +112,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance->call('foobar', array('param3', 'param4'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param3, param4)', $return);
         $this->assertEquals('foobar_output(param3, param4)', $data);
@@ -127,8 +125,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance->call('foobar', array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2)', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);
@@ -143,8 +140,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance->call('foobar', array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('bar', $return);
         $this->assertEquals('foo', $data);
@@ -159,8 +155,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_start();
         ob_implicit_flush(false);
         $return = $this->_instance->call('foobar', array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2)', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);
@@ -176,8 +171,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_implicit_flush(false);
         $object = new fooclass();
         $return = $this->_instance->call(array($object, 'foobar'), array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2):1', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);
@@ -193,8 +187,7 @@ class Zend_Cache_FunctionFrontendTest extends PHPUnit_Framework_TestCase {
         ob_implicit_flush(false);
         $object = new fooclass();
         $return = $this->_instance->call(array($object, 'foobar'), array('param1', 'param2'));
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar_return(param1, param2):2', $return);
         $this->assertEquals('foobar_output(param1, param2)', $data);

tests/Zend/Cache/OutputFrontendTest.php

@@ -66,8 +66,7 @@ class Zend_Cache_OutputFrontendTest extends PHPUnit_Framework_TestCase {
             echo('foobar');
             $this->_instance->end();
         }
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foo', $data);
     }
@@ -80,8 +79,7 @@ class Zend_Cache_OutputFrontendTest extends PHPUnit_Framework_TestCase {
             echo('foobar');
             $this->_instance->end();
         }
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar', $data);
     }

tests/Zend/Cache/PageFrontendTest.php

@@ -164,8 +164,7 @@ class Zend_Cache_PageFrontendTest extends PHPUnit_Framework_TestCase {
             echo('foobar');
             ob_end_flush();
         }
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foo', $data);
     }
@@ -178,8 +177,7 @@ class Zend_Cache_PageFrontendTest extends PHPUnit_Framework_TestCase {
             echo('foobar');
             ob_end_flush();
         }
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('foobar', $data);
     }
@@ -193,8 +191,7 @@ class Zend_Cache_PageFrontendTest extends PHPUnit_Framework_TestCase {
             echo('foobar');
             ob_end_flush();
         }
-        $data = ob_get_contents();
-        ob_end_clean();
+        $data = ob_get_clean();
         ob_implicit_flush(true);
         $this->assertEquals('DEBUG HEADER : This is a cached page !foo', $data);
     }

tests/Zend/ConfigTest.php

@@ -196,8 +196,7 @@ class Zend_ConfigTest extends PHPUnit_Framework_TestCase
 
         ob_start();
         print_r($config->toArray());
-        $contents = ob_get_contents();
-        ob_end_clean();
+        $contents = ob_get_clean();
 
         $this->assertContains('Array', $contents);
         $this->assertContains('[hostname] => all', $contents);

tests/Zend/DebugTest.php

@@ -77,8 +77,7 @@ class Zend_DebugTest extends PHPUnit_Framework_TestCase
 
         ob_start();
         $result1 = Zend_Debug::Dump($data, null, true);
-        $result2 = ob_get_contents();
-        ob_end_clean();
+        $result2 = ob_get_clean();
 
         $this->assertContains('string(6) "string"', $result1);
         $this->assertEquals($result1, $result2);