Use facades/classes instead of global functions

Author: ivanvermeyen

src/Macros/UriTranslationMacro.php

@@ -2,6 +2,8 @@
 
 namespace CodeZero\LocalizedRoutes\Macros;
 
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Lang;
 
 class UriTranslationMacro
@@ -15,7 +17,7 @@ public static function register()
     {
         Lang::macro('uri', function ($uri, $locale = null) {
             // Split the URI into a Collection of segments.
-            $segments = collect(explode('/', trim($uri, '/')));
+            $segments = new Collection(explode('/', trim($uri, '/')));
 
             // Attempt to translate each segment. If there is no translation
             // for a specific segment, then its original value will be used.
@@ -24,7 +26,7 @@ public static function register()
 
                 // If the segment is not a placeholder and the segment
                 // has a translation, then update the segment.
-                if ( ! starts_with($segment, '{') && Lang::has($translationKey, $locale)) {
+                if ( ! Str::startsWith($segment, '{') && Lang::has($translationKey, $locale)) {
                     $segment = Lang::get($translationKey, [], $locale);
                 }
 

src/UrlGenerator.php

@@ -2,6 +2,8 @@
 
 namespace CodeZero\LocalizedRoutes;
 
+use App;
+use Config;
 use Illuminate\Http\Request;
 use Illuminate\Routing\RouteCollection;
 use Illuminate\Routing\UrlGenerator as BaseUrlGenerator;
@@ -45,22 +47,22 @@ public function route($name, $parameters = [], $absolute = true, $locale = null)
         // Cache the current locale so we can change it
         // to automatically resolve any translatable
         // route parameters such as slugs.
-        $currentLocale = app()->getLocale();
+        $currentLocale = App::getLocale();
 
         // Use the specified or current locale
         // as a prefix for the route name.
         $locale = $locale ?: $currentLocale;
 
         // Update the current locale if needed.
         if ($locale !== $currentLocale) {
-            app()->setLocale($locale);
+            App::setLocale($locale);
         }
 
         $url = parent::route("{$locale}.{$name}", $parameters, $absolute);
 
         // Restore the current locale if needed.
         if ($locale !== $currentLocale) {
-            app()->setLocale($currentLocale);
+            App::setLocale($currentLocale);
         }
 
         return $url;
@@ -83,7 +85,7 @@ protected function stripLocaleFromRouteName($name)
             return $name;
         }
 
-        $locales = config('app.locales', []);
+        $locales = Config::get('app.locales', []);
 
         // If the first part of the route name is a valid
         // locale, then remove it from the array.