Merge pull request #11 from wells/v1.1.5-dev

v1.1.5 dev

.babelrc

@@ -0,0 +1,8 @@
+{
+    "presets": [
+        ["es2015", { "modules": false }],
+    ],
+    "plugins": [
+        "transform-object-rest-spread"
+    ]
+}

.env.example

@@ -26,3 +26,7 @@ MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=

.gitignore

@@ -1,8 +1,16 @@
-/vendor
 /node_modules
-Homestead.yaml
+/public/storage
+/public/hot
+/storage/*.key
+/vendor
+/.idea
 Homestead.json
+Homestead.yaml
 .env
 .DS_Store
 /public/downloads/episodes
 /public/downloads/movies
+/public/css/apps.css
+/public/js/app.js
+/public/js/vendor.js
+/public/js/manifest.js

app/Http/Kernel.php

@@ -15,6 +15,9 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        \App\Http\Middleware\TrimStrings::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \Clockwork\Support\Laravel\ClockworkMiddleware::class,
     ];
 
@@ -28,6 +31,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
+            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Http/Middleware/TrimStrings.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+
+class TrimStrings extends BaseTrimmer
+{
+    /**
+     * The names of the attributes that should not be trimmed.
+     *
+     * @var array
+     */
+    protected $except = [
+        'password',
+        'password_confirmation',
+    ];
+}

app/Providers/BroadcastServiceProvider.php

@@ -16,11 +16,6 @@ public function boot()
     {
         Broadcast::routes();
 
-        /*
-         * Authenticate the user's personal channel...
-         */
-        Broadcast::channel('App.User.*', function ($user, $userId) {
-            return (int) $user->id === (int) $userId;
-        });
+        require base_path('routes/channels.php');
     }
 }

app/Providers/RouteServiceProvider.php

@@ -51,12 +51,9 @@ public function map()
      */
     protected function mapWebRoutes()
     {
-        Route::group([
-            'middleware' => 'web',
-            'namespace' => $this->namespace,
-        ], function ($router) {
-            require base_path('routes/web.php');
-        });
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -68,12 +65,9 @@ protected function mapWebRoutes()
      */
     protected function mapApiRoutes()
     {
-        Route::group([
-            'middleware' => 'api',
-            'namespace' => $this->namespace,
-            'prefix' => 'api',
-        ], function ($router) {
-            require base_path('routes/api.php');
-        });
+        Route::prefix('api')
+             ->middleware('api')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/api.php'));
     }
 }

bootstrap/autoload.php

@@ -15,20 +15,3 @@
 */
 
 require __DIR__.'/../vendor/autoload.php';
-
-/*
-|--------------------------------------------------------------------------
-| Include The Compiled Class File
-|--------------------------------------------------------------------------
-|
-| To dramatically increase your application's performance, you may use a
-| compiled class file which contains all of the classes commonly used
-| by a request. The Artisan "optimize" is used to create this file.
-|
-*/
-
-$compiledPath = __DIR__.'/cache/compiled.php';
-
-if (file_exists($compiledPath)) {
-    require $compiledPath;
-}

composer.json

@@ -12,23 +12,21 @@
     ],
     "require": {
         "php": ">=5.6.4",
-        "laravel/framework": "5.3.*",
-        "league/glide-laravel": "^1.0",
+        "guzzlehttp/guzzle": "~5.0",
+        "laravel/framework": "5.4.*",
+        "laravel/tinker": "^1.0",
         "league/fractal": "^0.14.0",
-        "predis/predis": "~1.0",
+        "league/glide-laravel": "^1.0",
         "php-tmdb/laravel": "~1.0",
-        "guzzlehttp/guzzle": "~5.0",
+        "predis/predis": "~1.0",
         "ramsey/uuid": "^3.2"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.0",
-        "symfony/css-selector": "3.1.*",
-        "symfony/dom-crawler": "3.1.*",
-        "mpociot/laravel-test-factory-helper": "^0.3.0",
-        "itsgoingd/clockwork": "~1.11.1",
-        "fitztrev/query-tracer": "^1.0"
+        "phpunit/phpunit": "~5.7",
+        "mpociot/laravel-test-factory-helper": "^0.4.0",
+        "itsgoingd/clockwork": "~1.13.1"
     },
     "autoload": {
         "classmap": [
@@ -40,9 +38,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/TestCase.php"
-        ]
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     },
     "scripts": {
         "post-root-package-install": [
@@ -61,6 +59,7 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true
     }
 }