jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Pull in latest laravel/laravel changes

Browse source
This commit is contained in:
Jonny Barnes 2017-03-27 19:10:51 +01:00
parent 997ade3c34
commit f2d8a5091d
8 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -22,7 +22,7 @@ REDIS_PASSWORD=null
REDIS_PORT=6379 REDIS_PORT=6379
MAIL_DRIVER=smtp MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525 MAIL_PORT=2525
MAIL_USERNAME=null MAIL_USERNAME=null
MAIL_PASSWORD=null MAIL_PASSWORD=null

1
.gitattributes vendored
View file

@ -1,3 +1,4 @@
* text=auto * text=auto
*.css linguist-vendored *.css linguist-vendored
*.scss linguist-vendored *.scss linguist-vendored
*.js linguist-vendored

2
app/Providers/EventServiceProvider.php
View file

@ -13,7 +13,7 @@ class EventServiceProvider extends ServiceProvider
* @var array * @var array
*/ */
protected $listen = [ protected $listen = [
'App\Events\SomeEvent' => [ 'App\Events\Event' => [
'App\Listeners\EventListener', 'App\Listeners\EventListener',
], ],
]; ];

3
composer.json
View file

@ -67,6 +67,7 @@
}, },
"config": { "config": {
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true "sort-packages": true,
"optimize-autoloader": true
} }
} }

14
composer.lock generated
View file

@ -2658,16 +2658,16 @@
}, },
{ {
"name": "ramsey/uuid", "name": "ramsey/uuid",
"version": "3.6.0", "version": "3.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ramsey/uuid.git", "url": "https://github.com/ramsey/uuid.git",
"reference": "0b7bdfb180e72c8d76e75a649ced67e392201458" "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/0b7bdfb180e72c8d76e75a649ced67e392201458", "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"reference": "0b7bdfb180e72c8d76e75a649ced67e392201458", "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2679,9 +2679,9 @@
}, },
"require-dev": { "require-dev": {
"apigen/apigen": "^4.1", "apigen/apigen": "^4.1",
"codeception/aspect-mock": "1.0.0", "codeception/aspect-mock": "^1.0 | ^2.0",
"doctrine/annotations": "~1.2.0", "doctrine/annotations": "~1.2.0",
"goaop/framework": "1.0.0-alpha.2", "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
"ircmaxell/random-lib": "^1.1", "ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0", "jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.4", "mockery/mockery": "^0.9.4",
@ -2736,7 +2736,7 @@
"identifier", "identifier",
"uuid" "uuid"
], ],
"time": "2017-03-18T15:38:09+00:00" "time": "2017-03-26T20:37:53+00:00"
}, },
{ {
"name": "sensiolabs/security-checker", "name": "sensiolabs/security-checker",

5
config/database.php
View file

@ -46,8 +46,9 @@ return [
'database' => env('DB_DATABASE', 'forge'), 'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'), 'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'unix_socket' => env('DB_SOCKET', ''),
'collation' => 'utf8_unicode_ci', 'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => true, 'strict' => true,
'engine' => null, 'engine' => null,

2
config/view.php
View file

@ -14,7 +14,7 @@ return [
*/ */
'paths' => [ 'paths' => [
realpath(base_path('resources/views')), resource_path('views'),
], ],
/* /*

2
storage/framework/testing/.gitignore vendored Normal file
View file

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