Merge pull request #681 from cachethq/new

Upgraded to laravel 5.1

.env.example

@@ -9,7 +9,7 @@ DB_DATABASE=cachet
 DB_USERNAME=user
 DB_PASSWORD=secret
 
-CACHE_DRIVER=apc
+CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 

app/Http/Controllers/AbstractController.php

@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Cachet\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesCommands;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 abstract class AbstractController extends BaseController
 {
-    use DispatchesCommands, ValidatesRequests;
+    use DispatchesJobs, ValidatesRequests;
 }

app/Http/Controllers/SetupController.php

@@ -32,8 +32,8 @@ class SetupController extends AbstractController
      */
     protected $cacheDrivers = [
         'apc'      => 'APC(u)',
-        // 'file'     => 'File',
+        'file'     => 'File',
-        // 'database' => 'Database',
+        'database' => 'Database',
     ];
 
     /**

bootstrap/autoload.php

@@ -36,8 +36,6 @@ require __DIR__.'/../vendor/autoload.php';
 |
 */
 
-$compiledPath = __DIR__.'/../vendor/compiled.php';
+if (file_exists($compiledPath = __DIR__.'/cache/compiled.php')) {
-
-if (file_exists($compiledPath)) {
     require $compiledPath;
 }

bootstrap/cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

composer.json

@@ -20,27 +20,24 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "ext-apcu": "*",
+        "laravel/framework": "5.1.*",
-        "laravel/framework": "~5.0.32",
         "cachethq/segment": "^2.1",
         "doctrine/dbal": "^2.5",
         "fideloper/proxy": "^3.0",
-        "graham-campbell/binput": "^3.0",
+        "graham-campbell/binput": "^3.1",
-        "graham-campbell/markdown": "^3.0",
+        "graham-campbell/markdown": "^3.1",
-        "graham-campbell/throttle": "^3.0",
+        "graham-campbell/throttle": "^4.0",
-        "graham-campbell/exceptions": "^2.0",
+        "graham-campbell/exceptions": "^3.0",
-        "guzzlehttp/guzzle": "^5.0",
+        "guzzlehttp/guzzle": "^6.0",
-        "jenssegers/date": "^2.0.21",
+        "jenssegers/date": "^3.0",
         "mccool/laravel-auto-presenter": "^3.0",
-        "pragmarx/google2fa": "^0.1",
+        "pragmarx/google2fa": "^0.5",
         "roumen/feed": "^2.9",
         "watson/validating": "^1.0",
         "barryvdh/laravel-cors": "^0.5"
     },
     "require-dev": {
-        "graham-campbell/testbench": "^2.1",
+        "graham-campbell/testbench": "^2.1"
-        "phpunit/phpunit": "^4.4",
-        "mockery/mockery": "^0.9"
     },
     "autoload": {
         "classmap": [

config/app.php

@@ -124,6 +124,7 @@ return [
          */
         'Illuminate\Foundation\Providers\ArtisanServiceProvider',
         'Illuminate\Auth\AuthServiceProvider',
+        'Illuminate\Broadcasting\BroadcastServiceProvider',
         'Illuminate\Bus\BusServiceProvider',
         'Illuminate\Cache\CacheServiceProvider',
         'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',

config/broadcasting.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Cachet HQ <support@cachethq.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Broadcaster
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default broadcaster that will be used by the
+    | framework when an event needs to be broadcast. You may set this to
+    | any of the connections defined in the "connections" array below.
+    |
+    */
+
+    'default' => env('BROADCAST_DRIVER', 'pusher'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Broadcast Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define all of the broadcast connections that will be used
+    | to broadcast events to other systems or over websockets. Samples of
+    | each available type of connection are provided inside this array.
+    |
+    */
+
+    'connections' => [
+
+        'pusher' => [
+            'driver' => 'pusher',
+            'key'    => env('PUSHER_APP_KEY'),
+            'secret' => env('PUSHER_APP_SECRET'),
+            'app_id' => env('PUSHER_APP_ID'),
+        ],
+
+        'redis' => [
+            'driver'     => 'redis',
+            'connection' => 'default',
+        ],
+
+        'log' => [
+            'driver' => 'log',
+        ],
+
+    ],
+
+];

config/filesystems.php

@@ -20,7 +20,7 @@ return [
     | by the framework. A "local" driver, as well as a variety of cloud
     | based drivers are available for your choosing. Just store away!
     |
-    | Supported: "local", "s3", "rackspace"
+    | Supported: "local", "ftp", "s3", "rackspace"
     |
     */
 
@@ -57,6 +57,13 @@ return [
             'root'   => storage_path().'/app',
         ],
 
+        'ftp' => [
+            'driver'   => 'ftp',
+            'host'     => 'ftp.example.com',
+            'username' => 'your-username',
+            'password' => 'your-password',
+        ],
+
         's3' => [
             'driver' => 's3',
             'key'    => 'your-key',

config/mail.php

@@ -20,7 +20,7 @@ return [
     | sending of e-mail. You may specify which one you're using throughout
     | your application here. By default, Laravel is setup for SMTP mail.
     |
-    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log"
+    | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log"
     |
     */
 

config/queue.php

@@ -76,9 +76,10 @@ return [
         ],
 
         'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
-            'queue'  => 'default',
+            'connection' => 'default',
-            'expire' => 60,
+            'queue'      => 'default',
+            'expire'     => 86400,
         ],
 
     ],

docker/php-fpm-pool.conf

@@ -18,7 +18,7 @@ env[DB_HOST] = $DB_HOST
 env[DB_DATABASE] = $DB_DATABASE
 env[DB_USERNAME] = $DB_USERNAME
 env[DB_PASSWORD] = $DB_PASSWORD
-env[CACHE_DRIVER] = apc
+env[CACHE_DRIVER] = file
 
 
 [global]