mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #681 from cachethq/new

Browse Source 
Upgraded to laravel 5.1
This commit is contained in:
Graham Campbell 2015-05-29 18:19:56 +01:00
commit 4c28335ffe
13 changed files with 534 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -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

4
app/Http/Controllers/AbstractController.php
View File

@ -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;
}

4
app/Http/Controllers/SetupController.php
View File

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

4
bootstrap/autoload.php
View File

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

2
bootstrap/cache/.gitignore vendored Normal file
View File

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

21
composer.json
View File

@ -20,27 +20,24 @@
],
"require": {
"php": ">=5.5.9",
"ext-apcu": "*",
"laravel/framework": "~5.0.32",
"laravel/framework": "5.1.*",
"cachethq/segment": "^2.1",
"doctrine/dbal": "^2.5",
"fideloper/proxy": "^3.0",
"graham-campbell/binput": "^3.0",
"graham-campbell/markdown": "^3.0",
"graham-campbell/throttle": "^3.0",
"graham-campbell/exceptions": "^2.0",
"guzzlehttp/guzzle": "^5.0",
"jenssegers/date": "^2.0.21",
"graham-campbell/binput": "^3.1",
"graham-campbell/markdown": "^3.1",
"graham-campbell/throttle": "^4.0",
"graham-campbell/exceptions": "^3.0",
"guzzlehttp/guzzle": "^6.0",
"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",
"phpunit/phpunit": "^4.4",
"mockery/mockery": "^0.9"
"graham-campbell/testbench": "^2.1"
},
"autoload": {
"classmap": [

753
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

1
config/app.php
View File

@ -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',

58
config/broadcasting.php Normal file
View File

@ -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',
],
],
];

9
config/filesystems.php
View File

@ -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',

2
config/mail.php
View File

@ -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"
|
*/

7
config/queue.php
View File

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

2
docker/php-fpm-pool.conf
View File

@ -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]