Merge bd35573 into 7aace20

pmochine · Jul 15, 2018 · c5915b7 · c5915b7
2 parents 7aace20 + bd35573
commit c5915b7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/src/Accent/Accent.php b/src/Accent/Accent.php
@@ -25,7 +25,7 @@ public static function unparseUrl($parsed_url)
         $user = isset($parsed_url['user']) ? $parsed_url['user'] : '';
         $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : '';
         $url .= $user.(($user || $pass) ? "$pass@" : '');
-        if (! empty($url)) {
+        if (!empty($url)) {
             $url .= isset($parsed_url['path']) ? '/'.ltrim($parsed_url['path'], '/') : '';
         } elseif (empty($url)) {
             $url .= isset($parsed_url['path']) ? $parsed_url['path'] : '';

diff --git a/src/Dialect.php b/src/Dialect.php
@@ -123,11 +123,11 @@ public function translateAll($excludeCurrentLocale = true)
     public function translate($routeName, $routeAttributes = null, $locale = null)
     {
         // If no locale is given, we use the current locale
-        if (! $locale) {
+        if (!$locale) {
             $locale = tongue()->current();
         }
 
-        if (! $this->parsed_url) {
+        if (!$this->parsed_url) {
             $this->parsed_url = Accent::parseCurrentUrl();
         }
 
@@ -163,7 +163,7 @@ public function interpret($routeName)
     {
         $routePath = Accent::findRoutePathByName($routeName);
 
-        if (! isset($this->translatedRoutes[$routeName])) {
+        if (!isset($this->translatedRoutes[$routeName])) {
             $this->translatedRoutes[$routeName] = $routePath;
         }
 

diff --git a/src/Localization/Localization.php b/src/Localization/Localization.php
@@ -19,8 +19,8 @@ public static function decipherTongue()
     {
         $locale = self::fromUrl();
 
-        if (! $locale) {
-            if (! Config::beautify()) {
+        if (!$locale) {
+            if (!Config::beautify()) {
                 return Config::fallbackLocale(); //redirects see test it_ignoes_cookies_and_redirects....
             }
 
@@ -85,7 +85,7 @@ protected static function currentTongue()
      */
     protected static function languageIsSet()
     {
-        return ! app()->runningInConsole() || array_has(request()->server(), 'HTTP_ACCEPT_LANGUAGE');
+        return !app()->runningInConsole() || array_has(request()->server(), 'HTTP_ACCEPT_LANGUAGE');
     }
 
     /**

diff --git a/src/Localization/TongueDetector.php b/src/Localization/TongueDetector.php
@@ -64,7 +64,7 @@ public function negotiateLanguage()
         $matches = $this->getMatchesFromAcceptedLanguages();
 
         foreach ($matches as $key => $q) {
-            if (! empty($this->supportedLanguages[$key])) {
+            if (!empty($this->supportedLanguages[$key])) {
                 return $key;
             }
 
@@ -87,10 +87,10 @@ public function negotiateLanguage()
             return key($this->supportedLanguages);
         }
 
-        if ($this->use_intl && ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        if ($this->use_intl && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
             $http_accept_language = Locale::acceptFromHttp($_SERVER['HTTP_ACCEPT_LANGUAGE']);
 
-            if (! empty($this->supportedLanguages[$http_accept_language])) {
+            if (!empty($this->supportedLanguages[$http_accept_language])) {
                 return $http_accept_language;
             }
         }
@@ -99,7 +99,7 @@ public function negotiateLanguage()
             $remote_host = explode('.', $this->request->server('REMOTE_HOST'));
             $lang = strtolower(end($remote_host));
 
-            if (! empty($this->supportedLanguages[$lang])) {
+            if (!empty($this->supportedLanguages[$lang])) {
                 return $lang;
             }
         }
@@ -143,7 +143,7 @@ private function getMatchesFromAcceptedLanguages()
                 //less than it's parent.
                 $l_ops = explode('-', $l);
                 array_pop($l_ops);
-                while (! empty($l_ops)) {
+                while (!empty($l_ops)) {
                     //The new generic option needs to be slightly less important than it's base
                     $q -= 0.001;
                     $op = implode('-', $l_ops);

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -20,11 +20,11 @@ public function register()
             'localization'
         );
 
-        $this->app->singleton('tongue', function ($app) {
+        $this->app->singleton('tongue', function($app) {
             return new Tongue($app);
         });
 
-        $this->app->singleton('dialect', function ($app) {
+        $this->app->singleton('dialect', function($app) {
             return new Dialect($app);
         });
     }

diff --git a/src/Tongue.php b/src/Tongue.php
@@ -46,7 +46,7 @@ public function current($key = null)
     {
         $locale = $this->app->getLocale();
 
-        if (! $key) {
+        if (!$key) {
             return $locale;
         }
 
@@ -89,7 +89,7 @@ public function twister()
         //fallback language is the same as the current language
         if (Config::beautify() && $this->current() === Config::fallbackLocale()) {
             //didn't found locale means browser is set to exmaple.com
-            if (! $locale) {
+            if (!$locale) {
                 return false;
             }
             //browser is set to en.example.com but should be forced back to example.com
@@ -111,7 +111,7 @@ public function twister()
      */
     public function speaks(string $locale)
     {
-        if (! $this->isSpeaking($locale)) {
+        if (!$this->isSpeaking($locale)) {
             return abort(404); //oder error?
         }
 
@@ -153,15 +153,15 @@ public function speaking($key = null, $locale = null)
     {
         $locales = Config::supportedLocales();
 
-        if (empty($locales) || ! is_array($locales)) {
+        if (empty($locales) || !is_array($locales)) {
             throw new SupportedLocalesNotDefined();
         }
 
-        if (! $key) {
+        if (!$key) {
             return collect($locales);
         }
 
-        if (! array_has($locales, "{$locale}.{$key}")) {
+        if (!array_has($locales, "{$locale}.{$key}")) {
             throw new SupportedLocalesNotDefined();
         }
 
@@ -176,7 +176,7 @@ public function speaking($key = null, $locale = null)
      */
     protected function findLocale()
     {
-        if (! Config::subdomain()) {
+        if (!Config::subdomain()) {
             return false; //use Mcamara Localization
         }
 

diff --git a/src/helpers.php b/src/helpers.php
@@ -3,13 +3,13 @@
 use Pmochine\LaravelTongue\Tongue;
 use Pmochine\LaravelTongue\Dialect;
 
-if (! function_exists('tongue')) {
+if (!function_exists('tongue')) {
     function tongue()
     {
         return app()->make(Tongue::class);
     }
 }
-if (! function_exists('dialect')) {
+if (!function_exists('dialect')) {
     function dialect()
     {
         return app()->make(Dialect::class);