made some cosmetic changes

symfony · fabpot · Dec 31, 2011 · Oct 17, 2011 · Dec 21, 2011 · Dec 21, 2011
commit e44b8ba521e60f4b0c8218a65415c001090520da
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());
    }
 }