Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.

Commit 6658e87

Browse files
harris21harris21
committed
Merge branch '6.0'
2 parents f8b05d5 + c11cea0 commit 6658e87

File tree

17 files changed

+102
-6410
lines changed

17 files changed

+102
-6410
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.yml]
14+
[*.{yml,yaml}]
1515
indent_size = 2

‎app/Http/Kernel.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ class Kernel extends HttpKernel
7272
\Illuminate\Session\Middleware\StartSession::class,
7373
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
7474
\Framework\Http\Middleware\Authenticate::class,
75+
\Illuminate\Routing\Middleware\ThrottleRequests::class,
7576
\Illuminate\Session\Middleware\AuthenticateSession::class,
7677
\Illuminate\Routing\Middleware\SubstituteBindings::class,
7778
\Illuminate\Auth\Middleware\Authorize::class,

‎composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": ">=7.1.3",
9-
"laravel/framework": "5.8.*",
10-
"lucid-arch/laravel-foundation": "5.8.*",
11-
"laravel/tinker": "^1.0",
12-
"fideloper/proxy": "~4.0"
8+
"php": "^7.2",
9+
"fideloper/proxy": "~4.0",
10+
"laravel/framework": "^6.2",
11+
"laravel/helpers": "^1.1",
12+
"laravel/tinker": "^2.0",
13+
"lucid-arch/laravel-foundation": "^6.0"
1314
},
1415
"require-dev": {
1516
"fzaninotto/faker": "^1.4",
1617
"mockery/mockery": "^1.0",
1718
"nunomaduro/collision": "^3.0",
18-
"phpunit/phpunit": "^7.5",
19+
"phpunit/phpunit": "^8.0",
1920
"symfony/css-selector": "~4.0",
2021
"symfony/dom-crawler": "~4.0",
21-
"lucid-arch/laravel-console": "5.8.*",
22-
"beyondcode/laravel-dump-server": "^1.0",
23-
"filp/whoops": "^2.0"
22+
"facade/ignition": "^1.4",
23+
"lucid-arch/laravel-console": "^6.0"
2424
},
2525
"autoload": {
2626
"classmap": [

‎config/logging.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
use Monolog\Handler\NullHandler;
34
use Monolog\Handler\StreamHandler;
45
use Monolog\Handler\SyslogUdpHandler;
56

@@ -87,6 +88,11 @@
8788
'driver' => 'errorlog',
8889
'level' => 'debug',
8990
],
91+
92+
'null' => [
93+
'driver' => 'monolog',
94+
'handler' => NullHandler::class,
95+
],
9096
],
9197

9298
];

‎config/mail.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| sending of e-mail. You may specify which one you're using throughout
1212
| your application here. By default, Laravel is setup for SMTP mail.
1313
|
14-
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
15-
| "sparkpost", "log", "array"
14+
| Supported: "smtp", "sendmail", "mailgun", "ses",
15+
| "log", "array"
1616
|
1717
*/
1818

‎config/queue.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
*/
8181

8282
'failed' => [
83+
'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
8384
'database' => env('DB_CONNECTION', 'mysql'),
8485
'table' => 'failed_jobs',
8586
],

‎config/services.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|--------------------------------------------------------------------------
99
|
1010
| This file is for storing the credentials for third party services such
11-
| as Stripe, Mailgun, SparkPost and others. This file provides a sane
11+
| as Stripe, Mailgun and others. This file provides a sane
1212
| default location for this type of information, allowing packages
1313
| to have a conventional place to find your various credentials.
1414
|
@@ -30,10 +30,6 @@
3030
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
3131
],
3232

33-
'sparkpost' => [
34-
'secret' => env('SPARKPOST_SECRET'),
35-
],
36-
3733
'stripe' => [
3834
'model' => Framework\User::class,
3935
'key' => env('STRIPE_KEY'),

‎database/migrations/2019_09_28_130641_create_failed_jobs_table.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
use Illuminate\Support\Facades\Schema;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Database\Migrations\Migration;
6+
7+
class CreateFailedJobsTable extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*
12+
* @return void
13+
*/
14+
public function up()
15+
{
16+
Schema::create('failed_jobs', function (Blueprint $table) {
17+
$table->bigIncrements('id');
18+
$table->text('connection');
19+
$table->text('queue');
20+
$table->longText('payload');
21+
$table->longText('exception');
22+
$table->timestamp('failed_at')->useCurrent();
23+
});
24+
}
25+
26+
/**
27+
* Reverse the migrations.
28+
*
29+
* @return void
30+
*/
31+
public function down()
32+
{
33+
Schema::dropIfExists('failed_jobs');
34+
}
35+
}

‎package.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
{
2-
"private": true,
3-
"scripts": {
4-
"dev": "npm run development",
5-
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
6-
"watch": "npm run development -- --watch",
7-
"watch-poll": "npm run watch -- --watch-poll",
8-
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
9-
"prod": "npm run production",
10-
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
11-
},
12-
"devDependencies": {
13-
"axios": "^0.18",
14-
"bootstrap": "^4.0.0",
15-
"popper.js": "^1.12",
16-
"cross-env": "^5.1",
17-
"jquery": "^3.2",
18-
"laravel-mix": "^2.0",
19-
"lodash": "^4.17.13",
20-
"vue": "^2.5.17"
21-
}
2+
"private": true,
3+
"scripts": {
4+
"dev": "npm run development",
5+
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
6+
"watch": "npm run development -- --watch",
7+
"watch-poll": "npm run watch -- --watch-poll",
8+
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
9+
"prod": "npm run production",
10+
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
11+
},
12+
"devDependencies": {
13+
"axios": "^0.19",
14+
"cross-env": "^5.1",
15+
"laravel-mix": "^4.0.7",
16+
"lodash": "^4.17.13",
17+
"resolve-url-loader": "^2.3.1",
18+
"sass": "^1.15.2",
19+
"sass-loader": "^7.1.0"
20+
}
2221
}

‎phpunit.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
4+
backupGlobals="false"
35
backupStaticAttributes="false"
46
bootstrap="bootstrap/autoload.php"
57
colors="true"

0 commit comments

Comments
 (0)