pepepper
/
tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Laravel 5.8

This commit is contained in:
shibafu 2020-05-23 22:17:07 +09:00
parent cb4dacdaf6
commit a48fe596e1
36 changed files with 189 additions and 680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.example
View File

@ -34,6 +34,11 @@ MAIL_ENCRYPTION=tls
MAIL_FROM_ADDRESS=support@mail.shikorism.net
MAIL_FROM_NAME=Tissue
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
SPARKPOST_SECRET=
PUSHER_APP_ID=

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ Homestead.yaml
npm-debug.log
yarn-error.log
.env
.env.backup
.phpunit.result.cache
*.iml
.php_cs

2
app/Http/Controllers/Auth/RegisterController.php
View File

@ -51,7 +51,7 @@ class RegisterController extends Controller
$rules = [
'name' => 'required|string|regex:/^[a-zA-Z0-9_-]+$/u|max:15|unique:users|unique:deactivated_users',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed'
'password' => 'required|string|min:8|confirmed'
];
// reCAPTCHAのキーが設定されている場合、判定を有効化

2
app/Http/Kernel.php
View File

@ -14,11 +14,11 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
];
/**

2
app/Http/Middleware/TrustProxies.php
View File

@ -10,7 +10,7 @@ class TrustProxies extends Middleware
/**
* The trusted proxies for this application.
*
* @var array
* @var array|string
*/
protected $proxies = '**';

6
composer.json
View File

