Merge pull request #77 from ARCANEDEV/update-laravel_5_4

Updating the package to Support Laravel 5.4

.gitattributes

@@ -1,8 +1,12 @@
+* text=auto
+
+/.github          export-ignore
 /_docs            export-ignore
 /tests            export-ignore
-/.editorconfig    export-ignore
-/.gitattributes   export-ignore
-/.gitignore       export-ignore
-/.scrutinizer.yml export-ignore
-/.travis.yml      export-ignore
-/phpunit.xml      export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+.gitignore        export-ignore
+.scrutinizer.yml  export-ignore
+.travis.yml       export-ignore
+phpunit.xml       export-ignore
+CONTRIBUTING.md   export-ignore

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+- Localization Version: #.#.#
+- Laravel Version: #.#.#
+- PHP Version: #.#.#
+
+### Description:
+
+### Steps To Reproduce:

.scrutinizer.yml

@@ -21,8 +21,8 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 1800
-        runs: 8
+        timeout: 600
+        runs: 3
     php_code_sniffer:
         enabled: true
         config:

.travis.yml

@@ -13,14 +13,11 @@ matrix:
     - php: nightly
 
 env:
-  - TESTBENCH_VERSION=3.0.*
-  - TESTBENCH_VERSION=3.1.*
-  - TESTBENCH_VERSION=3.2.*
-  - TESTBENCH_VERSION=3.3.*
+  - TESTBENCH_VERSION=3.4.*
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench:${TESTBENCH_VERSION}"
+  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench-browser-kit:${TESTBENCH_VERSION}" "orchestra/database:${TESTBENCH_VERSION}"
 
 script:
   - composer validate

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 | ARCANEDEV <[email protected]> - Localization
+Copyright (c) 2015-2017 | ARCANEDEV <[email protected]> - Localization
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -21,7 +21,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/Localization/
 ### Features
 
   * Easy setup & configuration.
-  * Laravel `5.0 | 5.1 | 5.2 | 5.3` are supported.
+  * Laravel `5.0 | 5.1 | 5.2 | 5.3 | 5.4` are supported.
   * SEO-Friendly (Search engine optimization).
   * New extended Router to manage your localized routes.
   * Locales selector menu (Publishable & Customizable).

composer.json

