Merge branch 'feature/api-transformers-5.1' into feature/api-transfor…

…mers
spira · Jun 17, 2015 · b162a3c · b162a3c
2 parents 9ccb526 + 9525d59
commit b162a3c
Show file tree

Hide file tree

Showing 6 changed files with 521 additions and 1,255 deletions.
diff --git a/api/bootstrap/app.php b/api/bootstrap/app.php
@@ -41,13 +41,13 @@
 */
 
 $app->singleton(
-    'Illuminate\Contracts\Debug\ExceptionHandler',
-    'App\Exceptions\Handler'
+    Illuminate\Contracts\Debug\ExceptionHandler::class,
+    App\Exceptions\Handler::class
 );
 
 $app->singleton(
-    'Illuminate\Contracts\Console\Kernel',
-    'App\Console\Kernel'
+    Illuminate\Contracts\Console\Kernel::class,
+    App\Console\Kernel::class
 );
 
 /*
@@ -99,6 +99,8 @@
 |
 */
 
-require __DIR__.'/../app/Http/routes.php';
+$app->group(['namespace' => 'App\Http\Controllers'], function ($app) {
+    require __DIR__.'/../app/Http/routes.php';
+});
 
 return $app;
diff --git a/api/composer.json b/api/composer.json
@@ -5,15 +5,15 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "laravel/lumen-framework": "5.0.*",
+        "laravel/lumen-framework": "5.1.*",
         "vlucas/phpdotenv": "~1.0",
         "bosnadev/database": "^0.11.0",
         "illuminate/mail": "^5.0",
         "jeremeamia/superclosure": "^2.1",
         "pda/pheanstalk": "^3.0",
         "predis/predis": "^1.0",
-        "illuminate/redis": "5.0.*",
-        "league/fractal": "0.12.*"
+        "league/fractal": "0.12.*",
+        "illuminate/redis": "5.1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",