Merge pull request #41 from mremi/master

Added missing property declaration and handled status code of Drupal

Author: rande

Drupal/Drupal.php

@@ -52,6 +52,11 @@ class Drupal implements DrupalInterface
      */
     protected $state;
 
+    /**
+     * @var Response
+     */
+    protected $response;
+
     /**
      * @var array
      */
@@ -87,7 +92,7 @@ public function __construct($root, UserManagerInterface $userManager)
     {
         $this->root            = $root;
         $this->state           = self::STATE_FRESH;
-        $this->response        = new Response;
+        $this->response        = new Response();
         $this->encapsulated    = false;
         $this->disableResponse = false;
         $this->userManager     = $userManager;
@@ -227,6 +232,12 @@ public function shutdown($level)
             $this->response->headers->set($name, $value);
         }
 
+        $statusCode = http_response_code();
+
+        if ($statusCode !== false) {
+            $this->response->setStatusCode($statusCode);
+        }
+
         $content = ob_get_contents();
 
         $this->response->setContent($content);
@@ -401,6 +412,12 @@ public function render()
 
         $this->response->setContent($content);
 
+        $statusCode = http_response_code();
+
+        if ($statusCode !== false) {
+            $this->response->setStatusCode($statusCode);
+        }
+
         $this->state = self::STATE_RESPONSE;
     }