Merge pull request #248 from bowphp/5.x-refactoring-for-perf

[5.x] Refactoring For Performance

src/Database/Migration/Migration.php

@@ -17,7 +17,7 @@ abstract class Migration
      *
      * @var AbstractConnection
      */
-    private $adapter;
+    private AbstractConnection $adapter;
 
     /**
      * Migration constructor
@@ -58,6 +58,16 @@ final public function connection(string $name): Migration
         return $this;
     }
 
+    /**
+     * Get adapter name
+     *
+     * @return string
+     */
+    public function getAdapterName(): string
+    {
+        return $this->adapter->getName();
+    }
+
     /**
      * Drop table action
      *

src/Http/Client/HttpClient.php

@@ -13,7 +13,14 @@ class HttpClient
      *
      * @var array
      */
-    private $attach = [];
+    private array $attach = [];
+
+    /**
+     * Define the accept json header
+     *
+     * @var boolean
+     */
+    private bool $accept_json = false;
 
     /**
      * The headers collection
@@ -74,8 +81,7 @@ public function setBaseUrl(string $url): void
     public function get(string $url, array $data = []): Response
     {
         if (count($data) > 0) {
-            $params = http_build_query($data);
-            $url . "?" . $params;
+            $url = $url . "?" . http_build_query($data);
         }
 
         $this->init($url);
@@ -200,6 +206,20 @@ public function setUserAgent(string $user_agent): HttpClient
         return $this;
     }
 
+    /**
+     * Set the json accept prop to format the sent content in json
+     *
+     * @return HttpClient
+     */
+    public function acceptJson(): HttpClient
+    {
+        $this->accept_json = true;
+
+        $this->addHeaders(["Content-Type" => "application/json"]);
+
+        return $this;
+    }
+
     /**
      * Reset alway connection
      *
@@ -223,9 +243,13 @@ private function init(string $url): void
      */
     private function addFields(array $data): void
     {
-        if (count($data) > 0) {
-            curl_setopt($this->ch, CURLOPT_POSTFIELDS, http_build_query($data));
+        if ($this->accept_json) {
+            $payload = json_encode($data);
+        } else {
+            $payload = http_build_query($data);
         }
+
+        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $payload);
     }
 
     /**
@@ -256,7 +280,10 @@ private function execute(): string
         $this->close();
 
         if ($content === false) {
-            throw new \Exception(curl_strerror($errno));
+            throw new HttpClientException(
+                curl_strerror($errno),
+                $errno
+            );
         }
 
         return $content;

src/Http/Client/HttpClientException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bow\Http\Client;
+
+use Exception;
+
+class HttpClientException extends Exception
+{
+}

src/Http/Exception/HttpException.php

@@ -15,6 +15,13 @@ class HttpException extends Exception
      */
     protected $status = 'OK';
 
+    /**
+     * Define the errors bags
+     *
+     * @var array
+     */
+    protected array $error_bags = [];
+
     /**
      * HttpException constructor
      *
@@ -47,4 +54,24 @@ public function getStatusCode()
     {
         return $this->getCode();
     }
+
+    /**
+     * Set the errors bags
+     *
+     * @param array $errors
+     */
+    public function setErrorBags(array $errors)
+    {
+        $this->error_bags = $errors;
+    }
+
+    /**
+     * Get the errors bags
+     *
+     * @return array
+     */
+    public function getErrorBags(): array
+    {
+        return $this->error_bags;
+    }
 }

src/Http/Request.php

@@ -52,7 +52,7 @@ private function __construct()
         $this->id = "req_" . sha1(uniqid() . time());
 
         if ($this->getHeader('content-type') == 'application/json') {
-            $data = json_decode(file_get_contents("php://input"), true);
+            $data = json_decode(file_get_contents("php://input"), true, 1024, JSON_THROW_ON_ERROR);
             $this->input = array_merge((array) $data, $_GET);
         } else {
             $data = $_POST ?? [];

src/Support/Env.php

@@ -4,6 +4,8 @@
 
 namespace Bow\Support;
 
+use Bow\Application\Exception\ApplicationException;
+
 class Env
 {
     /**
@@ -52,9 +54,16 @@ public static function load(string $filename)
         // Get the env file content
         $content = file_get_contents($filename);
 
-        static::$envs = json_decode(trim($content), true);
+        $envs = json_decode(trim($content), true, 1024);
+
+        if (json_last_error()) {
+            throw new ApplicationException(
+                json_last_error_msg() . ": check your env json and synthax please."
+            );
+        }
 
-        static::$envs = static::bindVariables(static::$envs);
+        static::$envs = $envs;
+        static::$envs = static::bindVariables($envs);
 
         foreach (static::$envs as $key => $value) {
             $key = Str::upper(trim($key));

src/Validation/Rules/RegexRule.php

@@ -12,12 +12,12 @@ trait RegexRule
      * Check that the contents of the field with a regular expression
      *
      * @param string $key
-     * @param string $masque
+     * @param string|int|float $masque
      * @return void
      */
-    protected function compileRegex(string $key, string $masque): void
+    protected function compileRegex(string $key, string|int|float $masque): void
     {
-        if (!preg_match("/^regex:(.+)+$/", $masque, $match)) {
+        if (!preg_match("/^regex:(.+)+$/", (string) $masque, $match)) {
             return;
         }