Merge pull request #463 from AntonShevchuk/develop

Added Translator management

Author: Anton

src/Application/Application.php

@@ -155,15 +155,15 @@ public function init($environment = 'production'): void
             // init Messages
             Messages::getInstance();
 
-            // init Translator
-            Translator::getInstance();
-
             // init Request
             $this->initRequest();
 
             // init Response
             $this->initResponse();
 
+            // init Translator
+            $this->initTranslator();
+
             // init Router
             $this->initRouter();
         } catch (\Exception $e) {
@@ -229,19 +229,6 @@ protected function initResponse(): void
         Response::setInstance($response);
     }
 
-    /**
-     * Initial Router instance
-     *
-     * @return void
-     */
-    protected function initRouter(): void
-    {
-        $router = new \Bluz\Router\Router();
-        $router->setOptions(Config::get('router'));
-
-        Router::setInstance($router);
-    }
-
     /**
      * Get Response instance
      *
@@ -262,6 +249,34 @@ public function getRequest(): ServerRequest
         return Request::getInstance();
     }
 
+    /**
+     * Initial Router instance
+     *
+     * @return void
+     */
+    protected function initRouter(): void
+    {
+        $router = new \Bluz\Router\Router();
+        $router->setOptions(Config::get('router'));
+
+        Router::setInstance($router);
+    }
+
+    /**
+     * Initial Translator instance
+     *
+     * @return void
+     * @throws Common\Exception\ConfigurationException
+     */
+    protected function initTranslator(): void
+    {
+        $translator = new \Bluz\Translator\Translator();
+        $translator->setOptions(Config::get('translator'));
+        $translator->init();
+
+        Translator::setInstance($translator);
+    }
+
     /**
      * Run application
      *

src/Proxy/Request.php

@@ -52,6 +52,11 @@ final class Request
      */
     static private $accept;
 
+    /**
+     * @var array|null Accepted languages
+     */
+    static private $language;
+
     /**
      * Init instance
      *
@@ -253,41 +258,66 @@ public static function getMethod(): string
     public static function getAccept(): array
     {
         if (!self::$accept) {
-            // save to static variable
-            self::$accept = [];
+            // get header from request
+            self::$accept = self::parseAcceptHeader(self::getHeader('Accept'));
+        }
+        return self::$accept;
+    }
 
+    /**
+     * Get Accept MIME Type
+     *
+     * @return array
+     */
+    public static function getAcceptLanguage(): array
+    {
+        if (!self::$language) {
             // get header from request
-            $header = self::getHeader('accept');
+            self::$language = self::parseAcceptHeader(self::getHeader('Accept-Language'));
+        }
+        return self::$language;
+    }
 
-            // nothing ...
-            if (!$header) {
-                return self::$accept;
-            }
+    /**
+     * parseAcceptHeader
+     *
+     * @param string $header
+     *
+     * @return array
+     */
+    private static function parseAcceptHeader($header): array
+    {
+        // empty array
+        $accept = [];
+
+        // check empty
+        if (!$header || $header === '') {
+            return $accept;
+        }
 
-            // make array if types
-            $header = explode(',', $header);
-            $header = array_map('trim', $header);
-
-            foreach ($header as $a) {
-                // the default quality is 1.
-                $q = 1;
-                // check if there is a different quality
-                if (strpos($a, ';q=') or strpos($a, '; q=')) {
-                    // divide "mime/type;q=X" into two parts: "mime/type" i "X"
-                    [$a, $q] = preg_split('/;([ ]?)q=/', $a);
-                }
-                // remove other extension
-                if (strpos($a, ';')) {
-                    $a = substr($a, 0, strpos($a, ';'));
-                }
-
-                // mime-type $a is accepted with the quality $q
-                // WARNING: $q == 0 means, that mime-type isn’t supported!
-                self::$accept[$a] = (float)$q;
+        // make array from header
+        $values = explode(',', $header);
+        $values = array_map('trim', $values);
+
+        foreach ($values as $a) {
+            // the default quality is 1.
+            $q = 1;
+            // check if there is a different quality
+            if (strpos($a, ';q=') or strpos($a, '; q=')) {
+                // divide "mime/type;q=X" into two parts: "mime/type" i "X"
+                [$a, $q] = preg_split('/;([ ]?)q=/', $a);
             }
-            arsort(self::$accept);
+            // remove other extension
+            if (strpos($a, ';')) {
+                $a = substr($a, 0, strpos($a, ';'));
+            }
+
+            // mime-type $a is accepted with the quality $q
+            // WARNING: $q == 0 means, that isn’t supported!
+            $accept[$a] = (float)$q;
         }
-        return self::$accept;
+        arsort($accept);
+        return $accept;
     }
 
     /**
@@ -320,7 +350,7 @@ public static function checkAccept(array $allowTypes = [])
 
         // let’s check our supported types:
         foreach ($accept as $mime => $quality) {
-            if ($quality && \in_array($mime, $allowTypes)) {
+            if ($quality && \in_array($mime, $allowTypes, true)) {
                 return $mime;
             }
         }

src/Proxy/Translator.php

@@ -41,6 +41,7 @@ final class Translator
      * Init instance
      *
      * @return Instance
+     * @throws \Bluz\Common\Exception\ConfigurationException
      */
     private static function initInstance(): Instance
     {