Merge pull request #247 from AntonShevchuk/master

Prepare Response object for PSR-7

Author: Anton

src/Application/Application.php

@@ -704,20 +704,20 @@ public function process()
             $response->setException($e);
 
             if ($request->isXmlHttpRequest()) {
-                $response->setCode(204);
+                $response->setStatusCode(204);
                 $response->setHeader('Bluz-Redirect', $e->getMessage());
             } else {
-                $response->setCode($e->getCode());
+                $response->setStatusCode($e->getCode());
                 $response->setHeader('Location', $e->getMessage());
             }
         } catch (ReloadException $e) {
             $response->setException($e);
 
             if ($request->isXmlHttpRequest()) {
-                $response->setCode(204);
+                $response->setStatusCode(204);
                 $response->setHeader('Bluz-Reload', 'true');
             } else {
-                $response->setCode($e->getCode());
+                $response->setStatusCode($e->getCode());
                 $response->setHeader('Refresh', '15; url=' . $request->getRequestUri());
             }
         } catch (\Exception $e) {
@@ -737,8 +737,8 @@ public function process()
                 $dispatchResult = $this->getLayout();
             }
 
-            $response->setCode($e->getCode())
-                ->setBody($dispatchResult);
+            $response->setStatusCode($e->getCode());
+            $response->setBody($dispatchResult);
         }
 
         return $this->getResponse();

src/Cli/Response.php

@@ -11,7 +11,6 @@
  */
 namespace Bluz\Cli;
 
-use Bluz\Messages\Messages;
 use Bluz\Response\AbstractResponse;
 use Bluz\View\View;
 
@@ -32,29 +31,15 @@ class Response extends AbstractResponse
      */
     protected function sendHeaders()
     {
-        // output messages if exists
-        if (app()->hasMessages()) {
-            $messages = app()->getMessages()->popAll();
-            foreach ($messages as $type => $stack) {
-                if (!sizeof($stack)) {
-                    continue;
-                }
-                echo "\n";
-                switch ($type) {
-                    case Messages::TYPE_ERROR:
-                        echo Colorize::text("Errors  ", "white", "red", true);
-                        break;
-                    case Messages::TYPE_NOTICE:
-                        echo Colorize::text("Info    ", "white", "blue", true);
-                        break;
-                    case Messages::TYPE_SUCCESS:
-                        echo Colorize::text("Success ", "white", "green", true);
-                        break;
-                }
-                echo ":\n\t";
-                echo join("\n\t", $stack);
+        // output headers
+        foreach ($this->getHeaders() as $name => $value) {
+            if (!sizeof($value)) {
+                continue;
             }
-            echo "\n\n";
+            echo $name .": ". join(', ', $value) ."\n";
+        }
+        if (sizeof($this->headers)) {
+            echo "\n";
         }
     }
 
@@ -76,14 +61,12 @@ protected function sendBody()
         if (is_array($response)) {
             // just print to console
             foreach ($response as $key => $value) {
-                echo Colorize::text($key, "yellow", null, true) . ": ";
+                echo $key . ": ";
                 print_r($value);
                 echo "\n";
             }
         } else {
-            echo Colorize::text("Response", "yellow", null, true) . ": ";
             print_r($response);
-            echo "\n";
         }
     }
 }

src/Controller/Rest.php

@@ -152,11 +152,11 @@ public function __invoke()
                     }
 
                 } catch (ValidatorException $e) {
-                    app()->getResponse()->setCode(400);
+                    app()->getResponse()->setStatusCode(400);
                     return ['errors' => $e->getErrors()];
                 }
 
-                app()->getResponse()->setCode(201);
+                app()->getResponse()->setStatusCode(201);
                 app()->getResponse()->setHeader(
                     'Location',
                     app()->getRouter()->url($request->getModule(), $request->getController()).'/'.$result
@@ -180,10 +180,10 @@ public function __invoke()
                     // if $result === 0 it's means a update is not apply
                     // or records not found
                     if (0 === $result) {
-                        app()->getResponse()->setCode(304);
+                        app()->getResponse()->setStatusCode(304);
                     }
                 } catch (ValidatorException $e) {
-                    app()->getResponse()->setCode(400);
+                    app()->getResponse()->setStatusCode(400);
                     return ['errors' => $e->getErrors()];
                 }
                 return false; // disable view
@@ -201,7 +201,7 @@ public function __invoke()
                     }
                     $this->deleteSet($this->data);
                 }
-                app()->getResponse()->setCode(204);
+                app()->getResponse()->setStatusCode(204);
                 return false; // disable view
             default:
                 throw new NotImplementedException();

src/Http/Response.php

@@ -41,7 +41,7 @@ protected function sendHeaders()
 
         // Send stored headers
         foreach ($this->headers as $key => $value) {
-            header($key .': '. $value);
+            header($key .': '. join(', ', $value));
         }
     }