Allow returned response objects to work from controllers.

Author: lonnieezell

system/CodeIgniter.php

@@ -810,12 +810,27 @@ protected function display404errors(PageNotFoundException $e)
     /**
      * Gathers the script output from the buffer, replaces some execution
      * time tag in the output and displays the debug toolbar, if required.
+     *
+     * @param null $cacheConfig
+     * @param null $returned
      */
     protected function gatherOutput($cacheConfig = null, $returned = null)
     {
         $this->output = ob_get_contents();
         ob_end_clean();
 
+        // If the controller returned a response object,
+        // we need to grab the body from it so it can
+        // be added to anything else that might have been
+        // echoed already.
+        // We also need to save the instance locally
+        // so that any status code changes, etc, take place.
+        if ($returned instanceof Response)
+        {
+            $this->response = $returned;
+            $returned = $returned->getBody();
+        }
+
         if (is_string($returned))
         {
             $this->output .= $returned;

tests/system/CodeIgniterTest.php

@@ -162,4 +162,53 @@ public function testRun404OverrideByClosure()
 
 	//--------------------------------------------------------------------
 
+    public function testControllersCanReturnString()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'pages/about',
+        ];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/(:segment)', function($segment)
+        {
+            return 'You want to see "'.esc($segment).'" page.';
+        });
+        $router = Services::router($routes);
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->run();
+        $output = ob_get_clean();
+
+        $this->assertContains('You want to see "about" page.', $output);
+    }
+
+    public function testControllersCanReturnResponseObject()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'pages/about',
+        ];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/(:segment)', function($segment)
+        {
+            $response = Services::response();
+            $string = "You want to see 'about' page.";
+            return $response->setBody($string);
+        });
+        $router = Services::router($routes);
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->run();
+        $output = ob_get_clean();
+
+        $this->assertContains("You want to see 'about' page.", $output);
+    }
 }