@ -17,7 +17,7 @@
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "^6.3",
"jakeasmith/http_build_url": "^1.0",
"laravel/framework": "5.7.*",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0",
"league/csv": "^9.5",
"misd/linkify": "^1.1",
@ -34,8 +34,8 @@
"friendsofphp/php-cs-fixer": "^2.14",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^7.5",
"symfony/thanks": "^1.0"
},
"autoload": {

734
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "fb41abd14b58e0380b2366dd85b1b53f",
"content-hash": "8e40990be77020dd403c97219cfe111d",
"packages": [
{
"name": "anhskohbo/no-captcha",
@ -1015,92 +1015,47 @@
"abandoned": "php-parallel-lint/php-console-highlighter",
"time": "2018-09-29T18:48:56+00:00"
},
{
"name": "kylekatarnls/update-helper",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/kylekatarnls/update-helper.git",
"reference": "429be50660ed8a196e0798e5939760f168ec8ce9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/429be50660ed8a196e0798e5939760f168ec8ce9",
"reference": "429be50660ed8a196e0798e5939760f168ec8ce9",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.1.0 || ^2.0.0",
"php": ">=5.3.0"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master",
"composer/composer": "2.0.x-dev || ^2.0.0-dev",
"phpunit/phpunit": ">=4.8.35 <6.0"
},
"type": "composer-plugin",
"extra": {
"class": "UpdateHelper\\ComposerPlugin"
},
"autoload": {
"psr-0": {
"UpdateHelper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kyle",
"email": "kylekatarnls@gmail.com"
}
],
"description": "Update helper",
"time": "2020-04-07T20:44:10+00:00"
},
{
"name": "laravel/framework",
"version": "v5.7.29",
"version": "v5.8.38",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2555bf6ef6e6739e5f49f4a5d40f6264c57abd56"
"reference": "78eb4dabcc03e189620c16f436358d41d31ae11f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2555bf6ef6e6739e5f49f4a5d40f6264c57abd56",
"reference": "2555bf6ef6e6739e5f49f4a5d40f6264c57abd56",
"url": "https://api.github.com/repos/laravel/framework/zipball/78eb4dabcc03e189620c16f436358d41d31ae11f",
"reference": "78eb4dabcc03e189620c16f436358d41d31ae11f",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.1",
"dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.0",
"erusev/parsedown": "^1.7",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"laravel/nexmo-notification-channel": "^1.0",
"laravel/slack-notification-channel": "^1.0",
"league/flysystem": "^1.0.8",
"monolog/monolog": "^1.12",
"nesbot/carbon": "^1.26.3",
"nesbot/carbon": "^1.26.3 || ^2.0",
"opis/closure": "^3.1",
"php": "^7.1.3",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7",
"swiftmailer/swiftmailer": "^6.0",
"symfony/console": "^4.1",
"symfony/debug": "^4.1",
"symfony/finder": "^4.1",
"symfony/http-foundation": "^4.1",
"symfony/http-kernel": "^4.1",
"symfony/process": "^4.1",
"symfony/routing": "^4.1",
"symfony/var-dumper": "^4.1",
"symfony/console": "^4.2",
"symfony/debug": "^4.2",
"symfony/finder": "^4.2",
"symfony/http-foundation": "^4.2",
"symfony/http-kernel": "^4.2",
"symfony/process": "^4.2",
"symfony/routing": "^4.2",
"symfony/var-dumper": "^4.2",
"tijsverkoyen/css-to-inline-styles": "^2.2.1",
"vlucas/phpdotenv": "^2.2"
"vlucas/phpdotenv": "^3.3"
},
"conflict": {
"tightenco/collect": "<5.5.33"
@ -1143,17 +1098,18 @@
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.0",
"moontoast/math": "^1.1",
"orchestra/testbench-core": "3.7.*",
"pda/pheanstalk": "^3.0|^4.0",
"phpunit/phpunit": "^7.5",
"orchestra/testbench-core": "3.8.*",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^7.5|^8.0",
"predis/predis": "^1.1.1",
"symfony/css-selector": "^4.1",
"symfony/dom-crawler": "^4.1",
"symfony/css-selector": "^4.2",
"symfony/dom-crawler": "^4.2",
"true/punycode": "^2.1"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"filp/whoops": "Required for friendly error pages in development (^2.1.4).",
@ -1166,17 +1122,18 @@
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"nexmo/client": "Required to use the Nexmo transport (^1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0|^4.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
"predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
"symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
"symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
"symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.7-dev"
"dev-master": "5.8-dev"
}
},
"autoload": {
@ -1204,121 +1161,7 @@
"framework",
"laravel"
],
"time": "2020-04-14T14:16:19+00:00"
},
{
"name": "laravel/nexmo-notification-channel",
"version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/nexmo-notification-channel.git",
"reference": "03edd42a55b306ff980c9950899d5a2b03260d48"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/nexmo-notification-channel/zipball/03edd42a55b306ff980c9950899d5a2b03260d48",
"reference": "03edd42a55b306ff980c9950899d5a2b03260d48",
"shasum": ""
},
"require": {
"nexmo/client": "^1.0",
"php": "^7.1.3"
},
"require-dev": {
"illuminate/notifications": "~5.7",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"laravel": {
"providers": [
"Illuminate\\Notifications\\NexmoChannelServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Illuminate\\Notifications\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylor@laravel.com"
}
],
"description": "Nexmo Notification Channel for laravel.",
"keywords": [
"laravel",
"nexmo",
"notifications"
],
"time": "2018-12-04T12:57:08+00:00"
},
{
"name": "laravel/slack-notification-channel",
"version": "v1.0.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/slack-notification-channel.git",
"reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/6e164293b754a95f246faf50ab2bbea3e4923cc9",
"reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.0",
"php": "^7.1.3"
},
"require-dev": {
"illuminate/notifications": "~5.7",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
},
"laravel": {
"providers": [
"Illuminate\\Notifications\\SlackChannelServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Illuminate\\Notifications\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylor@laravel.com"
}
],
"description": "Slack Notification Channel for laravel.",
"keywords": [
"laravel",
"notifications",
"slack"
],
"time": "2018-12-12T13:12:06+00:00"
"time": "2020-04-14T14:14:36+00:00"
},
{
"name": "laravel/tinker",
@ -1383,61 +1226,6 @@
],
"time": "2019-08-07T15:10:45+00:00"
},
{
"name": "lcobucci/jwt",
"version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/jwt.git",
"reference": "56f10808089e38623345e28af2f2d5e4eb579455"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lcobucci/jwt/zipball/56f10808089e38623345e28af2f2d5e4eb579455",
"reference": "56f10808089e38623345e28af2f2d5e4eb579455",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"ext-openssl": "*",
"php": "^5.6 || ^7.0"
},
"require-dev": {
"mikey179/vfsstream": "~1.5",
"phpmd/phpmd": "~2.2",
"phpunit/php-invoker": "~1.1",
"phpunit/phpunit": "^5.7 || ^7.3",
"squizlabs/php_codesniffer": "~2.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
}
},
"autoload": {
"psr-4": {
"Lcobucci\\JWT\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Luís Otávio Cobucci Oblonczyk",
"email": "lcobucci@gmail.com",
"role": "Developer"
}
],
"description": "A simple library to work with JSON Web Token and JSON Web Signature",
"keywords": [
"JWS",
"jwt"
],
"time": "2020-05-22T08:21:12+00:00"
},
{
"name": "league/csv",
"version": "9.6.0",
@ -1717,34 +1505,42 @@
},
{
"name": "nesbot/carbon",
"version": "1.39.1",
"version": "2.34.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33"
"reference": "3e87404329b8072295ea11d548b47a1eefe5a162"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4be0c005164249208ce1b5ca633cd57bdd42ff33",
"reference": "4be0c005164249208ce1b5ca633cd57bdd42ff33",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162",
"reference": "3e87404329b8072295ea11d548b47a1eefe5a162",
"shasum": ""
},
"require": {
"kylekatarnls/update-helper": "^1.1",
"php": ">=5.3.9",
"symfony/translation": "~2.6 || ~3.0 || ~4.0"
"ext-json": "*",
"php": "^7.1.8 || ^8.0",
"symfony/polyfill-mbstring": "^1.0",
"symfony/translation": "^3.4 || ^4.0 || ^5.0"
},
"require-dev": {
"composer/composer": "^1.2",
"friendsofphp/php-cs-fixer": "~2",
"phpunit/phpunit": "^4.8.35 || ^5.7"
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
"kylekatarnls/multi-tester": "^1.1",
"phpmd/phpmd": "^2.8",
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
"bin": [
"bin/upgrade-carbon"
"bin/carbon"
],
"type": "library",
"extra": {
"update-helper": "Carbon\\Upgrade",
"branch-alias": {
"dev-master": "2.x-dev",
"dev-3.x": "3.x-dev"
},
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
@ -1753,7 +1549,7 @@
},
"autoload": {
"psr-4": {
"": "src/"
"Carbon\\": "src/Carbon/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -1765,109 +1561,20 @@
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
},
{
"name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls"
}
],
"description": "A simple API extension for DateTime.",
"description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
"time": "2019-10-14T05:51:36+00:00"
},
{
"name": "nexmo/client",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/Nexmo/nexmo-php-complete.git",
"reference": "c6d11d953c8c5594590bb9ebaba9616e76948f93"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nexmo/nexmo-php-complete/zipball/c6d11d953c8c5594590bb9ebaba9616e76948f93",
"reference": "c6d11d953c8c5594590bb9ebaba9616e76948f93",
"shasum": ""
},
"require": {
"nexmo/client-core": "^1.0",
"php": ">=5.6",
"php-http/guzzle6-adapter": "^1.0"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Tim Lytle",
"email": "tim@nexmo.com",
"homepage": "http://twitter.com/tjlytle",
"role": "Developer"
},
{
"name": "Michael Heap",
"email": "michael.heap@vonage.com",
"role": "Developer"
},
{
"name": "Lorna Mitchell",
"email": "lorna.mitchell@vonage.com",
"role": "Developer"
}
],
"description": "PHP Client for using Nexmo's API.",
"time": "2019-11-26T15:25:11+00:00"
},
{
"name": "nexmo/client-core",
"version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/Nexmo/nexmo-php.git",
"reference": "182d41a02ebd3e4be147baea45458ccfe2f528c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/182d41a02ebd3e4be147baea45458ccfe2f528c4",
"reference": "182d41a02ebd3e4be147baea45458ccfe2f528c4",
"shasum": ""
},
"require": {
"lcobucci/jwt": "^3.2",
"php": ">=5.6",
"php-http/client-implementation": "^1.0",
"php-http/guzzle6-adapter": "^1.0",
"zendframework/zend-diactoros": "^1.8.4 || ^2.0"
},
"require-dev": {
"estahn/phpunit-json-assertions": "^1.0.0",
"php-http/mock-client": "^0.3.0",
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.1"
},
"type": "library",
"autoload": {
"psr-4": {
"Nexmo\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Tim Lytle",
"email": "tim@nexmo.com",
"homepage": "http://twitter.com/tjlytle",
"role": "Developer"
}
],
"description": "PHP Client for using Nexmo's API.",
"time": "2019-05-13T20:27:43+00:00"
"time": "2020-05-19T22:14:16+00:00"
},
{
"name": "nikic/php-parser",
@ -2069,170 +1776,59 @@
"time": "2018-07-02T15:55:56+00:00"
},
{
"name": "php-http/guzzle6-adapter",
"version": "v1.1.1",
"name": "phpoption/phpoption",
"version": "1.7.3",
"source": {
"type": "git",
"url": "https://github.com/php-http/guzzle6-adapter.git",
"reference": "a56941f9dc6110409cfcddc91546ee97039277ab"
"url": "https://github.com/schmittjoh/php-option.git",
"reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab",
"reference": "a56941f9dc6110409cfcddc91546ee97039277ab",
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
"reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.0",
"php": ">=5.5.0",
"php-http/httplug": "^1.0"
},
"provide": {
"php-http/async-client-implementation": "1.0",
"php-http/client-implementation": "1.0"
"php": "^5.5.9 || ^7.0 || ^8.0"
},
"require-dev": {
"ext-curl": "*",
"php-http/adapter-integration-tests": "^0.4"
"bamarni/composer-bin-plugin": "^1.3",
"phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.7-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Adapter\\Guzzle6\\": "src/"
"PhpOption\\": "src/PhpOption/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
"Apache-2.0"
],
"authors": [
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com"
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com"
},
{
"name": "David de Boer",
"email": "david@ddeboer.nl"
"name": "Graham Campbell",
"email": "graham@alt-three.com"
}
],
"description": "Guzzle 6 HTTP Adapter",
"homepage": "http://httplug.io",
"description": "Option Type for PHP",
"keywords": [
"Guzzle",
"http"
"language",
"option",
"php",
"type"
],
"time": "2016-05-10T06:13:32+00:00"
},
{
"name": "php-http/httplug",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/httplug.git",
"reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
"reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
"shasum": ""
},
"require": {
"php": ">=5.4",
"php-http/promise": "^1.0",
"psr/http-message": "^1.0"
},
"require-dev": {
"henrikbjorn/phpspec-code-coverage": "^1.0",
"phpspec/phpspec": "^2.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Client\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Eric GELOEN",
"email": "geloen.eric@gmail.com"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com"
}
],
"description": "HTTPlug, the HTTP client abstraction for PHP",
"homepage": "http://httplug.io",
"keywords": [
"client",
"http"
],
"time": "2016-08-31T08:30:17+00:00"
},
{
"name": "php-http/promise",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/promise.git",
"reference": "dc494cdc9d7160b9a09bd5573272195242ce7980"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980",
"reference": "dc494cdc9d7160b9a09bd5573272195242ce7980",
"shasum": ""
},
"require-dev": {
"henrikbjorn/phpspec-code-coverage": "^1.0",
"phpspec/phpspec": "^2.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Promise\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com"
},
{
"name": "Joel Wurtz",
"email": "joel.wurtz@gmail.com"
}
],
"description": "Promise used for asynchronous HTTP requests",
"homepage": "http://httplug.io",
"keywords": [
"promise"
],
"time": "2016-01-26T13:27:02+00:00"
"time": "2020-03-21T18:07:53+00:00"
},
{
"name": "psr/container",
@ -2283,58 +1879,6 @@
],
"time": "2017-02-14T16:28:37+00:00"
},
{
"name": "psr/http-factory",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
"psr/http-message": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
"http",
"message",
"psr",
"psr-17",
"psr-7",
"request",
"response"
],
"time": "2019-04-30T12:38:16+00:00"
},
{
"name": "psr/http-message",
"version": "1.0.1",
@ -2683,26 +2227,25 @@
},
{
"name": "staudenmeir/eloquent-eager-limit",
"version": "v1.2.1",
"version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/staudenmeir/eloquent-eager-limit.git",
"reference": "388fa4fa26911ba4be2f3076f79a489f276f7b5e"
"reference": "271c1a029fed9ba1e09718b2ce99c54c24643c7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/staudenmeir/eloquent-eager-limit/zipball/388fa4fa26911ba4be2f3076f79a489f276f7b5e",
"reference": "388fa4fa26911ba4be2f3076f79a489f276f7b5e",
"url": "https://api.github.com/repos/staudenmeir/eloquent-eager-limit/zipball/271c1a029fed9ba1e09718b2ce99c54c24643c7f",
"reference": "271c1a029fed9ba1e09718b2ce99c54c24643c7f",
"shasum": ""
},
"require": {
"illuminate/database": "~5.5.43|~5.6.34|5.7.*",
"illuminate/support": "^5.5.14",
"php": ">=7.0"
"illuminate/database": "5.8.*",
"php": "^7.1.3"
},
"require-dev": {
"laravel/homestead": "^7.18",
"phpunit/phpunit": "~6.5"
"laravel/homestead": "^8.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"autoload": {
@ -2721,7 +2264,7 @@
}
],
"description": "Laravel Eloquent eager loading with limit",
"time": "2019-07-31T16:00:04+00:00"
"time": "2019-07-31T15:57:35+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -4265,26 +3808,27 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v2.6.4",
"version": "v3.6.4",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "67d472b1794c986381a8950e4958e1adb779d561"
"reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
"reference": "67d472b1794c986381a8950e4958e1adb779d561",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
"reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
"shasum": ""
},
"require": {
"php": "^5.3.9 || ^7.0 || ^8.0",
"php": "^5.4 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.5",
"symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
"ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.35 || ^5.0"
"phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
"suggest": {
"ext-filter": "Required to use the boolean validator.",
@ -4293,7 +3837,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "3.6-dev"
}
},
"autoload": {
@ -4323,75 +3867,7 @@
"env",
"environment"
],
"time": "2020-05-02T13:38:00+00:00"
},
{
"name": "zendframework/zend-diactoros",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
"reference": "de5847b068362a88684a55b0dbb40d85986cfa52"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/de5847b068362a88684a55b0dbb40d85986cfa52",
"reference": "de5847b068362a88684a55b0dbb40d85986cfa52",
"shasum": ""
},
"require": {
"php": "^7.1",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
"provide": {
"psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"ext-curl": "*",
"ext-dom": "*",
"ext-libxml": "*",
"http-interop/http-factory-tests": "^0.5.0",
"php-http/psr7-integration-tests": "dev-master",
"phpunit/phpunit": "^7.0.2",
"zendframework/zend-coding-standard": "~1.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev",
"dev-develop": "2.2.x-dev",
"dev-release-1.8": "1.8.x-dev"
}
},
"autoload": {
"files": [
"src/functions/create_uploaded_file.php",
"src/functions/marshal_headers_from_sapi.php",
"src/functions/marshal_method_from_sapi.php",
"src/functions/marshal_protocol_version_from_sapi.php",
"src/functions/marshal_uri_from_sapi.php",
"src/functions/normalize_server.php",
"src/functions/normalize_uploaded_files.php",
"src/functions/parse_cookie_header.php"
],
"psr-4": {
"Zend\\Diactoros\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"description": "PSR HTTP Message implementations",
"keywords": [
"http",
"psr",
"psr-7"
],
"abandoned": "laminas/laminas-diactoros",
"time": "2019-11-13T19:16:13+00:00"
"time": "2020-05-02T13:46:13+00:00"
}
],
"packages-dev": [
@ -5563,16 +5039,16 @@
},
{
"name": "nunomaduro/collision",
"version": "v2.1.1",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63"
"reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63",
"reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/af42d339fe2742295a54f6fdd42aaa6f8c4aca68",
"reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68",
"shasum": ""
},
"require": {
@ -5582,10 +5058,10 @@
"symfony/console": "~2.8|~3.3|~4.0"
},
"require-dev": {
"laravel/framework": "5.7.*",
"laravel/framework": "5.8.*",
"nunomaduro/larastan": "^0.3.0",
"phpstan/phpstan": "^0.10",
"phpunit/phpunit": "~7.3"
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "~8.0"
},
"type": "library",
"extra": {
@ -5623,7 +5099,7 @@
"php",
"symfony"
],
"time": "2018-11-21T21:40:54+00:00"
"time": "2019-03-07T21:35:13+00:00"
},
{
"name": "phar-io/manifest",

2
config/app.php
View File

@ -192,6 +192,7 @@ return [
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
@ -221,6 +222,7 @@ return [
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'Str' => Illuminate\Support\Str::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,

1
config/auth.php
View File

@ -44,6 +44,7 @@ return [
'api' => [
'driver' => 'token',
'provider' => 'users',
'hash' => false,
],
],

3
config/broadcasting.php
View File

@ -36,7 +36,8 @@ return [
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
],
],

12
config/cache.php
View File

@ -13,7 +13,8 @@ return [
| using this caching library. This connection is used when another is
| not explicitly specified when executing a given caching function.
|
| Supported: "apc", "array", "database", "file", "memcached", "redis"
| Supported: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb"
|
*/
@ -75,6 +76,15 @@ return [
'connection' => 'cache',
],
'dynamodb' => [
'driver' => 'dynamodb',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
'endpoint' => env('DYNAMODB_ENDPOINT'),
],
],
/*

18
config/database.php
View File

@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Str;
return [
/*
@ -35,6 +37,7 @@ return [
'sqlite' => [
'driver' => 'sqlite',
'url' => env('DATABASE_URL'),
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '',
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
@ -42,6 +45,7 @@ return [
'mysql' => [
'driver' => 'mysql',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
@ -54,10 +58,14 @@ return [
'prefix_indexes' => true,
'strict' => true,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],
'pgsql' => [
'driver' => 'pgsql',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
@ -72,6 +80,7 @@ return [
'sqlsrv' => [
'driver' => 'sqlsrv',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'forge'),
@ -110,9 +119,15 @@ return [
'redis' => [
'client' => 'predis',
'client' => env('REDIS_CLIENT', 'predis'),
'options' => [
'cluster' => env('REDIS_CLUSTER', 'predis'),
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
],
'default' => [
'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
@ -120,6 +135,7 @@ return [
],
'cache' => [
'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),

2
config/mail.php
View File

@ -12,7 +12,7 @@ return [
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
| "sparkpost", "log", "array"
| "sparkpost", "postmark", "log", "array"
|
*/

13
config/queue.php
View File

@ -13,7 +13,7 @@ return [
|
*/
'default' => env('QUEUE_DRIVER', 'sync'),
'default' => env('QUEUE_CONNECTION', 'sync'),
/*
|--------------------------------------------------------------------------
@ -37,7 +37,7 @@ return [
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => env('REDIS_QUEUE', 'default'),
'queue' => 'default',
'retry_after' => 90,
],
@ -46,21 +46,22 @@ return [
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
'block_for' => 0,
],
'sqs' => [
'driver' => 'sqs',
'key' => env('SQS_KEY', 'your-public-key'),
'secret' => env('SQS_SECRET', 'your-secret-key'),
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'),
'region' => env('SQS_REGION', 'us-east-1'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
'block_for' => null,
],

26
config/services.php
View File

@ -8,9 +8,9 @@ return [
|--------------------------------------------------------------------------
|
| This file is for storing the credentials for third party services such
| as Stripe, Mailgun, SparkPost and others. This file provides a sane
| default location for this type of information, allowing packages
| to have a conventional place to find your various credentials.
| as Mailgun, SparkPost and others. This file provides a sane default
| location for this type of information, allowing packages to have
| a conventional file to locate the various service credentials.
|
*/
@ -20,24 +20,18 @@ return [
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
],
'postmark' => [
'token' => env('POSTMARK_TOKEN'),
],
'ses' => [
'key' => env('SES_KEY'),
'secret' => env('SES_SECRET'),
'region' => env('SES_REGION', 'us-east-1'),
'webhook' => [
'secret' => env('STRIPE_WEBHOOK_SECRET'),
'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
],
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
'sparkpost' => [
'secret' => env('SPARKPOST_SECRET'),
],
'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],
];

1
database/.gitignore vendored
View File

@ -1 +1,2 @@
*.sqlite
*.sqlite-journal

2
resources/lang/en/passwords.php
View File

@ -13,7 +13,7 @@ return [
|
*/
'password' => 'Passwords must be at least six characters and match the confirmation.',
'password' => 'Passwords must be at least eight characters and match the confirmation.',
'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!',
'token' => 'This password reset token is invalid.',

1
resources/lang/en/validation.php
View File

@ -40,6 +40,7 @@ return [
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',

2
tests/Unit/MetadataResolver/CienResolverTest.php
View File

@ -9,7 +9,7 @@ class CienResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/DLsiteResolverTest.php
View File

@ -9,7 +9,7 @@ class DLsiteResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/DeviantArtResolverTest.php
View File

@ -9,7 +9,7 @@ class DeviantArtResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/FC2ContentsResolverTest.php
View File

@ -9,7 +9,7 @@ class FC2ContentsResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/FantiaResolverTest.php
View File

@ -9,7 +9,7 @@ class FantiaResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/FanzaResolverTest.php
View File

@ -9,7 +9,7 @@ class FanzaResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/HentaiFoundryResolverTest.php
View File

@ -9,7 +9,7 @@ class HentaiFoundryResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/IwaraResolverTest.php
View File

@ -9,7 +9,7 @@ class IwaraResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/Kb10uyShortStoryServerResolverTest.php
View File

@ -9,7 +9,7 @@ class Kb10uyShortStoryServerResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/KomifloResolverTest.php
View File

@ -9,7 +9,7 @@ class KomifloResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/NicoSeigaResolverTest.php
View File

@ -10,7 +10,7 @@ class NicoSeigaResolverTest extends TestCase
{
use CreateMockedResolver, MyAsserts;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/NijieResolverTest.php
View File

@ -9,7 +9,7 @@ class NijieResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/PixivResolverTest.php
View File

@ -9,7 +9,7 @@ class PixivResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/PlurkResolverTest.php
View File

@ -9,7 +9,7 @@ class PlurkResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/SteamResolverTest.php
View File

@ -9,7 +9,7 @@ class SteamResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/ToranoanaResolverTest.php
View File

@ -9,7 +9,7 @@ class ToranoanaResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/MetadataResolver/XtubeResolverTest.php
View File

@ -9,7 +9,7 @@ class XtubeResolverTest extends TestCase
{
use CreateMockedResolver;
public function setUp()
public function setUp(): void
{
parent::setUp();

2
tests/Unit/Services/CheckinCsvImporterTest.php
View File

@ -15,7 +15,7 @@ class CheckinCsvImporterTest extends TestCase
{
use RefreshDatabase;
protected function setUp()
protected function setUp(): void
{
parent::setUp();
$this->seed();