made some cosmetic changes

fabpot · fabpot · commit e44b8ba521e6 · 2011-12-21T18:34:44.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
@@ -147,11 +147,11 @@ public function render($controller, array $options = array())
                 throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $request->getUri(), $response->getStatusCode()));
             }
 
-            if ($response instanceof StreamedResponse) {
-                $response->sendContent();
-            } else {
+            if (!$response instanceof StreamedResponse) {
                 return $response->getContent();
             }
+
+            $response->sendContent();
         } catch (\Exception $e) {
             if ($options['alt']) {
                 $alt = $options['alt'];
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -14,7 +14,7 @@
 /**
  * StreamedResponse represents a streamed HTTP response.
  *
- * A StreamedResponse uses a callback for its the content.
+ * A StreamedResponse uses a callback for its content.
  *
  * The callback should use the standard PHP functions like echo
  * to stream the response back to the client. The flush() method
diff --git a/src/Symfony/Component/Templating/EngineInterface.php b/src/Symfony/Component/Templating/EngineInterface.php
@@ -49,7 +49,7 @@ function render($name, array $parameters = array());
     /**
      * Streams a template.
      *
-     * The implementation should outputs the content directly to the client.
+     * The implementation should output the content directly to the client.
      *
      * @param mixed $name       A template name or a TemplateReferenceInterface instance
      * @param array $parameters An array of parameters to pass to the template
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/StreamedResponseTest.php b/tests/Symfony/Tests/Component/HttpFoundation/StreamedResponseTest.php
@@ -84,6 +84,6 @@ public function testSetContent()
     public function testGetContent()
     {
         $response = new StreamedResponse(function () { echo 'foo'; });
-        $this->assertEquals(false, $response->getContent());
+        $this->assertFalse($response->getContent());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,11 @@ public function render($controller, array $options = array())`
`147`	`147`	`throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $request->getUri(), $response->getStatusCode()));`
`148`	`148`	`}`
`149`	`149`
`150`		`- if ($response instanceof StreamedResponse) {`
`151`		`- $response->sendContent();`
`152`		`- } else {`
	`150`	`+ if (!$response instanceof StreamedResponse) {`
`153`	`151`	`return $response->getContent();`
`154`	`152`	`}`
	`153`	`+`
	`154`	`+ $response->sendContent();`
`155`	`155`	`} catch (\Exception $e) {`
`156`	`156`	`if ($options['alt']) {`
`157`	`157`	`$alt = $options['alt'];`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* StreamedResponse represents a streamed HTTP response.`
`16`	`16`	`*`
`17`		`- * A StreamedResponse uses a callback for its the content.`
	`17`	`+ * A StreamedResponse uses a callback for its content.`
`18`	`18`	`*`
`19`	`19`	`* The callback should use the standard PHP functions like echo`
`20`	`20`	`* to stream the response back to the client. The flush() method`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function render($name, array $parameters = array());`
`49`	`49`	`/**`
`50`	`50`	`* Streams a template.`
`51`	`51`	`*`
`52`		`- * The implementation should outputs the content directly to the client.`
	`52`	`+ * The implementation should output the content directly to the client.`
`53`	`53`	`*`
`54`	`54`	`* @param mixed $name A template name or a TemplateReferenceInterface instance`
`55`	`55`	`* @param array $parameters An array of parameters to pass to the template`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,6 @@ public function testSetContent()`
`84`	`84`	`public function testGetContent()`
`85`	`85`	`{`
`86`	`86`	`$response = new StreamedResponse(function () { echo 'foo'; });`
`87`		`- $this->assertEquals(false, $response->getContent());`
	`87`	`+ $this->assertFalse($response->getContent());`
`88`	`88`	`}`
`89`	`89`	`}`