Merge pull request #28 from SidRoberts/response

$application->handle() returns $response
phalcon · Apr 9, 2019 · 7b3e092 · 7b3e092
2 parents 558a0dc + 275fd9a
commit 7b3e092
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 18 deletions.
diff --git a/hmvc/public/index.php b/hmvc/public/index.php
@@ -98,4 +98,8 @@ public function request(array $location, $data = null)
 
 $app = new HMVCApplication($di);
 
-echo $app->handle()->getContent();
+
+
+$response = $app->handle();
+
+$response->send();
diff --git a/multiple-factory-default/public/index.php b/multiple-factory-default/public/index.php
@@ -58,7 +58,9 @@
         ]
     );
 
-    echo $application->handle()->getContent();
+    $response = $application->handle();
+
+    $response->send();
 } catch (Phalcon\Exception $e) {
     echo $e->getMessage();
 } catch (PDOException $e) {

diff --git a/multiple-service-layer-model/public/index.php b/multiple-service-layer-model/public/index.php
@@ -27,7 +27,9 @@
      */
     require __DIR__ . '/../apps/config/modules.php';
 
-    echo $application->handle()->getContent();
+    $response = $application->handle();
+
+    $response->send();
 } catch (Phalcon\Exception $e) {
     echo $e->getMessage();
 } catch (PDOException $e) {

diff --git a/multiple-shared-layouts/public/index.php b/multiple-shared-layouts/public/index.php
@@ -80,7 +80,9 @@
         ]
     );
 
-    echo $application->handle()->getContent();
+    $response = $application->handle();
+
+    $response->send();
 } catch (Phalcon\Exception $e) {
     echo $e->getMessage();
 } catch (PDOException $e) {

diff --git a/multiple-shared-views/public/index.php b/multiple-shared-views/public/index.php
@@ -89,4 +89,4 @@ function () {
 
 $response = $application->handle();
 
-echo $response->getContent();
+$response->send();
diff --git a/multiple-volt/public/index.php b/multiple-volt/public/index.php
@@ -27,7 +27,7 @@
 
     $response = $application->handle();
 
-    echo $response->getContent();
+    $response->send();
 } catch (Exception $e) {
     echo $e->getMessage();
 }
diff --git a/multiple/public/index.php b/multiple/public/index.php
@@ -80,7 +80,9 @@ public function main()
             ]
         ]);
 
-        echo $this->handle()->getContent();
+        $response = $this->handle();
+
+        $response->send();
     }
 }
 

diff --git a/simple-subcontrollers/public/index.php b/simple-subcontrollers/public/index.php
@@ -26,7 +26,9 @@
      */
     $application = new Application($di);
 
-    echo $application->handle()->getContent();
+    $response = $application->handle();
+
+    $response->send();
 } catch (\Exception $e) {
     echo $e->getMessage();
 }
diff --git a/simple-volt/public/index.php b/simple-volt/public/index.php
@@ -24,7 +24,10 @@
      */
     $application = new \Phalcon\Mvc\Application();
     $application->setDI($di);
-    echo $application->handle()->getContent();
+
+    $response = $application->handle();
+
+    $response->send();
 } catch (Phalcon\Exception $e) {
     echo $e->getMessage();
 } catch (PDOException $e) {

diff --git a/simple-without-application/public/index.php b/simple-without-application/public/index.php
@@ -80,9 +80,7 @@
     // Pass the output of the view to the response
     $response->setContent($view->getContent());
 
-    $response->sendHeaders();
-
-    echo $response->getContent();
+    $response->send();
 } catch (\Exception $e) {
     echo $e->getMessage();
 }
diff --git a/simple/public/index.php b/simple/public/index.php
@@ -78,7 +78,7 @@ function () {
 
     $response = $application->handle();
 
-    echo $response->getContent();
+    $response->send();
 } catch (Exception $e) {
     echo $e->getMessage();
 }
diff --git a/single-camelized-dirs/public/index.php b/single-camelized-dirs/public/index.php
@@ -28,7 +28,9 @@ function ($event, $application, $view) use ($di) {
 
     $application->setEventsManager($eventsManager);
 
-    echo $application->handle()->getContent();
+    $response = $application->handle();
+
+    $response->send();
 } catch (\Exception $e) {
     echo $e->getMessage();
 }
diff --git a/single-factory-default/public/index.php b/single-factory-default/public/index.php
@@ -86,7 +86,10 @@
      * Handle the request
      */
     $application = new Application($di);
-    echo $application->handle()->getContent();
+
+    $response = $application->handle();
+
+    $response->send();
 } catch (\Exception $e) {
     echo $e->getMessage();
 }
diff --git a/single-namespaces/public/index.php b/single-namespaces/public/index.php
@@ -97,7 +97,9 @@ public function main()
         $this->registerServices();
         $this->registerAutoloaders();
 
-        echo $this->handle()->getContent();
+        $response = $this->handle();
+
+        $response->send();
     }
 }
 

diff --git a/single-service-provider/app/Bootstrap.php b/single-service-provider/app/Bootstrap.php
@@ -103,7 +103,9 @@ public function run()
     protected function getOutput()
     {
         if ($this->app instanceof Application) {
-            return $this->app->handle()->getContent();
+            $response = $this->app->handle();
+
+            return $response->getContent();
         }
 
         return $this->app->handle();

diff --git a/single/public/index.php b/single/public/index.php
@@ -117,7 +117,9 @@ public function main()
         $this->registerServices();
         $this->registerAutoloaders();
 
-        echo $this->handle()->getContent();
+        $response = $this->handle();
+
+        $response->send();
     }
 }