@@ -14,7 +14,7 @@
     "type":    "library",
     "license": "MIT",
     "require": {
-        "php" :              ">=5.6.4",
+        "php":               ">=5.6.4",
         "arcanedev/support": "~3.20"
     },
     "require-dev": {
@@ -33,7 +33,7 @@
         }
     },
     "scripts": {
-        "testbench": "composer require --dev \"orchestra/testbench=~3.0\""
+        "testbench": "composer require --dev \"orchestra/testbench-browser-kit=~3.4\" \"orchestra/database=~3.4\""
     },
     "suggest": {
         "ext-intl": "Use Intl extension for 'Locale' class (an identifier used to get language)."
@@ -42,5 +42,7 @@
         "branch-alias": {
             "dev-master": "1.0.x-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable" : true
 }

phpunit.xml

@@ -20,6 +20,9 @@
             <directory suffix=".php">./src/</directory>
         </whitelist>
     </filter>
+    <php>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    </php>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
         <log type="coverage-text" target="build/logs/coverage.txt"/>

src/Bases/Middleware.php

@@ -13,6 +13,17 @@
  */
 abstract class Middleware extends BaseMiddleware
 {
+    /* ------------------------------------------------------------------------------------------------
+     |  Properties
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * The URIs that should not be localized.
+     *
+     * @var array
+     */
+    protected $except = [];
+
     /* ------------------------------------------------------------------------------------------------
      |  Getters & Setters
      | ------------------------------------------------------------------------------------------------
@@ -75,6 +86,26 @@ protected function isDefaultLocaleHidden($locale)
         return $this->getDefaultLocale() === $locale && $this->hideDefaultLocaleInURL();
     }
 
+    /**
+     * Determine if the request has a URI that should not be localized.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     *
+     * @return bool
+     */
+    protected function shouldIgnore($request)
+    {
+        foreach ($this->except as $except) {
+            if ($except !== '/')
+                $except = trim($except, '/');
+
+            if ($request->is($except))
+                return true;
+        }
+
+        return false;
+    }
+
     /* ------------------------------------------------------------------------------------------------
      |  Other Functions
      | ------------------------------------------------------------------------------------------------

src/Middleware/LocaleCookieRedirect.php

@@ -28,6 +28,10 @@ class LocaleCookieRedirect extends Middleware
      */
     public function handle(Request $request, Closure $next)
     {
+        // If the request URL is ignored from localization.
+        if ($this->shouldIgnore($request))
+            return $next($request);
+
         $segment = $request->segment(1, null);
         $locale  = $request->cookie('locale', null);
 

src/Middleware/LocaleSessionRedirect.php

@@ -28,6 +28,10 @@ class LocaleSessionRedirect extends Middleware
      */
     public function handle(Request $request, Closure $next)
     {
+        // If the request URL is ignored from localization.
+        if ($this->shouldIgnore($request))
+            return $next($request);
+
         $segment = $request->segment(1, null);
         $locale  = session('locale', null);
 

src/Middleware/LocalizationRedirect.php

@@ -28,6 +28,10 @@ class LocalizationRedirect extends Middleware
      */
     public function handle(Request $request, Closure $next)
     {
+        // If the request URL is ignored from localization.
+        if ($this->shouldIgnore($request))
+            return $next($request);
+
         if ($redirectUrl = $this->getRedirectionUrl($request)) {
             // Save any flashed data for redirect
             session()->reflash();

src/Middleware/LocalizationRoutes.php

@@ -26,6 +26,10 @@ class LocalizationRoutes extends Middleware
      */
     public function handle(Request $request, Closure $next)
     {
+        // If the request URL is ignored from localization.
+        if ($this->shouldIgnore($request))
+            return $next($request);
+
         localization()->setRouteNameFromRequest($request);
 
         return $next($request);

src/Middleware/TranslationRedirect.php

@@ -33,6 +33,10 @@ class TranslationRedirect extends Middleware
      */
     public function handle(Request $request, Closure $next)
     {
+        // If the request URL is ignored from localization.
+        if ($this->shouldIgnore($request))
+            return $next($request);
+
         $translatedUrl = $this->getTranslatedUrl($request);
 
         if ( ! is_null($translatedUrl)) {

src/Providers/RoutingServiceProvider.php

@@ -82,7 +82,7 @@ private function registerMiddlewares()
      */
     private function registerMiddleware(Router $router, $name, $class)
     {
-        $router->middleware($name, $class);
+        $router->aliasMiddleware($name, $class);
 
         if ($this->getMiddleware($name)) {
             $this->middleware[] = $name;

src/Routing/Router.php

@@ -27,22 +27,6 @@ protected function getActiveMiddlewares()
         ));
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Basic Route Functions
-     | ------------------------------------------------------------------------------------------------
-     */
-    /**
-     * Route a resource to a controller.
-     *
-     * @param  string  $name
-     * @param  string  $controller
-     * @param  array   $options
-     */
-    public function resource($name, $controller, array $options = [])
-    {
-        (new ResourceRegistrar($this))->register($name, $controller, $options);
-    }
-
     /* ------------------------------------------------------------------------------------------------
      |  Route Functions
      | ------------------------------------------------------------------------------------------------

src/Utilities/Negotiator.php

@@ -174,6 +174,13 @@ private function inSupportedLocales(array $matches)
         foreach (array_keys($matches) as $locale) {
             if ($this->isSupported($locale))
                 return $locale;
+
+            // Search for acceptable locale by 'regional' => 'fr_FR' match.
+            foreach ($this->supportedLocales as $key => $entity) {
+                /** @var \Arcanedev\Localization\Entities\Locale $entity */
+                if ($entity->regional() == $locale)
+                    return $key;
+            }
         }
 
         return null;

src/Utilities/RouteTranslator.php

@@ -241,7 +241,7 @@ private function translate($key, $locale = null)
             $locale = $this->translator->getLocale();
         }
 
-        $translation = $this->translator->trans($key, [], '', $locale);
+        $translation = $this->translator->trans($key, [], $locale);
 
         // @codeCoverageIgnoreStart
         if ( ! is_string($translation)) {

src/Utilities/Url.php

@@ -110,7 +110,7 @@ private static function extractAttributesFromRoutes($url, $routes)
                 continue;
             }
 
-            $match = self::hasAttributesFromUriPath($url, $route->getUri(), $attributes);
+            $match = self::hasAttributesFromUriPath($url, $route->uri(), $attributes);
 
             if ($match)
                 break;

tests/Stubs/Http/Kernel.php

@@ -21,6 +21,21 @@ class Kernel extends HttpKernel
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middlewareGroups = [
+        'web' => [
+            Middleware\EncryptCookies::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \Orchestra\Testbench\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
+    ];
+
     /**
      * The application's route middleware.
      *

tests/Stubs/Http/Middleware/EncryptCookies.php

@@ -0,0 +1,21 @@
+<?php namespace Arcanedev\Localization\Tests\Stubs\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
+
+/**
+ * Class     EncryptCookies
+ *
+ * @package  Arcanedev\Localization\Tests\Stubs\Http\Middleware
+ * @author   ARCANEDEV <[email protected]>
+ */
+class EncryptCookies extends BaseEncrypter
+{
+    /**
+     * The names of the cookies that should not be encrypted.
+     *
+     * @var array
+     */
+    protected $except = [
+        'locale'
+    ];
+}