Minor code tweaks (#574)

mcamara · Jul 26, 2018 · 568d319 · 568d319
1 parent 79f0ea6
commit 568d319
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 35 deletions.
diff --git a/src/Mcamara/LaravelLocalization/LanguageNegotiator.php b/src/Mcamara/LaravelLocalization/LanguageNegotiator.php
@@ -149,7 +149,7 @@ private function getMatchesFromAcceptedLanguages()
                 }
                 // Unweighted values, get high weight by their position in the
                 // list
-                $q = isset($q) ? $q : 1000 - count($matches);
+                $q = $q ?? 1000 - \count($matches);
                 $matches[$l] = $q;
 
                 //If for some reason the Accept-Language header only sends language with country

diff --git a/src/Mcamara/LaravelLocalization/LaravelLocalization.php b/src/Mcamara/LaravelLocalization/LaravelLocalization.php
@@ -4,12 +4,6 @@
 
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Routing\UrlRoutable;
-use Illuminate\Foundation\Application;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\URL;
-use Illuminate\Translation\Translator;
-use Illuminate\View\Factory;
 use Mcamara\LaravelLocalization\Exceptions\SupportedLocalesNotDefined;
 use Mcamara\LaravelLocalization\Exceptions\UnsupportedLocaleException;
 
@@ -140,7 +134,7 @@ public function __construct()
      */
     public function setLocale($locale = null)
     {
-        if (empty($locale) || !is_string($locale)) {
+        if (empty($locale) || !\is_string($locale)) {
             // If the locale has not been passed through the function
             // it tries to get it from the first segment of the url
             $locale = $this->request->segment(1);
@@ -277,8 +271,8 @@ public function getLocalizedURL($locale = null, $url = null, $attributes = [], $
             return $this->getURLFromRouteNameTranslated($locale, $translatedRoute, $attributes, $forceDefaultLocation);
         }
 
-	if (!empty($locale)) {
-            if ($locale != $this->getDefaultLocale() || !$this->hideDefaultLocaleInURL() || $forceDefaultLocation) {
+	    if (!empty($locale)) {
+            if ($forceDefaultLocation || $locale != $this->getDefaultLocale() || !$this->hideDefaultLocaleInURL()) {
                 $parsed_url['path'] = $locale.'/'.ltrim($parsed_url['path'], '/');
             }
         }
@@ -319,7 +313,7 @@ public function getURLFromRouteNameTranslated($locale, $transKeyName, $attribute
             throw new UnsupportedLocaleException('Locale \''.$locale.'\' is not in the list of supported locales.');
         }
 
-        if (!is_string($locale)) {
+        if (!\is_string($locale)) {
             $locale = $this->getDefaultLocale();
         }
 
@@ -328,7 +322,7 @@ public function getURLFromRouteNameTranslated($locale, $transKeyName, $attribute
         if ($forceDefaultLocation || !($locale === $this->defaultLocale && $this->hideDefaultLocaleInURL())) {
             $route = '/'.$locale;
         }
-        if (is_string($locale) && $this->translator->has($transKeyName, $locale)) {
+        if (\is_string($locale) && $this->translator->has($transKeyName, $locale)) {
             $translation = $this->translator->trans($transKeyName, [], $locale);
             $route .= '/'.$translation;
 
@@ -381,7 +375,7 @@ public function getSupportedLocales()
 
         $locales = $this->configRepository->get('laravellocalization.supportedLocales');
 
-        if (empty($locales) || !is_array($locales)) {
+        if (empty($locales) || !\is_array($locales)) {
             throw new SupportedLocalesNotDefined();
         }
 
@@ -555,8 +549,7 @@ protected function substituteAttributesInRoute($attributes, $route)
             if ($value instanceOf UrlRoutable) {
                 $value = $value->getRouteKey();
             }
-            $route = str_replace('{'.$key.'}', $value, $route);
-            $route = str_replace('{'.$key.'?}', $value, $route);
+            $route = str_replace(array('{'.$key.'}', '{'.$key.'?}'), $value, $route);
         }
 
         // delete empty optional arguments that are not in the $attributes array
@@ -594,7 +587,7 @@ public function setRouteName($routeName)
      */
     public function transRoute($routeName)
     {
-        if (!in_array($routeName, $this->translatedRoutes)) {
+        if (!\in_array($routeName, $this->translatedRoutes)) {
             $this->translatedRoutes[] = $routeName;
         }
 
@@ -840,7 +833,7 @@ protected function extractAttributes($url = false, $locale = '')
                 $response = array_shift($response);
             }
 
-            if (is_array($response)) {
+            if (\is_array($response)) {
                 $attributes = array_merge($attributes, $response);
             }
         }
@@ -863,16 +856,16 @@ protected function unparseUrl($parsed_url)
 
         $url = '';
         $url .= isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
-        $url .= isset($parsed_url['host']) ? $parsed_url['host'] : '';
+        $url .= $parsed_url['host'] ?? '';
         $url .= isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
-        $user = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+        $user = $parsed_url['user'] ?? '';
         $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : '';
         $url .= $user.(($user || $pass) ? "$pass@" : '');
 
         if (!empty($url)) {
             $url .= isset($parsed_url['path']) ? '/'.ltrim($parsed_url['path'], '/') : '';
         } else {
-            $url .= isset($parsed_url['path']) ? $parsed_url['path'] : '';
+            $url .= $parsed_url['path'] ?? '';
         }
 
         $url .= isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
@@ -889,7 +882,7 @@ protected function unparseUrl($parsed_url)
     */
      protected function normalizeAttributes($attributes)
      {
-         if (array_key_exists('data', $attributes) && is_array($attributes['data']) && ! count($attributes['data'])) {
+         if (array_key_exists('data', $attributes) && \is_array($attributes['data']) && ! \count($attributes['data'])) {
              $attributes['data'] = null;
              return $attributes;
          }

diff --git a/src/Mcamara/LaravelLocalization/LaravelLocalizationServiceProvider.php b/src/Mcamara/LaravelLocalization/LaravelLocalizationServiceProvider.php
@@ -6,13 +6,6 @@
 
 class LaravelLocalizationServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
     /**
      * Bootstrap the application events.
      *

diff --git a/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationRedirectFilter.php b/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationRedirectFilter.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
 
 class LaravelLocalizationRedirectFilter extends LaravelLocalizationMiddlewareBase 
 {
@@ -29,7 +28,7 @@ public function handle($request, Closure $next)
         // Dump the first element (empty string) as getPathInfo() always returns a leading slash
         array_shift($params);
 
-        if (count($params) > 0) {
+        if (\count($params) > 0) {
             $localeCode = $params[0];
             $locales = app('laravellocalization')->getSupportedLocales();
             $hideDefaultLocale = app('laravellocalization')->hideDefaultLocaleInURL();

diff --git a/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationRoutes.php b/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationRoutes.php
@@ -3,7 +3,6 @@
 namespace Mcamara\LaravelLocalization\Middleware;
 
 use Closure;
-use Illuminate\Http\Request;
 
 class LaravelLocalizationRoutes extends LaravelLocalizationMiddlewareBase
 {

diff --git a/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationViewPath.php b/src/Mcamara/LaravelLocalization/Middleware/LaravelLocalizationViewPath.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Support\Facades\View;
-use Illuminate\Http\Request;
 
 class LaravelLocalizationViewPath extends LaravelLocalizationMiddlewareBase 
 {

diff --git a/src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php b/src/Mcamara/LaravelLocalization/Middleware/LocaleCookieRedirect.php
@@ -1,7 +1,7 @@
 <?php namespace Mcamara\LaravelLocalization\Middleware;
 
-use Illuminate\Http\RedirectResponse;
 use Closure;
+use Illuminate\Http\RedirectResponse;
 
 class LocaleCookieRedirect extends LaravelLocalizationMiddlewareBase 
 {
@@ -23,7 +23,7 @@ public function handle($request, Closure $next) {
          $params = explode('/', $request->path());
          $locale = $request->cookie('locale', false);
 
-         if (count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[0])) {
+         if (\count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[0])) {
             return $next($request)->withCookie(cookie()->forever('locale', $params[0]));
          }
 

diff --git a/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php b/src/Mcamara/LaravelLocalization/Middleware/LocaleSessionRedirect.php
@@ -25,7 +25,7 @@ public function handle($request, Closure $next)
         $params = explode('/', $request->path());
         $locale = session('locale', false);
 
-        if (count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[0])) {
+        if (\count($params) > 0 && app('laravellocalization')->checkLocaleInSupportedLocales($params[0])) {
             session(['locale' => $params[0]]);
 
             return $next($request);