Merge pull request #15 from blitz-php/devs

Devs

Author: dimtrovich

src/Http/Concerns/InteractsWithInput.php

@@ -276,15 +276,23 @@ public function input(?string $key = null, mixed $default = null): mixed
      */
     public function str(string $key, mixed $default = null): Stringable
     {
-        return Text::of($this->input($key, $default));
+        if (null === $value = $this->string($key, $default)) {
+            return null;
+        }
+
+        return Text::of($value);
     }
 
     /**
      * Récupérez l'entrée de la requête en tant que chaine de caractere.
      */
-    public function string(string $key, mixed $default = null): string
+    public function string(string $key, mixed $default = null): ?string
     {
-        return $this->str($key, $default)->value();
+        if (null === $value = $this->input($key, $default)) {
+            return null;
+        }
+
+        return (string) $value;
     }
 
     /**

src/Router/Dispatcher.php

@@ -17,6 +17,7 @@
 use BlitzPHP\Contracts\Event\EventManagerInterface;
 use BlitzPHP\Contracts\Http\ResponsableInterface;
 use BlitzPHP\Contracts\Router\RouteCollectionInterface;
+use BlitzPHP\Contracts\Support\Arrayable;
 use BlitzPHP\Debug\Timer;
 use BlitzPHP\Enums\Method;
 use BlitzPHP\Exceptions\PageNotFoundException;
@@ -608,13 +609,17 @@ protected function formatResponse(ResponseInterface $response, $returned): Respo
             return $returned->toResponse($this->request);
         }
 
+        if ($returned instanceof Arrayable) {
+            $returned = $returned->toArray();
+        }
+
         if (is_object($returned)) {
-            if (method_exists($returned, '__toString')) {
-                $returned = $returned->__toString();
-            } elseif (method_exists($returned, 'toArray')) {
+            if (method_exists($returned, 'toArray')) {
                 $returned = $returned->toArray();
             } elseif (method_exists($returned, 'toJSON')) {
                 $returned = $returned->toJSON();
+            } elseif (method_exists($returned, '__toString')) {
+                $returned = $returned->__toString();
             } else {
                 $returned = (array) $returned;
             }