Merge pull request #27 from AudithSoftworks/upgrades

Middleware fix
AudithSoftworks · Feb 27, 2016 · b7519aa · b7519aa
2 parents ba7cad8 + ee6d242
commit b7519aa
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,10 +36,11 @@ install:
   - case $PHP_VERSION in '5.5') export DOCKER_COMPOSE_FILE='./docker-compose-php55.yml' ;; '5.6') export DOCKER_COMPOSE_FILE='./docker-compose-php56.yml' ;; 'hhvm') export DOCKER_COMPOSE_FILE='./docker-compose-hhvm.yml' ;; esac
     && docker-compose -f $DOCKER_COMPOSE_FILE pull
   - case $PHP_VERSION in '5.5') export DOCKER_COMPOSE_FILE='./docker-compose-php55.yml' ;; '5.6') export DOCKER_COMPOSE_FILE='./docker-compose-php56.yml' ;; 'hhvm') export DOCKER_COMPOSE_FILE='./docker-compose-hhvm.yml' ;; esac
-    && docker-compose -f $DOCKER_COMPOSE_FILE up -d && docker-compose ps
+    && docker-compose -f $DOCKER_COMPOSE_FILE up -d
 
   # Create database for MySQL and PgSQL
   - sleep 15;
+    docker-compose ps;
     mysql -h $(docker inspect -f '{{ .NetworkSettings.IPAddress }}' basis_mysql56_1) -u root -e "CREATE DATABASE IF NOT EXISTS basis;";
     if [[ $PHP_VERSION != 'hhvm' ]]; then psql -h $(docker inspect -f '{{ .NetworkSettings.IPAddress }}' basis_postgres94_1) -U postgres -c "CREATE DATABASE basis;"; fi;
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -30,7 +30,7 @@ class Kernel extends HttpKernel
             Middleware\VerifyCsrfToken::class
         ],
         'api' => [
-            'throttle:60,1',
+            'throttle:60,1'
         ],
     ];
 

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
@@ -14,7 +14,10 @@ class Localization
      */
     public function handle(Request $request, \Closure $next)
     {
-        app('translator')->setLocale($request->segment(1));
+        if (empty($locale = $request->segment(1)) || !array_key_exists($locale, config('app.locales'))) {
+            $locale = config('app.fallback_locale');
+        }
+        app('translator')->setLocale($locale);
 
         return $next($request);
     }

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -38,21 +38,22 @@ public function boot(Router $router)
      */
     public function map(Router $router)
     {
+        $defaultLocale = config('app.locale');
+        $namespace = $this->namespace;
+        $middleware = 'web';
+
         //-----------------------------------------------------------------------
         // Non-localized, generic routes (such as those for admin panel etc).
         //-----------------------------------------------------------------------
 
-        $router->group(['namespace' => $this->namespace], function (Router $router) {
+        $router->group(compact('namespace', 'middleware'), function (Router $router) {
             $router->get('/oauth/{provider}', 'Users\AuthController@getOAuth');
         });
 
         //-----------------------------------------------------------------------------------------------------
         // Register localized routes with locale-prefices (in case of default locale, no prefix is attached).
         //-----------------------------------------------------------------------------------------------------
 
-        $defaultLocale = config('app.locale');
-        $namespace = $this->namespace;
-        $middleware = 'web';
         foreach (config('app.locales') as $prefix => $localeName) {
             app('translator')->setLocale($prefix);
             // Skip default locale for now.
@@ -71,7 +72,7 @@ public function map(Router $router)
         //------------------------------------------------
 
         app('translator')->setLocale($defaultLocale);
-        $router->group(compact('namespace'), function (Router $router) use ($defaultLocale) {
+        $router->group(compact('namespace', 'middleware'), function (Router $router) use ($defaultLocale) {
             $this->localizedRoutes($router, $defaultLocale);
         });
     }

diff --git a/circle.yml b/circle.yml
@@ -43,10 +43,11 @@ dependencies:
     - case `expr $CIRCLE_NODE_INDEX % $CIRCLE_NODE_TOTAL` in 0) export DOCKER_COMPOSE_FILE='./docker-compose-php56.yml' ;; 1) export DOCKER_COMPOSE_FILE='./docker-compose-hhvm.yml' ;; esac
       && docker-compose -f $DOCKER_COMPOSE_FILE pull
     - case `expr $CIRCLE_NODE_INDEX % $CIRCLE_NODE_TOTAL` in 0) export DOCKER_COMPOSE_FILE='./docker-compose-php56.yml' ;; 1) export DOCKER_COMPOSE_FILE='./docker-compose-hhvm.yml' ;; esac
-      && docker-compose -f $DOCKER_COMPOSE_FILE up -d && docker-compose ps
+      && docker-compose -f $DOCKER_COMPOSE_FILE up -d
 
     # Create database for MySQL and PgSQL
     - sleep 5;
+      docker-compose ps;
       mysql -h $(docker inspect -f '{{ .NetworkSettings.IPAddress }}' basis_mysql56_1) -u root -e "CREATE DATABASE IF NOT EXISTS basis;";
       if [[ `expr $CIRCLE_NODE_INDEX % $CIRCLE_NODE_TOTAL` != 1 ]]; then psql -h $(docker inspect -f '{{ .NetworkSettings.IPAddress }}' basis_postgres94_1) -U postgres -c "CREATE DATABASE basis;"; fi;
 

diff --git a/public/index.php b/public/index.php
@@ -4,6 +4,7 @@
 
 $app = require_once __DIR__.'/../bootstrap/app.php';
 
+/** @var \Illuminate\Contracts\Http\Kernel $kernel */
 $kernel = $app->make(\Illuminate\Contracts\Http\Kernel::class);
 $response = $kernel->handle(
     $request = Illuminate\Http\Request::capture()

diff --git a/storage/build/scripts/dev-env/build.sh b/storage/build/scripts/dev-env/build.sh
@@ -50,4 +50,7 @@ docker exec basis_php56_1 /bin/bash -c "
     compass compile;
     gulp;
     composer selfupdate && composer update --prefer-source --no-interaction;
+
+    ./artisan key:generate;
+    ./artisan migrate;
 ";