diff --git a/.env.example b/.env.example
index e9146694..13da3cab 100644
--- a/.env.example
+++ b/.env.example
@@ -25,7 +25,7 @@ DB_PREFIX=
PWD_METHOD=BCRYPT
APP_KEY=
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
MAIL_HOST=
MAIL_PORT=465
MAIL_USERNAME=
diff --git a/.env.testing b/.env.testing
index 24c956dd..b8810212 100644
--- a/.env.testing
+++ b/.env.testing
@@ -13,7 +13,7 @@ PWD_METHOD=BCRYPT
SALT=c67709dd8b7b733aca0d570681fe96cf
APP_KEY=base64:eVX/xzF5NhpGB2luswliFx9XSBsbbAP21wOi68X/P34=
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
MAIL_HOST=localhost
MAIL_PORT=465
MAIL_USERNAME=
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 7394b768..369d4b40 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -2,10 +2,10 @@
namespace App\Exceptions;
-use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
+use Throwable;
class Handler extends ExceptionHandler
{
@@ -22,7 +22,7 @@ class Handler extends ExceptionHandler
PrettyPageException::class,
];
- protected function convertExceptionToArray(Exception $e)
+ protected function convertExceptionToArray(Throwable $e)
{
return [
'message' => $e->getMessage(),
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 4136843d..f8d5de95 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -210,7 +210,7 @@ class AuthController extends Controller
public function forgot()
{
- if (config('mail.driver') != '') {
+ if (config('mail.default') != '') {
return view('auth.forgot', [
'extra' => [
'recaptcha' => option('recaptcha_sitekey'),
@@ -233,7 +233,7 @@ class AuthController extends Controller
'captcha' => ['required', $captcha],
]);
- if (!config('mail.driver')) {
+ if (!config('mail.default')) {
return json(trans('auth.forgot.disabled'), 1);
}
diff --git a/app/Models/Player.php b/app/Models/Player.php
index 1d1d115d..2d43270e 100644
--- a/app/Models/Player.php
+++ b/app/Models/Player.php
@@ -4,6 +4,7 @@ namespace App\Models;
use App\Events\PlayerProfileUpdated;
use App\Models;
+use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
class Player extends Model
@@ -62,4 +63,9 @@ class Player extends Model
return json_encode($profile, $options | JSON_UNESCAPED_UNICODE);
}
+
+ protected function serializeDate(DateTimeInterface $date)
+ {
+ return $date->format('Y-m-d H:i:s');
+ }
}
diff --git a/app/Models/Report.php b/app/Models/Report.php
index 408a23b4..193a7274 100644
--- a/app/Models/Report.php
+++ b/app/Models/Report.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
class Report extends Model
@@ -29,4 +30,9 @@ class Report extends Model
{
return $this->belongsTo(User::class, 'reporter', 'uid');
}
+
+ protected function serializeDate(DateTimeInterface $date)
+ {
+ return $date->format('Y-m-d H:i:s');
+ }
}
diff --git a/app/Models/Texture.php b/app/Models/Texture.php
index 7f27be4e..f22dcc71 100644
--- a/app/Models/Texture.php
+++ b/app/Models/Texture.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
class Texture extends Model
@@ -37,4 +38,9 @@ class Texture extends Model
{
return $this->belongsToMany(User::class, 'user_closet')->withPivot('item_name');
}
+
+ protected function serializeDate(DateTimeInterface $date)
+ {
+ return $date->format('Y-m-d H:i:s');
+ }
}
diff --git a/app/Models/User.php b/app/Models/User.php
index 303d6beb..f033e37f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -3,6 +3,7 @@
namespace App\Models;
use App\Models\Concerns\HasPassword;
+use DateTimeInterface;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Passport\HasApiTokens;
@@ -85,4 +86,9 @@ class User extends Authenticatable implements JWTSubject
{
return [];
}
+
+ protected function serializeDate(DateTimeInterface $date)
+ {
+ return $date->format('Y-m-d H:i:s');
+ }
}
diff --git a/composer.json b/composer.json
index 0b04db94..2d69679a 100644
--- a/composer.json
+++ b/composer.json
@@ -17,39 +17,39 @@
"blessing/rejection": "^1.0",
"blessing/texture-renderer": "^0.1.1",
"composer/ca-bundle": "^1.2",
- "composer/semver": "^1.4",
+ "composer/semver": "^1.5",
"doctrine/dbal": "^2.10",
"doctrine/inflector": "^1.3",
"erusev/parsedown": "^1.7",
- "facade/ignition": "^1.4",
+ "facade/ignition": "^2.0",
"gregwar/captcha": "1.*",
"guzzlehttp/guzzle": "^6.3",
"intervention/image": "^2.5",
- "laravel/framework": "6.*",
- "laravel/passport": "^7.3",
+ "laravel/framework": "^7.0",
+ "laravel/passport": "^8.4",
"nesbot/carbon": "^2.0",
+ "nunomaduro/collision": "^4.1",
"predis/predis": "~1.0",
"rcrowe/twigbridge": "^0.11.3",
- "socialiteproviders/manager": "^3.4",
+ "socialiteproviders/manager": "^3.5",
"spatie/laravel-translation-loader": "^2.6",
- "symfony/process": "^4.4",
- "symfony/yaml": "^4.3",
+ "symfony/process": "^5.0",
+ "symfony/yaml": "^5.0",
"twig/twig": "^2.11",
"tymon/jwt-auth": "dev-develop",
"vectorface/whip": "^0.3.2"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.2",
- "barryvdh/laravel-ide-helper": "^2.6",
- "beyondcode/laravel-dump-server": "^1.2",
+ "beyondcode/laravel-dump-server": "^1.4",
"fzaninotto/faker": "~1.9",
- "laravel/browser-kit-testing": "~5.0",
+ "laravel/browser-kit-testing": "^6.0",
"laravel/tinker": "^2.2",
"mockery/mockery": "^1.3",
"phpdocumentor/reflection-docblock": "^5.1",
- "phpunit/phpunit": "~8.0",
- "symfony/css-selector": "^4.3",
- "symfony/dom-crawler": "^4.3"
+ "phpunit/phpunit": "^8.5",
+ "symfony/css-selector": "^5.0",
+ "symfony/dom-crawler": "^5.0"
},
"autoload": {
"classmap": [
diff --git a/composer.lock b/composer.lock
index ebce5748..77cb1144 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "162dddf53f1a024aaa390106046467d1",
+ "content-hash": "3182ac0b67e29d577260b6730cde4c72",
"packages": [
{
"name": "blessing/filter",
@@ -908,35 +908,35 @@
},
{
"name": "facade/ignition",
- "version": "1.16.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "37f094775814b68d0c6cc8b8ff3c3be243f20725"
+ "reference": "b8dbf7791c81619161270d580a64a30bad41b832"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/37f094775814b68d0c6cc8b8ff3c3be243f20725",
- "reference": "37f094775814b68d0c6cc8b8ff3c3be243f20725",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/b8dbf7791c81619161270d580a64a30bad41b832",
+ "reference": "b8dbf7791c81619161270d580a64a30bad41b832",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
- "facade/flare-client-php": "^1.3",
+ "facade/flare-client-php": "^1.0",
"facade/ignition-contracts": "^1.0",
"filp/whoops": "^2.4",
- "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0",
- "monolog/monolog": "^1.12 || ^2.0",
- "php": "^7.1",
+ "illuminate/support": "^7.0",
+ "monolog/monolog": "^2.0",
+ "php": "^7.2.5",
"scrivo/highlight.php": "^9.15",
- "symfony/console": "^3.4 || ^4.0",
- "symfony/var-dumper": "^3.4 || ^4.0"
+ "symfony/console": "^5.0",
+ "symfony/var-dumper": "^5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
- "mockery/mockery": "^1.2",
- "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0"
+ "mockery/mockery": "^1.3",
+ "orchestra/testbench": "5.0"
},
"suggest": {
"laravel/telescope": "^2.0"
@@ -944,7 +944,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "v2.x-dev"
+ "dev-master": "2.x-dev"
},
"laravel": {
"providers": [
@@ -975,7 +975,7 @@
"laravel",
"page"
],
- "time": "2020-01-21T17:46:02+00:00"
+ "time": "2020-03-05T12:32:22+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -1441,17 +1441,241 @@
"time": "2019-11-02T09:15:47+00:00"
},
{
- "name": "laravel/framework",
- "version": "v6.18.0",
+ "name": "jakub-onderka/php-console-color",
+ "version": "v0.2",
"source": {
"type": "git",
- "url": "https://github.com/laravel/framework.git",
- "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8"
+ "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
- "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "jakub-onderka/php-code-style": "1.0",
+ "jakub-onderka/php-parallel-lint": "1.0",
+ "jakub-onderka/php-var-dump-check": "0.*",
+ "phpunit/phpunit": "~4.3",
+ "squizlabs/php_codesniffer": "1.*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-2-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Jakub Onderka",
+ "email": "jakub.onderka@gmail.com"
+ }
+ ],
+ "time": "2018-09-29T17:23:10+00:00"
+ },
+ {
+ "name": "jakub-onderka/php-console-highlighter",
+ "version": "v0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
+ "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
+ "shasum": ""
+ },
+ "require": {
+ "ext-tokenizer": "*",
+ "jakub-onderka/php-console-color": "~0.2",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "jakub-onderka/php-code-style": "~1.0",
+ "jakub-onderka/php-parallel-lint": "~1.0",
+ "jakub-onderka/php-var-dump-check": "~0.1",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~1.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jakub Onderka",
+ "email": "acci@acci.cz",
+ "homepage": "http://www.acci.cz/"
+ }
+ ],
+ "description": "Highlight PHP code in terminal",
+ "time": "2018-09-29T18:48:56+00:00"
+ },
+ {
+ "name": "laminas/laminas-diactoros",
+ "version": "2.2.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-diactoros.git",
+ "reference": "95178c4751d737cdf9ab0a9f70a42754ac860e7b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/95178c4751d737cdf9ab0a9f70a42754ac860e7b",
+ "reference": "95178c4751d737cdf9ab0a9f70a42754ac860e7b",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^7.1",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0"
+ },
+ "conflict": {
+ "phpspec/prophecy": "<1.9.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "self.version"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "http-interop/http-factory-tests": "^0.5.0",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^7.5.18"
+ },
+ "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",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
+ "psr-4": {
+ "Laminas\\Diactoros\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
+ ],
+ "time": "2020-01-07T19:39:26+00:00"
+ },
+ {
+ "name": "laminas/laminas-zendframework-bridge",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+ "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/0fb9675b84a1666ab45182b6c5b29956921e818d",
+ "reference": "0fb9675b84a1666ab45182b6c5b29956921e818d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "squizlabs/php_codesniffer": "^3.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
+ },
+ "laminas": {
+ "module": "Laminas\\ZendFrameworkBridge"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
+ "psr-4": {
+ "Laminas\\ZendFrameworkBridge\\": "src//"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+ "keywords": [
+ "ZendFramework",
+ "autoloading",
+ "laminas",
+ "zf"
+ ],
+ "time": "2020-01-07T22:58:31+00:00"
+ },
+ {
+ "name": "laravel/framework",
+ "version": "v7.0.8",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/framework.git",
+ "reference": "d71ba61d51aec79a0a0f907991ec215dc24b09d4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/d71ba61d51aec79a0a0f907991ec215dc24b09d4",
+ "reference": "d71ba61d51aec79a0a0f907991ec215dc24b09d4",
"shasum": ""
},
"require": {
@@ -1463,24 +1687,26 @@
"ext-openssl": "*",
"league/commonmark": "^1.3",
"league/flysystem": "^1.0.8",
- "monolog/monolog": "^1.12|^2.0",
- "nesbot/carbon": "^2.0",
+ "monolog/monolog": "^2.0",
+ "nesbot/carbon": "^2.17",
"opis/closure": "^3.1",
- "php": "^7.2",
+ "php": "^7.2.5",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7",
"swiftmailer/swiftmailer": "^6.0",
- "symfony/console": "^4.3.4",
- "symfony/debug": "^4.3.4",
- "symfony/finder": "^4.3.4",
- "symfony/http-foundation": "^4.3.4",
- "symfony/http-kernel": "^4.3.4",
- "symfony/process": "^4.3.4",
- "symfony/routing": "^4.3.4",
- "symfony/var-dumper": "^4.3.4",
- "tijsverkoyen/css-to-inline-styles": "^2.2.1",
- "vlucas/phpdotenv": "^3.3"
+ "symfony/console": "^5.0",
+ "symfony/error-handler": "^5.0",
+ "symfony/finder": "^5.0",
+ "symfony/http-foundation": "^5.0",
+ "symfony/http-kernel": "^5.0",
+ "symfony/mime": "^5.0",
+ "symfony/process": "^5.0",
+ "symfony/routing": "^5.0",
+ "symfony/var-dumper": "^5.0",
+ "tijsverkoyen/css-to-inline-styles": "^2.2.2",
+ "vlucas/phpdotenv": "^4.0",
+ "voku/portable-ascii": "^1.4.8"
},
"conflict": {
"tightenco/collect": "<5.5.33"
@@ -1511,6 +1737,7 @@
"illuminate/routing": "self.version",
"illuminate/session": "self.version",
"illuminate/support": "self.version",
+ "illuminate/testing": "self.version",
"illuminate/translation": "self.version",
"illuminate/validation": "self.version",
"illuminate/view": "self.version"
@@ -1519,15 +1746,15 @@
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.4",
- "guzzlehttp/guzzle": "^6.3|^7.0",
+ "guzzlehttp/guzzle": "^6.3.1|^7.0",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.3.1",
"moontoast/math": "^1.1",
- "orchestra/testbench-core": "^4.0",
+ "orchestra/testbench-core": "^5.0",
"pda/pheanstalk": "^4.0",
- "phpunit/phpunit": "^7.5.15|^8.4|^9.0",
+ "phpunit/phpunit": "^8.4|^9.0",
"predis/predis": "^1.1.1",
- "symfony/cache": "^4.3.4"
+ "symfony/cache": "^5.0"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
@@ -1539,24 +1766,26 @@
"ext-redis": "Required to use the Redis cache and queue drivers.",
"filp/whoops": "Required for friendly error pages in development (^2.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
- "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).",
+ "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+ "mockery/mockery": "Required to use mocking (^1.3.1).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
+ "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
- "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).",
- "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",
+ "symfony/cache": "Required to PSR-6 cache bridge (^5.0).",
+ "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.x-dev"
+ "dev-master": "7.x-dev"
}
},
"autoload": {
@@ -1584,49 +1813,51 @@
"framework",
"laravel"
],
- "time": "2020-03-03T13:14:27+00:00"
+ "time": "2020-03-08T16:03:46+00:00"
},
{
"name": "laravel/passport",
- "version": "v7.5.1",
+ "version": "v8.4.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
- "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08"
+ "reference": "4088cdf174d25ccf3fb79d234b94b2a90785fa69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/passport/zipball/d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08",
- "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08",
+ "url": "https://api.github.com/repos/laravel/passport/zipball/4088cdf174d25ccf3fb79d234b94b2a90785fa69",
+ "reference": "4088cdf174d25ccf3fb79d234b94b2a90785fa69",
"shasum": ""
},
"require": {
"ext-json": "*",
- "firebase/php-jwt": "~3.0|~4.0|~5.0",
- "guzzlehttp/guzzle": "~6.0",
- "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0",
- "league/oauth2-server": "^7.0",
- "php": ">=7.1",
+ "firebase/php-jwt": "^3.0|^4.0|^5.0",
+ "guzzlehttp/guzzle": "^6.0",
+ "illuminate/auth": "^6.0|^7.0",
+ "illuminate/console": "^6.0|^7.0",
+ "illuminate/container": "^6.0|^7.0",
+ "illuminate/contracts": "^6.0|^7.0",
+ "illuminate/cookie": "^6.0|^7.0",
+ "illuminate/database": "^6.0|^7.0",
+ "illuminate/encryption": "^6.0|^7.0",
+ "illuminate/http": "^6.0|^7.0",
+ "illuminate/support": "^6.0|^7.0",
+ "laminas/laminas-diactoros": "^2.2",
+ "league/oauth2-server": "^8.0",
+ "nyholm/psr7": "^1.0",
+ "php": "^7.2",
"phpseclib/phpseclib": "^2.0",
- "symfony/psr-http-message-bridge": "~1.0",
- "zendframework/zend-diactoros": "~1.0|~2.0"
+ "symfony/psr-http-message-bridge": "^2.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
- "phpunit/phpunit": "^7.4|^8.0"
+ "orchestra/testbench": "^4.4|^5.0",
+ "phpunit/phpunit": "^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.0-dev"
+ "dev-master": "8.x-dev"
},
"laravel": {
"providers": [
@@ -1655,7 +1886,7 @@
"oauth",
"passport"
],
- "time": "2019-10-08T16:45:24+00:00"
+ "time": "2020-03-04T13:55:07+00:00"
},
{
"name": "laravel/socialite",
@@ -1902,16 +2133,16 @@
},
{
"name": "league/flysystem",
- "version": "1.0.64",
+ "version": "1.0.65",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "d13c43dbd4b791f815215959105a008515d1a2e0"
+ "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0",
- "reference": "d13c43dbd4b791f815215959105a008515d1a2e0",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8f17b3ba67097aafb8318cd5c553b1acf7c891c8",
+ "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8",
"shasum": ""
},
"require": {
@@ -1982,7 +2213,7 @@
"sftp",
"storage"
],
- "time": "2020-02-05T18:14:17+00:00"
+ "time": "2020-03-08T18:53:20+00:00"
},
{
"name": "league/oauth1-client",
@@ -2049,24 +2280,25 @@
},
{
"name": "league/oauth2-server",
- "version": "7.4.0",
+ "version": "8.0.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git",
- "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf"
+ "reference": "e1dc4d708c56fcfa205be4bb1862b6d525b4baac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf",
- "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf",
+ "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/e1dc4d708c56fcfa205be4bb1862b6d525b4baac",
+ "reference": "e1dc4d708c56fcfa205be4bb1862b6d525b4baac",
"shasum": ""
},
"require": {
- "defuse/php-encryption": "^2.1",
+ "defuse/php-encryption": "^2.2.1",
+ "ext-json": "*",
"ext-openssl": "*",
- "lcobucci/jwt": "^3.2.2",
- "league/event": "^2.1",
- "php": ">=7.0.0",
+ "lcobucci/jwt": "^3.3.1",
+ "league/event": "^2.2",
+ "php": ">=7.1.0",
"psr/http-message": "^1.0.1"
},
"replace": {
@@ -2074,12 +2306,11 @@
"lncd/oauth2": "*"
},
"require-dev": {
- "phpstan/phpstan": "^0.9.2",
- "phpstan/phpstan-phpunit": "^0.9.4",
- "phpstan/phpstan-strict-rules": "^0.9.0",
- "phpunit/phpunit": "^6.3 || ^7.0",
+ "phpstan/phpstan": "^0.11.8",
+ "phpstan/phpstan-phpunit": "^0.11.2",
+ "phpunit/phpunit": "^7.5.13 || ^8.2.3",
"roave/security-advisories": "dev-master",
- "zendframework/zend-diactoros": "^1.3.2"
+ "zendframework/zend-diactoros": "^2.1.2"
},
"type": "library",
"autoload": {
@@ -2094,15 +2325,15 @@
"authors": [
{
"name": "Alex Bilbie",
- "role": "Developer",
"email": "hello@alexbilbie.com",
- "homepage": "http://www.alexbilbie.com"
+ "homepage": "http://www.alexbilbie.com",
+ "role": "Developer"
},
{
"name": "Andy Millington",
- "role": "Developer",
"email": "andrew@noexceptions.io",
- "homepage": "https://www.noexceptions.io"
+ "homepage": "https://www.noexceptions.io",
+ "role": "Developer"
}
],
"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
@@ -2122,7 +2353,7 @@
"secure",
"server"
],
- "time": "2019-05-05T09:22:01+00:00"
+ "time": "2019-07-13T18:58:26+00:00"
},
{
"name": "monolog/monolog",
@@ -2338,6 +2569,138 @@
],
"time": "2020-03-01T11:11:58+00:00"
},
+ {
+ "name": "nunomaduro/collision",
+ "version": "v4.1.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nunomaduro/collision.git",
+ "reference": "a430bce33d1ad07f756ea6cae9afce9ef8670b42"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/a430bce33d1ad07f756ea6cae9afce9ef8670b42",
+ "reference": "a430bce33d1ad07f756ea6cae9afce9ef8670b42",
+ "shasum": ""
+ },
+ "require": {
+ "facade/ignition-contracts": "^1.0",
+ "filp/whoops": "^2.4",
+ "jakub-onderka/php-console-highlighter": "^0.4",
+ "php": "^7.2.5",
+ "symfony/console": "^5.0"
+ },
+ "require-dev": {
+ "facade/ignition": "^2.0",
+ "fideloper/proxy": "^4.2",
+ "fruitcake/laravel-cors": "^1.0",
+ "laravel/framework": "^7.0",
+ "laravel/tinker": "^2.0",
+ "nunomaduro/larastan": "^0.5",
+ "orchestra/testbench": "^5.0",
+ "phpstan/phpstan": "^0.12.3",
+ "phpunit/phpunit": "^8.5.1 || ^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "NunoMaduro\\Collision\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }
+ ],
+ "description": "Cli error handling for console/command-line PHP applications.",
+ "keywords": [
+ "artisan",
+ "cli",
+ "command-line",
+ "console",
+ "error",
+ "handling",
+ "laravel",
+ "laravel-zero",
+ "php",
+ "symfony"
+ ],
+ "time": "2020-03-07T12:46:00+00:00"
+ },
+ {
+ "name": "nyholm/psr7",
+ "version": "1.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Nyholm/psr7.git",
+ "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Nyholm/psr7/zipball/55ff6b76573f5b242554c9775792bd59fb52e11c",
+ "reference": "55ff6b76573f5b242554c9775792bd59fb52e11c",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1",
+ "php-http/message-factory": "^1.0",
+ "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": {
+ "http-interop/http-factory-tests": "dev-master",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^7.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Nyholm\\Psr7\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com"
+ },
+ {
+ "name": "Martijn van der Ven",
+ "email": "martijn@vanderven.se"
+ }
+ ],
+ "description": "A fast PHP7 implementation of PSR-7",
+ "homepage": "http://tnyholm.se",
+ "keywords": [
+ "psr-17",
+ "psr-7"
+ ],
+ "time": "2019-09-05T13:24:16+00:00"
+ },
{
"name": "opis/closure",
"version": "3.5.1",
@@ -2444,6 +2807,56 @@
],
"time": "2018-07-02T15:55:56+00:00"
},
+ {
+ "name": "php-http/message-factory",
+ "version": "v1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/message-factory.git",
+ "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+ "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com"
+ }
+ ],
+ "description": "Factory interfaces for PSR-7 HTTP Message",
+ "homepage": "http://php-http.org",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "stream",
+ "uri"
+ ],
+ "time": "2015-12-19T14:08:53+00:00"
+ },
{
"name": "phpoption/phpoption",
"version": "1.7.2",
@@ -2690,6 +3103,52 @@
],
"time": "2017-02-14T16:28:37+00:00"
},
+ {
+ "name": "psr/event-dispatcher",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/event-dispatcher.git",
+ "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+ "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\EventDispatcher\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Standard interfaces for event handling.",
+ "keywords": [
+ "events",
+ "psr",
+ "psr-14"
+ ],
+ "time": "2019-01-08T18:20:26+00:00"
+ },
{
"name": "psr/http-factory",
"version": "1.0.1",
@@ -3157,20 +3616,20 @@
},
{
"name": "socialiteproviders/manager",
- "version": "v3.4.3",
+ "version": "v3.5",
"source": {
"type": "git",
"url": "https://github.com/SocialiteProviders/Manager.git",
- "reference": "09903d33429f9f6c0da32c545c036a3e18964bbf"
+ "reference": "7a5872d9e4b22bb26ecd0c69ea9ddbaad8c0f570"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/09903d33429f9f6c0da32c545c036a3e18964bbf",
- "reference": "09903d33429f9f6c0da32c545c036a3e18964bbf",
+ "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/7a5872d9e4b22bb26ecd0c69ea9ddbaad8c0f570",
+ "reference": "7a5872d9e4b22bb26ecd0c69ea9ddbaad8c0f570",
"shasum": ""
},
"require": {
- "illuminate/support": "~5.4|~5.7.0|~5.8.0|^6.0",
+ "illuminate/support": "~5.4|~5.7.0|~5.8.0|^6.0|^7.0",
"laravel/socialite": "~3.0|~4.0",
"php": "^5.6 || ^7.0"
},
@@ -3210,7 +3669,7 @@
}
],
"description": "Easily add new or override built-in providers in Laravel Socialite.",
- "time": "2019-09-25T06:06:35+00:00"
+ "time": "2020-03-08T16:54:44+00:00"
},
{
"name": "spatie/laravel-translation-loader",
@@ -3337,41 +3796,41 @@
},
{
"name": "symfony/console",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9"
+ "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
- "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
+ "url": "https://api.github.com/repos/symfony/console/zipball/d29e2d36941de13600c399e393a60b8cfe59ac49",
+ "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
"symfony/service-contracts": "^1.1|^2"
},
"conflict": {
- "symfony/dependency-injection": "<3.4",
- "symfony/event-dispatcher": "<4.3|>=5",
+ "symfony/dependency-injection": "<4.4",
+ "symfony/event-dispatcher": "<4.4",
"symfony/lock": "<4.4",
- "symfony/process": "<3.3"
+ "symfony/process": "<4.4"
},
"provide": {
"psr/log-implementation": "1.0"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "^3.4|^4.0|^5.0",
- "symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/event-dispatcher": "^4.3",
+ "symfony/config": "^4.4|^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/event-dispatcher": "^4.4|^5.0",
"symfony/lock": "^4.4|^5.0",
- "symfony/process": "^3.4|^4.0|^5.0",
- "symfony/var-dumper": "^4.3|^5.0"
+ "symfony/process": "^4.4|^5.0",
+ "symfony/var-dumper": "^4.4|^5.0"
},
"suggest": {
"psr/log": "For using the console logger",
@@ -3382,7 +3841,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3409,29 +3868,29 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2020-02-24T13:10:00+00:00"
+ "time": "2020-02-24T15:05:31+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22"
+ "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
- "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/a0b51ba9938ccc206d9284de7eb527c2d4550b44",
+ "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3462,82 +3921,25 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2020-02-04T09:01:01+00:00"
- },
- {
- "name": "symfony/debug",
- "version": "v4.4.5",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/debug.git",
- "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21",
- "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21",
- "shasum": ""
- },
- "require": {
- "php": "^7.1.3",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": "<3.4"
- },
- "require-dev": {
- "symfony/http-kernel": "^3.4|^4.0|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.4-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Debug\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Debug Component",
- "homepage": "https://symfony.com",
- "time": "2020-02-23T14:41:43+00:00"
+ "time": "2020-02-04T09:41:09+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be"
+ "reference": "24a938d9913f42d006ee1ca0164ea1f29c1067ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/89aa4b9ac6f1f35171b8621b24f60477312085be",
- "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/24a938d9913f42d006ee1ca0164ea1f29c1067ec",
+ "reference": "24a938d9913f42d006ee1ca0164ea1f29c1067ec",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "psr/log": "~1.0",
- "symfony/debug": "^4.4.5",
+ "php": "^7.2.5",
+ "psr/log": "^1.0",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
@@ -3547,7 +3949,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3574,41 +3976,41 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
- "time": "2020-02-26T11:45:31+00:00"
+ "time": "2020-02-29T10:07:09+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d"
+ "reference": "b45ad88b253c5a9702ce218e201d89c85d148cea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d",
- "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b45ad88b253c5a9702ce218e201d89c85d148cea",
+ "reference": "b45ad88b253c5a9702ce218e201d89c85d148cea",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/event-dispatcher-contracts": "^1.1"
+ "php": "^7.2.5",
+ "symfony/event-dispatcher-contracts": "^2"
},
"conflict": {
- "symfony/dependency-injection": "<3.4"
+ "symfony/dependency-injection": "<4.4"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
- "symfony/event-dispatcher-implementation": "1.1"
+ "symfony/event-dispatcher-implementation": "2.0"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "^3.4|^4.0|^5.0",
- "symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/http-foundation": "^3.4|^4.0|^5.0",
+ "symfony/config": "^4.4|^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/expression-language": "^4.4|^5.0",
+ "symfony/http-foundation": "^4.4|^5.0",
"symfony/service-contracts": "^1.1|^2",
- "symfony/stopwatch": "^3.4|^4.0|^5.0"
+ "symfony/stopwatch": "^4.4|^5.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -3617,7 +4019,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3644,33 +4046,33 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2020-02-04T09:32:40+00:00"
+ "time": "2020-02-22T20:09:08+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v1.1.7",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+ "reference": "af23c2584d4577d54661c434446fb8fbed6025dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
- "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/af23c2584d4577d54661c434446fb8fbed6025dd",
+ "reference": "af23c2584d4577d54661c434446fb8fbed6025dd",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5",
+ "psr/event-dispatcher": "^1"
},
"suggest": {
- "psr/event-dispatcher": "",
"symfony/event-dispatcher-implementation": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -3702,29 +4104,29 @@
"interoperability",
"standards"
],
- "time": "2019-09-17T09:54:03+00:00"
+ "time": "2019-11-18T17:27:11+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
+ "reference": "6251f201187ca9d66f6b099d3de65d279e971138"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
- "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/6251f201187ca9d66f6b099d3de65d279e971138",
+ "reference": "6251f201187ca9d66f6b099d3de65d279e971138",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3751,35 +4153,35 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2020-02-14T07:42:58+00:00"
+ "time": "2020-02-14T07:43:07+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648"
+ "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648",
- "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
+ "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/mime": "^4.3|^5.0",
+ "php": "^7.2.5",
+ "symfony/mime": "^4.4|^5.0",
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
"predis/predis": "~1.0",
- "symfony/expression-language": "^3.4|^4.0|^5.0"
+ "symfony/expression-language": "^4.4|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3806,59 +4208,65 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2020-02-13T19:40:01+00:00"
+ "time": "2020-02-14T07:43:07+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "8c8734486dada83a6041ab744709bdc1651a8462"
+ "reference": "021d7d54e080405678f2d8c54cb31d0bb03b4520"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8c8734486dada83a6041ab744709bdc1651a8462",
- "reference": "8c8734486dada83a6041ab744709bdc1651a8462",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/021d7d54e080405678f2d8c54cb31d0bb03b4520",
+ "reference": "021d7d54e080405678f2d8c54cb31d0bb03b4520",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"psr/log": "~1.0",
- "symfony/error-handler": "^4.4",
- "symfony/event-dispatcher": "^4.4",
+ "symfony/error-handler": "^4.4|^5.0",
+ "symfony/event-dispatcher": "^5.0",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-php73": "^1.9"
},
"conflict": {
- "symfony/browser-kit": "<4.3",
- "symfony/config": "<3.4",
- "symfony/console": ">=5",
- "symfony/dependency-injection": "<4.3",
- "symfony/translation": "<4.2",
- "twig/twig": "<1.34|<2.4,>=2"
+ "symfony/browser-kit": "<4.4",
+ "symfony/cache": "<5.0",
+ "symfony/config": "<5.0",
+ "symfony/dependency-injection": "<4.4",
+ "symfony/doctrine-bridge": "<5.0",
+ "symfony/form": "<5.0",
+ "symfony/http-client": "<5.0",
+ "symfony/mailer": "<5.0",
+ "symfony/messenger": "<5.0",
+ "symfony/translation": "<5.0",
+ "symfony/twig-bridge": "<5.0",
+ "symfony/validator": "<5.0",
+ "twig/twig": "<2.4"
},
"provide": {
"psr/log-implementation": "1.0"
},
"require-dev": {
"psr/cache": "~1.0",
- "symfony/browser-kit": "^4.3|^5.0",
- "symfony/config": "^3.4|^4.0|^5.0",
- "symfony/console": "^3.4|^4.0",
- "symfony/css-selector": "^3.4|^4.0|^5.0",
- "symfony/dependency-injection": "^4.3|^5.0",
- "symfony/dom-crawler": "^3.4|^4.0|^5.0",
- "symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/finder": "^3.4|^4.0|^5.0",
- "symfony/process": "^3.4|^4.0|^5.0",
- "symfony/routing": "^3.4|^4.0|^5.0",
- "symfony/stopwatch": "^3.4|^4.0|^5.0",
- "symfony/templating": "^3.4|^4.0|^5.0",
- "symfony/translation": "^4.2|^5.0",
+ "symfony/browser-kit": "^4.4|^5.0",
+ "symfony/config": "^5.0",
+ "symfony/console": "^4.4|^5.0",
+ "symfony/css-selector": "^4.4|^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/dom-crawler": "^4.4|^5.0",
+ "symfony/expression-language": "^4.4|^5.0",
+ "symfony/finder": "^4.4|^5.0",
+ "symfony/process": "^4.4|^5.0",
+ "symfony/routing": "^4.4|^5.0",
+ "symfony/stopwatch": "^4.4|^5.0",
+ "symfony/translation": "^4.4|^5.0",
"symfony/translation-contracts": "^1.1|^2",
- "twig/twig": "^1.34|^2.4|^3.0"
+ "twig/twig": "^2.4|^3.0"
},
"suggest": {
"symfony/browser-kit": "",
@@ -3869,7 +4277,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3896,7 +4304,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2020-02-29T10:31:38+00:00"
+ "time": "2020-02-29T10:41:30+00:00"
},
{
"name": "symfony/mime",
@@ -4421,25 +4829,25 @@
},
{
"name": "symfony/process",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7"
+ "reference": "fd4a86dd7e36437f2fc080d8c42c7415d828a0a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
- "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
+ "url": "https://api.github.com/repos/symfony/process/zipball/fd4a86dd7e36437f2fc080d8c42c7415d828a0a8",
+ "reference": "fd4a86dd7e36437f2fc080d8c42c7415d828a0a8",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4466,20 +4874,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2020-02-07T20:06:44+00:00"
+ "time": "2020-02-08T17:00:58+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v1.3.0",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "9d3e80d54d9ae747ad573cad796e8e247df7b796"
+ "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/9d3e80d54d9ae747ad573cad796e8e247df7b796",
- "reference": "9d3e80d54d9ae747ad573cad796e8e247df7b796",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/ce709cd9c90872c08c2427b45739d5f3c781ab4f",
+ "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f",
"shasum": ""
},
"require": {
@@ -4489,8 +4897,7 @@
},
"require-dev": {
"nyholm/psr7": "^1.1",
- "symfony/phpunit-bridge": "^4.4 || ^5.0",
- "zendframework/zend-diactoros": "^1.4.1 || ^2.0"
+ "symfony/phpunit-bridge": "^4.4 || ^5.0"
},
"suggest": {
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
@@ -4498,7 +4905,7 @@
"type": "symfony-bridge",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4531,38 +4938,38 @@
"psr-17",
"psr-7"
],
- "time": "2019-11-25T19:33:50+00:00"
+ "time": "2020-01-02T08:07:11+00:00"
},
{
"name": "symfony/routing",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "4124d621d0e445732520037f888a0456951bde8c"
+ "reference": "d6ca39fd05c1902bf34d724ba06fb8044a0b46de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/4124d621d0e445732520037f888a0456951bde8c",
- "reference": "4124d621d0e445732520037f888a0456951bde8c",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/d6ca39fd05c1902bf34d724ba06fb8044a0b46de",
+ "reference": "d6ca39fd05c1902bf34d724ba06fb8044a0b46de",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5"
},
"conflict": {
- "symfony/config": "<4.2",
- "symfony/dependency-injection": "<3.4",
- "symfony/yaml": "<3.4"
+ "symfony/config": "<5.0",
+ "symfony/dependency-injection": "<4.4",
+ "symfony/yaml": "<4.4"
},
"require-dev": {
"doctrine/annotations": "~1.2",
"psr/log": "~1.0",
- "symfony/config": "^4.2|^5.0",
- "symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/http-foundation": "^3.4|^4.0|^5.0",
- "symfony/yaml": "^3.4|^4.0|^5.0"
+ "symfony/config": "^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/expression-language": "^4.4|^5.0",
+ "symfony/http-foundation": "^4.4|^5.0",
+ "symfony/yaml": "^4.4|^5.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation loader",
@@ -4574,7 +4981,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4607,7 +5014,7 @@
"uri",
"url"
],
- "time": "2020-02-25T12:41:09+00:00"
+ "time": "2020-02-25T14:24:11+00:00"
},
{
"name": "symfony/service-contracts",
@@ -4669,42 +5076,43 @@
},
{
"name": "symfony/translation",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "0a19a77fba20818a969ef03fdaf1602de0546353"
+ "reference": "e9b93f42a1fd6aec6a0872d59ee5c8219a7d584b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353",
- "reference": "0a19a77fba20818a969ef03fdaf1602de0546353",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/e9b93f42a1fd6aec6a0872d59ee5c8219a7d584b",
+ "reference": "e9b93f42a1fd6aec6a0872d59ee5c8219a7d584b",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"symfony/polyfill-mbstring": "~1.0",
- "symfony/translation-contracts": "^1.1.6|^2"
+ "symfony/translation-contracts": "^2"
},
"conflict": {
- "symfony/config": "<3.4",
- "symfony/dependency-injection": "<3.4",
- "symfony/http-kernel": "<4.4",
- "symfony/yaml": "<3.4"
+ "symfony/config": "<4.4",
+ "symfony/dependency-injection": "<5.0",
+ "symfony/http-kernel": "<5.0",
+ "symfony/twig-bundle": "<5.0",
+ "symfony/yaml": "<4.4"
},
"provide": {
- "symfony/translation-implementation": "1.0"
+ "symfony/translation-implementation": "2.0"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "^3.4|^4.0|^5.0",
- "symfony/console": "^3.4|^4.0|^5.0",
- "symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/finder": "~2.8|~3.0|~4.0|^5.0",
- "symfony/http-kernel": "^4.4",
- "symfony/intl": "^3.4|^4.0|^5.0",
+ "symfony/config": "^4.4|^5.0",
+ "symfony/console": "^4.4|^5.0",
+ "symfony/dependency-injection": "^5.0",
+ "symfony/finder": "^4.4|^5.0",
+ "symfony/http-kernel": "^5.0",
+ "symfony/intl": "^4.4|^5.0",
"symfony/service-contracts": "^1.1.2|^2",
- "symfony/yaml": "^3.4|^4.0|^5.0"
+ "symfony/yaml": "^4.4|^5.0"
},
"suggest": {
"psr/log-implementation": "To use logging capability in translator",
@@ -4714,7 +5122,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4741,7 +5149,7 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2020-02-04T09:32:40+00:00"
+ "time": "2020-02-04T07:41:34+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -4802,32 +5210,31 @@
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "2572839911702b0405479410ea7a1334bfab0b96"
+ "reference": "3a37aeb1132d1035536d3d6aa9cb06c2ff9355e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2572839911702b0405479410ea7a1334bfab0b96",
- "reference": "2572839911702b0405479410ea7a1334bfab0b96",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3a37aeb1132d1035536d3d6aa9cb06c2ff9355e9",
+ "reference": "3a37aeb1132d1035536d3d6aa9cb06c2ff9355e9",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php72": "~1.5"
+ "php": "^7.2.5",
+ "symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
- "symfony/console": "<3.4"
+ "phpunit/phpunit": "<5.4.3",
+ "symfony/console": "<4.4"
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^3.4|^4.0|^5.0",
+ "symfony/console": "^4.4|^5.0",
"symfony/process": "^4.4|^5.0",
- "twig/twig": "^1.34|^2.4|^3.0"
+ "twig/twig": "^2.4|^3.0"
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -4840,7 +5247,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4874,31 +5281,31 @@
"debug",
"dump"
],
- "time": "2020-02-24T13:10:00+00:00"
+ "time": "2020-02-26T22:30:10+00:00"
},
{
"name": "symfony/yaml",
- "version": "v4.4.5",
+ "version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "94d005c176db2080e98825d98e01e8b311a97a88"
+ "reference": "a4b613d7e44f62941adff5a802cff70adee57d3f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/94d005c176db2080e98825d98e01e8b311a97a88",
- "reference": "94d005c176db2080e98825d98e01e8b311a97a88",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/a4b613d7e44f62941adff5a802cff70adee57d3f",
+ "reference": "a4b613d7e44f62941adff5a802cff70adee57d3f",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
- "symfony/console": "<3.4"
+ "symfony/console": "<4.4"
},
"require-dev": {
- "symfony/console": "^3.4|^4.0|^5.0"
+ "symfony/console": "^4.4|^5.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
@@ -4906,7 +5313,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4933,7 +5340,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2020-02-03T10:46:43+00:00"
+ "time": "2020-02-03T13:51:17+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -5181,30 +5588,35 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v3.6.0",
+ "version": "v4.1.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156"
+ "reference": "32bd5ca5a4170f88e27073353013d210a3354ae9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156",
- "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/32bd5ca5a4170f88e27073353013d210a3354ae9",
+ "reference": "32bd5ca5a4170f88e27073353013d210a3354ae9",
"shasum": ""
},
"require": {
- "php": "^5.4 || ^7.0",
- "phpoption/phpoption": "^1.5",
+ "php": "^5.5.9 || ^7.0",
+ "phpoption/phpoption": "^1.7.2",
"symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
+ "bamarni/composer-bin-plugin": "^1.3",
+ "ext-filter": "*",
"phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
},
+ "suggest": {
+ "ext-filter": "Required to use the boolean validator."
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.6-dev"
+ "dev-master": "4.1-dev"
}
},
"autoload": {
@@ -5234,75 +5646,56 @@
"env",
"environment"
],
- "time": "2019-09-10T21:37:39+00:00"
+ "time": "2020-03-01T23:56:01+00:00"
},
{
- "name": "zendframework/zend-diactoros",
- "version": "2.2.1",
+ "name": "voku/portable-ascii",
+ "version": "1.4.9",
"source": {
"type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "de5847b068362a88684a55b0dbb40d85986cfa52"
+ "url": "https://github.com/voku/portable-ascii.git",
+ "reference": "9fd2b224c71448b5f84aef9d499a1428d79776a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/de5847b068362a88684a55b0dbb40d85986cfa52",
- "reference": "de5847b068362a88684a55b0dbb40d85986cfa52",
+ "url": "https://api.github.com/repos/voku/portable-ascii/zipball/9fd2b224c71448b5f84aef9d499a1428d79776a2",
+ "reference": "9fd2b224c71448b5f84aef9d499a1428d79776a2",
"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"
+ "php": ">=7.0.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"
+ "phpunit/phpunit": "~6.0 || ~7.0"
+ },
+ "suggest": {
+ "ext-intl": "Use Intl for transliterator_transliterate() support"
},
"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/"
+ "voku\\": "src/voku/",
+ "voku\\tests\\": "tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-3-Clause"
+ "MIT"
],
- "description": "PSR HTTP Message implementations",
+ "authors": [
+ {
+ "name": "Lars Moelleken",
+ "homepage": "http://www.moelleken.org/"
+ }
+ ],
+ "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
+ "homepage": "https://github.com/voku/portable-ascii",
"keywords": [
- "http",
- "psr",
- "psr-7"
+ "ascii",
+ "clean",
+ "php"
],
- "abandoned": "laminas/laminas-diactoros",
- "time": "2019-11-13T19:16:13+00:00"
+ "time": "2020-03-06T02:47:42+00:00"
}
],
"packages-dev": [
@@ -5374,146 +5767,26 @@
],
"time": "2020-02-25T20:42:23+00:00"
},
- {
- "name": "barryvdh/laravel-ide-helper",
- "version": "v2.6.7",
- "source": {
- "type": "git",
- "url": "https://github.com/barryvdh/laravel-ide-helper.git",
- "reference": "edd69c5e0508972c81f1f7173236de2459c45814"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/edd69c5e0508972c81f1f7173236de2459c45814",
- "reference": "edd69c5e0508972c81f1f7173236de2459c45814",
- "shasum": ""
- },
- "require": {
- "barryvdh/reflection-docblock": "^2.0.6",
- "composer/composer": "^1.6",
- "doctrine/dbal": "~2.3",
- "illuminate/console": "^5.5|^6|^7",
- "illuminate/filesystem": "^5.5|^6|^7",
- "illuminate/support": "^5.5|^6|^7",
- "php": ">=7.2"
- },
- "require-dev": {
- "illuminate/config": "^5.5|^6|^7",
- "illuminate/view": "^5.5|^6|^7",
- "mockery/mockery": "^1.3",
- "orchestra/testbench": "^3|^4",
- "phpro/grumphp": "^0.17.1",
- "squizlabs/php_codesniffer": "^3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- },
- "laravel": {
- "providers": [
- "Barryvdh\\LaravelIdeHelper\\IdeHelperServiceProvider"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "Barryvdh\\LaravelIdeHelper\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Barry vd. Heuvel",
- "email": "barryvdh@gmail.com"
- }
- ],
- "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.",
- "keywords": [
- "autocomplete",
- "codeintel",
- "helper",
- "ide",
- "laravel",
- "netbeans",
- "phpdoc",
- "phpstorm",
- "sublime"
- ],
- "time": "2020-02-25T20:41:32+00:00"
- },
- {
- "name": "barryvdh/reflection-docblock",
- "version": "v2.0.6",
- "source": {
- "type": "git",
- "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
- "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16",
- "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0,<4.5"
- },
- "suggest": {
- "dflydev/markdown": "~1.0",
- "erusev/parsedown": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Barryvdh": [
- "src/"
- ]
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "mike.vanriel@naenius.com"
- }
- ],
- "time": "2018-12-13T10:34:14+00:00"
- },
{
"name": "beyondcode/laravel-dump-server",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/beyondcode/laravel-dump-server.git",
- "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a"
+ "reference": "1f1d18a2e43f96fd67c9f0269c53f8c3814867d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
- "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
+ "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/1f1d18a2e43f96fd67c9f0269c53f8c3814867d9",
+ "reference": "1f1d18a2e43f96fd67c9f0269c53f8c3814867d9",
"shasum": ""
},
"require": {
- "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0",
- "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0",
- "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0",
+ "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0|^7.0",
+ "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0|^7.0",
+ "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0|^7.0",
"php": "^7.1",
- "symfony/var-dumper": "^4.1.1"
+ "symfony/var-dumper": "^5.0"
},
"require-dev": {
"larapack/dd": "^1.0",
@@ -5542,9 +5815,9 @@
"authors": [
{
"name": "Marcel Pociot",
- "role": "Developer",
"email": "marcel@beyondco.de",
- "homepage": "https://beyondco.de"
+ "homepage": "https://beyondco.de",
+ "role": "Developer"
}
],
"description": "Symfony Var-Dump Server for Laravel",
@@ -5553,191 +5826,7 @@
"beyondcode",
"laravel-dump-server"
],
- "time": "2019-08-11T13:17:40+00:00"
- },
- {
- "name": "composer/composer",
- "version": "1.9.3",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/composer.git",
- "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/1291a16ce3f48bfdeca39d64fca4875098af4d7b",
- "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b",
- "shasum": ""
- },
- "require": {
- "composer/ca-bundle": "^1.0",
- "composer/semver": "^1.0",
- "composer/spdx-licenses": "^1.2",
- "composer/xdebug-handler": "^1.1",
- "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
- "php": "^5.3.2 || ^7.0",
- "psr/log": "^1.0",
- "seld/jsonlint": "^1.4",
- "seld/phar-utils": "^1.0",
- "symfony/console": "^2.7 || ^3.0 || ^4.0",
- "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
- "symfony/finder": "^2.7 || ^3.0 || ^4.0",
- "symfony/process": "^2.7 || ^3.0 || ^4.0"
- },
- "conflict": {
- "symfony/console": "2.8.38"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7",
- "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
- },
- "suggest": {
- "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
- "ext-zip": "Enabling the zip extension allows you to unzip archives",
- "ext-zlib": "Allow gzip compression of HTTP requests"
- },
- "bin": [
- "bin/composer"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.9-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Composer\\": "src/Composer"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nils Adermann",
- "email": "naderman@naderman.de",
- "homepage": "http://www.naderman.de"
- },
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
- "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
- "homepage": "https://getcomposer.org/",
- "keywords": [
- "autoload",
- "dependency",
- "package"
- ],
- "time": "2020-02-04T11:58:49+00:00"
- },
- {
- "name": "composer/spdx-licenses",
- "version": "1.5.3",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/spdx-licenses.git",
- "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
- "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.2 || ^7.0 || ^8.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Composer\\Spdx\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nils Adermann",
- "email": "naderman@naderman.de",
- "homepage": "http://www.naderman.de"
- },
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- },
- {
- "name": "Rob Bast",
- "email": "rob.bast@gmail.com",
- "homepage": "http://robbast.nl"
- }
- ],
- "description": "SPDX licenses list and validation library.",
- "keywords": [
- "license",
- "spdx",
- "validator"
- ],
- "time": "2020-02-14T07:44:31+00:00"
- },
- {
- "name": "composer/xdebug-handler",
- "version": "1.4.1",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/xdebug-handler.git",
- "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
- "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.2 || ^7.0 || ^8.0",
- "psr/log": "^1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Composer\\XdebugHandler\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "John Stevenson",
- "email": "john-stevenson@blueyonder.co.uk"
- }
- ],
- "description": "Restarts a process without Xdebug.",
- "keywords": [
- "Xdebug",
- "performance"
- ],
- "time": "2020-03-01T12:26:26+00:00"
+ "time": "2020-03-04T15:23:26+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -5926,197 +6015,44 @@
],
"time": "2016-01-20T08:20:44+00:00"
},
- {
- "name": "jakub-onderka/php-console-color",
- "version": "v0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
- "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4.0"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "1.0",
- "jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "~4.3",
- "squizlabs/php_codesniffer": "1.*"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "JakubOnderka\\PhpConsoleColor\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com"
- }
- ],
- "time": "2018-09-29T17:23:10+00:00"
- },
- {
- "name": "jakub-onderka/php-console-highlighter",
- "version": "v0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
- "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
- "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "jakub-onderka/php-console-color": "~0.2",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "jakub-onderka/php-code-style": "~1.0",
- "jakub-onderka/php-parallel-lint": "~1.0",
- "jakub-onderka/php-var-dump-check": "~0.1",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~1.5"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
- }
- ],
- "description": "Highlight PHP code in terminal",
- "time": "2018-09-29T18:48:56+00:00"
- },
- {
- "name": "justinrainbow/json-schema",
- "version": "5.2.9",
- "source": {
- "type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
- "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
- "json-schema/json-schema-test-suite": "1.2.0",
- "phpunit/phpunit": "^4.8.35"
- },
- "bin": [
- "bin/validate-json"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "JsonSchema\\": "src/JsonSchema/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bruno Prieto Reis",
- "email": "bruno.p.reis@gmail.com"
- },
- {
- "name": "Justin Rainbow",
- "email": "justin.rainbow@gmail.com"
- },
- {
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch"
- },
- {
- "name": "Robert Schönthal",
- "email": "seroscho@googlemail.com"
- }
- ],
- "description": "A library to validate a json schema.",
- "homepage": "https://github.com/justinrainbow/json-schema",
- "keywords": [
- "json",
- "schema"
- ],
- "time": "2019-09-25T14:49:45+00:00"
- },
{
"name": "laravel/browser-kit-testing",
- "version": "v5.1.3",
+ "version": "v6.0.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/browser-kit-testing.git",
- "reference": "cb0cf22cf38fe8796842adc8b9ad550ded2a1377"
+ "reference": "ead8d337031ba41a8a5c38dac1a6d158d91a4551"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/cb0cf22cf38fe8796842adc8b9ad550ded2a1377",
- "reference": "cb0cf22cf38fe8796842adc8b9ad550ded2a1377",
+ "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/ead8d337031ba41a8a5c38dac1a6d158d91a4551",
+ "reference": "ead8d337031ba41a8a5c38dac1a6d158d91a4551",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-json": "*",
- "illuminate/contracts": "~5.7.0|~5.8.0|^6.0",
- "illuminate/database": "~5.7.0|~5.8.0|^6.0",
- "illuminate/http": "~5.7.0|~5.8.0|^6.0",
- "illuminate/support": "~5.7.0|~5.8.0|^6.0",
+ "illuminate/contracts": "^7.0",
+ "illuminate/database": "^7.0",
+ "illuminate/http": "^7.0",
+ "illuminate/support": "^7.0",
+ "illuminate/testing": "^7.0",
"mockery/mockery": "^1.0",
- "php": ">=7.1.3",
- "phpunit/phpunit": "^7.0|^8.0",
- "symfony/console": "^4.2",
- "symfony/css-selector": "^4.2",
- "symfony/dom-crawler": "^4.2",
- "symfony/http-foundation": "^4.2",
- "symfony/http-kernel": "^4.2"
+ "php": "^7.2",
+ "phpunit/phpunit": "^8.5|^9.0",
+ "symfony/console": "^5.0",
+ "symfony/css-selector": "^5.0",
+ "symfony/dom-crawler": "^5.0",
+ "symfony/http-foundation": "^5.0",
+ "symfony/http-kernel": "^5.0"
},
"require-dev": {
- "laravel/framework": "~5.7.0|~5.8.0|^6.0"
+ "laravel/framework": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "6.x-dev"
}
},
"autoload": {
@@ -6139,7 +6075,7 @@
"laravel",
"testing"
],
- "time": "2019-07-30T14:57:44+00:00"
+ "time": "2020-03-03T13:37:48+00:00"
},
{
"name": "laravel/tinker",
@@ -6686,16 +6622,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.10.2",
+ "version": "v1.10.3",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9"
+ "reference": "451c3cd1418cf640de218914901e51b064abb093"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
- "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+ "reference": "451c3cd1418cf640de218914901e51b064abb093",
"shasum": ""
},
"require": {
@@ -6745,7 +6681,7 @@
"spy",
"stub"
],
- "time": "2020-01-20T15:57:02+00:00"
+ "time": "2020-03-05T15:02:03+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -7772,114 +7708,77 @@
"time": "2016-10-03T07:35:21+00:00"
},
{
- "name": "seld/jsonlint",
- "version": "1.7.2",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
- "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
- "shasum": ""
- },
- "require": {
- "php": "^5.3 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
- },
- "bin": [
- "bin/jsonlint"
- ],
- "type": "library",
- "autoload": {
- "psr-4": {
- "Seld\\JsonLint\\": "src/Seld/JsonLint/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
- "description": "JSON Linter",
- "keywords": [
- "json",
- "linter",
- "parser",
- "validator"
- ],
- "time": "2019-10-24T14:27:39+00:00"
- },
- {
- "name": "seld/phar-utils",
- "version": "1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/phar-utils.git",
- "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
- "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Seld\\PharUtils\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be"
- }
- ],
- "description": "PHAR file format utilities, for when PHP phars you up",
- "keywords": [
- "phar"
- ],
- "time": "2020-02-14T15:25:33+00:00"
- },
- {
- "name": "symfony/dom-crawler",
+ "name": "symfony/debug",
"version": "v4.4.5",
"source": {
"type": "git",
- "url": "https://github.com/symfony/dom-crawler.git",
- "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929"
+ "url": "https://github.com/symfony/debug.git",
+ "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/11dcf08f12f29981bf770f097a5d64d65bce5929",
- "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21",
+ "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21",
"shasum": ""
},
"require": {
"php": "^7.1.3",
+ "psr/log": "~1.0"
+ },
+ "conflict": {
+ "symfony/http-kernel": "<3.4"
+ },
+ "require-dev": {
+ "symfony/http-kernel": "^3.4|^4.0|^5.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Debug\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Debug Component",
+ "homepage": "https://symfony.com",
+ "time": "2020-02-23T14:41:43+00:00"
+ },
+ {
+ "name": "symfony/dom-crawler",
+ "version": "v5.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/dom-crawler.git",
+ "reference": "4368bdd61b83af365b8f23e9616d2a2ed52cbe7c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4368bdd61b83af365b8f23e9616d2a2ed52cbe7c",
+ "reference": "4368bdd61b83af365b8f23e9616d2a2ed52cbe7c",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.5",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0"
},
@@ -7888,7 +7787,7 @@
},
"require-dev": {
"masterminds/html5": "^2.6",
- "symfony/css-selector": "^3.4|^4.0|^5.0"
+ "symfony/css-selector": "^4.4|^5.0"
},
"suggest": {
"symfony/css-selector": ""
@@ -7896,7 +7795,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -7923,57 +7822,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2020-02-29T10:05:28+00:00"
- },
- {
- "name": "symfony/filesystem",
- "version": "v4.4.5",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/filesystem.git",
- "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd",
- "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd",
- "shasum": ""
- },
- "require": {
- "php": "^7.1.3",
- "symfony/polyfill-ctype": "~1.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.4-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Filesystem\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Filesystem Component",
- "homepage": "https://symfony.com",
- "time": "2020-01-21T08:20:44+00:00"
+ "time": "2020-02-29T10:07:09+00:00"
},
{
"name": "theseer/tokenizer",
@@ -8072,7 +7921,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=7.2.0",
+ "php": ">=7.2.5",
"ext-ctype": "*",
"ext-gd": "*",
"ext-json": "*",
diff --git a/config/mail.php b/config/mail.php
index 3c65eb3f..cfef410f 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -4,45 +4,71 @@ return [
/*
|--------------------------------------------------------------------------
- | Mail Driver
+ | Default Mailer
|--------------------------------------------------------------------------
|
- | Laravel supports both SMTP and PHP's "mail" function as drivers for the
- | sending of e-mail. You may specify which one you're using throughout
- | your application here. By default, Laravel is setup for SMTP mail.
+ | This option controls the default mailer that is used to send any email
+ | messages sent by your application. Alternative mailers may be setup
+ | and used as needed; however, this mailer will be used by default.
+ |
+ */
+
+ 'default' => env('MAIL_MAILER', 'smtp'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Mailer Configurations
+ |--------------------------------------------------------------------------
+ |
+ | Here you may configure all of the mailers used by your application plus
+ | their respective settings. Several examples have been configured for
+ | you and you are free to add your own as your application requires.
+ |
+ | Laravel supports a variety of mail "transport" drivers to be used while
+ | sending an e-mail. You will specify which one you are using for your
+ | mailers below. You are free to add additional mailers as required.
|
| Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array"
|
*/
- 'driver' => env('MAIL_DRIVER', 'smtp'),
+ 'mailers' => [
+ 'smtp' => [
+ 'transport' => 'smtp',
+ 'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+ 'port' => env('MAIL_PORT', 587),
+ 'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+ 'username' => env('MAIL_USERNAME'),
+ 'password' => env('MAIL_PASSWORD'),
+ ],
- /*
- |--------------------------------------------------------------------------
- | SMTP Host Address
- |--------------------------------------------------------------------------
- |
- | Here you may provide the host address of the SMTP server used by your
- | applications. A default option is provided that is compatible with
- | the Mailgun mail service which will provide reliable deliveries.
- |
- */
+ 'ses' => [
+ 'transport' => 'ses',
+ ],
- 'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+ 'mailgun' => [
+ 'transport' => 'mailgun',
+ ],
- /*
- |--------------------------------------------------------------------------
- | SMTP Host Port
- |--------------------------------------------------------------------------
- |
- | This is the SMTP port used by your application to deliver e-mails to
- | users of the application. Like the host we have set this value to
- | stay compatible with the Mailgun e-mail application by default.
- |
- */
+ 'postmark' => [
+ 'transport' => 'postmark',
+ ],
- 'port' => env('MAIL_PORT', 587),
+ 'sendmail' => [
+ 'transport' => 'sendmail',
+ 'path' => '/usr/sbin/sendmail -bs',
+ ],
+
+ 'log' => [
+ 'transport' => 'log',
+ 'channel' => env('MAIL_LOG_CHANNEL'),
+ ],
+
+ 'array' => [
+ 'transport' => 'array',
+ ],
+ ],
/*
|--------------------------------------------------------------------------
@@ -60,47 +86,6 @@ return [
'name' => env('MAIL_FROM_NAME', 'Example'),
],
- /*
- |--------------------------------------------------------------------------
- | E-Mail Encryption Protocol
- |--------------------------------------------------------------------------
- |
- | Here you may specify the encryption protocol that should be used when
- | the application send e-mail messages. A sensible default using the
- | transport layer security protocol should provide great security.
- |
- */
-
- 'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
- /*
- |--------------------------------------------------------------------------
- | SMTP Server Username
- |--------------------------------------------------------------------------
- |
- | If your SMTP server requires a username for authentication, you should
- | set it here. This will get used to authenticate with your server on
- | connection. You may also set the "password" value below this one.
- |
- */
-
- 'username' => env('MAIL_USERNAME'),
-
- 'password' => env('MAIL_PASSWORD'),
-
- /*
- |--------------------------------------------------------------------------
- | Sendmail System Path
- |--------------------------------------------------------------------------
- |
- | When using the "sendmail" driver to send e-mails, we will need to know
- | the path to where Sendmail lives on this server. A default path has
- | been provided here, which will work well on most of your systems.
- |
- */
-
- 'sendmail' => '/usr/sbin/sendmail -bs',
-
/*
|--------------------------------------------------------------------------
| Markdown Mail Settings
@@ -120,17 +105,4 @@ return [
],
],
- /*
- |--------------------------------------------------------------------------
- | Log Channel
- |--------------------------------------------------------------------------
- |
- | If you are using the "log" driver, you may specify the logging channel
- | if you prefer to keep mail messages separate from other log entries
- | for simpler reading. Otherwise, the default channel will be used.
- |
- */
-
- 'log_channel' => env('MAIL_LOG_CHANNEL'),
-
];
diff --git a/config/session.php b/config/session.php
index bf7b23b0..11e0b41d 100644
--- a/config/session.php
+++ b/config/session.php
@@ -161,7 +161,7 @@ return [
|
*/
- 'secure' => env('SESSION_SECURE_COOKIE', false),
+ 'secure' => env('SESSION_SECURE_COOKIE', null),
/*
|--------------------------------------------------------------------------
@@ -189,6 +189,6 @@ return [
|
*/
- 'same_site' => null,
+ 'same_site' => 'lax',
];
diff --git a/database/factories/PlayerModelFactory.php b/database/factories/PlayerModelFactory.php
index 1f331ddc..6722c1c2 100644
--- a/database/factories/PlayerModelFactory.php
+++ b/database/factories/PlayerModelFactory.php
@@ -1,5 +1,6 @@
define(Player::class, function (Faker\Generator $faker) {
diff --git a/database/factories/TextureModelFactory.php b/database/factories/TextureModelFactory.php
index 640aab74..fd04dee0 100644
--- a/database/factories/TextureModelFactory.php
+++ b/database/factories/TextureModelFactory.php
@@ -1,5 +1,6 @@
define(Texture::class, function (Faker\Generator $faker) {
@@ -15,27 +16,6 @@ $factory->define(Texture::class, function (Faker\Generator $faker) {
];
});
-$factory->defineAs(Texture::class, 'alex', function (Faker\Generator $faker) {
- return [
- 'name' => $faker->firstName,
- 'type' => 'alex',
- 'hash' => $faker->sha256,
- 'size' => rand(1, 2048),
- 'likes' => rand(1, 10),
- 'uploader' => factory(App\Models\User::class)->create()->uid,
- 'public' => true,
- 'upload_at' => $faker->dateTime,
- ];
-});
+$factory->state(Texture::class, 'alex', ['type' => 'alex']);
-$factory->defineAs(Texture::class, 'cape', function (Faker\Generator $faker) {
- return [
- 'name' => $faker->firstName,
- 'type' => 'cape',
- 'hash' => $faker->sha256,
- 'size' => rand(1, 2048),
- 'uploader' => factory(App\Models\User::class)->create()->uid,
- 'public' => true,
- 'upload_at' => $faker->dateTime,
- ];
-});
+$factory->state(Texture::class, 'cape', ['type' => 'cape']);
diff --git a/database/factories/UserModelFactory.php b/database/factories/UserModelFactory.php
index 3fba58ac..00239f0b 100644
--- a/database/factories/UserModelFactory.php
+++ b/database/factories/UserModelFactory.php
@@ -1,5 +1,6 @@
define(User::class, function (Faker\Generator $faker) {
];
});
-$factory->defineAs(User::class, 'admin', function (Faker\Generator $faker) {
- return [
- 'email' => $faker->email,
- 'nickname' => $faker->name,
- 'score' => 1000,
- 'avatar' => 0,
- 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')),
- 'ip' => '127.0.0.1',
- 'permission' => 1,
- 'verified' => true,
- 'last_sign_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- 'register_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- ];
-});
+$factory->state(User::class, 'admin', ['permission' => 1]);
-$factory->defineAs(User::class, 'superAdmin', function (Faker\Generator $faker) {
- return [
- 'email' => $faker->email,
- 'nickname' => $faker->name,
- 'score' => 1000,
- 'avatar' => 0,
- 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')),
- 'ip' => '127.0.0.1',
- 'permission' => 2,
- 'verified' => true,
- 'last_sign_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- 'register_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- ];
-});
+$factory->state(User::class, 'superAdmin', ['permission' => 2]);
-$factory->defineAs(User::class, 'banned', function (Faker\Generator $faker) {
- return [
- 'email' => $faker->email,
- 'nickname' => $faker->name,
- 'score' => 1000,
- 'avatar' => 0,
- 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')),
- 'ip' => '127.0.0.1',
- 'permission' => -1,
- 'verified' => true,
- 'last_sign_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- 'register_at' => $faker->dateTime->format('d-M-Y H:i:s'),
- ];
-});
+$factory->state(User::class, 'banned', ['permission' => -1]);
diff --git a/phpunit.xml b/phpunit.xml
index 63134b83..7bd16ba4 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -24,4 +24,7 @@
+
+
+
diff --git a/tests/BrowserKitTestCase.php b/tests/BrowserKitTestCase.php
index d4dfd0d6..6eb89941 100644
--- a/tests/BrowserKitTestCase.php
+++ b/tests/BrowserKitTestCase.php
@@ -45,7 +45,7 @@ class BrowserKitTestCase extends TestCase
if ($role == 'normal') {
$role = factory(\App\Models\User::class)->create();
} else {
- $role = factory(\App\Models\User::class, $role)->create();
+ $role = factory(\App\Models\User::class)->states($role)->create();
}
}
diff --git a/tests/HttpTest/ControllersTest/AdminControllerTest.php b/tests/HttpTest/ControllersTest/AdminControllerTest.php
index 329ce90e..339c2113 100644
--- a/tests/HttpTest/ControllersTest/AdminControllerTest.php
+++ b/tests/HttpTest/ControllersTest/AdminControllerTest.php
@@ -46,7 +46,7 @@ class AdminControllerTest extends TestCase
public function testSendNotification()
{
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$normal = factory(User::class)->create();
Notification::fake();
@@ -232,7 +232,7 @@ class AdminControllerTest extends TestCase
]);
// An admin operating on a super admin should be forbidden
- $superAdmin = factory(User::class, 'superAdmin')->create();
+ $superAdmin = factory(User::class)->states('superAdmin')->create();
$this->postJson('/admin/users', ['uid' => $superAdmin->uid])
->assertJson([
'code' => 1,
@@ -401,7 +401,7 @@ class AdminControllerTest extends TestCase
]);
// An admin cannot operate another admin's player
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$this->postJson(
'/admin/players',
['pid' => factory(Player::class)->create(['uid' => $admin->uid])->pid]
@@ -409,7 +409,7 @@ class AdminControllerTest extends TestCase
'code' => 1,
'message' => trans('admin.players.no-permission'),
]);
- $superAdmin = factory(User::class, 'superAdmin')->create();
+ $superAdmin = factory(User::class)->states('superAdmin')->create();
$this->postJson(
'/admin/players',
['pid' => factory(Player::class)->create(['uid' => $superAdmin->uid])->pid]
@@ -459,7 +459,7 @@ class AdminControllerTest extends TestCase
]);
$skin = factory(Texture::class)->create();
- $cape = factory(Texture::class, 'cape')->create();
+ $cape = factory(Texture::class)->states('cape')->create();
// Skin
$this->postJson('/admin/players', [
diff --git a/tests/HttpTest/ControllersTest/AuthControllerTest.php b/tests/HttpTest/ControllersTest/AuthControllerTest.php
index 7f803fee..f23b6ee4 100644
--- a/tests/HttpTest/ControllersTest/AuthControllerTest.php
+++ b/tests/HttpTest/ControllersTest/AuthControllerTest.php
@@ -228,7 +228,7 @@ class AuthControllerTest extends TestCase
$this->get('/auth/register')->assertSee('Register');
option(['user_can_register' => false]);
- $this->get('/auth/register')->assertSee(e(trans('auth.register.close')));
+ $this->get('/auth/register')->assertSee(trans('auth.register.close'));
}
public function testHandleRegister()
@@ -484,7 +484,7 @@ class AuthControllerTest extends TestCase
{
$this->get('/auth/forgot')->assertSee('Forgot Password');
- config(['mail.driver' => '']);
+ config(['mail.default' => '']);
$this->get('/auth/forgot')->assertSee(trans('auth.forgot.disabled'));
}
@@ -495,7 +495,7 @@ class AuthControllerTest extends TestCase
$filter = Filter::fake();
// Should be forbidden if "forgot password" is closed
- config(['mail.driver' => '']);
+ config(['mail.default' => '']);
$this->postJson('/auth/forgot', [
'email' => 'nope@nope.net',
'captcha' => 'a',
@@ -503,7 +503,7 @@ class AuthControllerTest extends TestCase
'code' => 1,
'message' => trans('auth.forgot.disabled'),
]);
- config(['mail.driver' => 'smtp']);
+ config(['mail.default' => 'smtp']);
$whip = new Whip();
$ip = $whip->getValidIpAddress();
@@ -748,7 +748,7 @@ class AuthControllerTest extends TestCase
$this->assertTrue(is_string($token));
}
- public function testOAuthLogin()
+ public function testOauthLogin()
{
Socialite::shouldReceive('driver')
->with('github')
@@ -763,7 +763,7 @@ class AuthControllerTest extends TestCase
$this->get('/auth/login/github')->assertRedirect();
}
- public function testOAuthCallback()
+ public function testOauthCallback()
{
Event::fake();
$filter = Filter::fake();
diff --git a/tests/HttpTest/ControllersTest/ClosetControllerTest.php b/tests/HttpTest/ControllersTest/ClosetControllerTest.php
index 982e2c7a..294d0056 100644
--- a/tests/HttpTest/ControllersTest/ClosetControllerTest.php
+++ b/tests/HttpTest/ControllersTest/ClosetControllerTest.php
@@ -56,7 +56,7 @@ class ClosetControllerTest extends TestCase
$this->assertCount(2, $result['items']);
// Get capes
- $cape = factory(Texture::class, 'cape')->create();
+ $cape = factory(Texture::class)->states('cape')->create();
$this->user->closet()->attach($cape->tid, ['item_name' => 'custom_name']);
$this->getJson('/user/closet/list?category=cape')
->assertJson(['data' => [
diff --git a/tests/HttpTest/ControllersTest/MarketControllerTest.php b/tests/HttpTest/ControllersTest/MarketControllerTest.php
index 117e10d5..6ad054ad 100644
--- a/tests/HttpTest/ControllersTest/MarketControllerTest.php
+++ b/tests/HttpTest/ControllersTest/MarketControllerTest.php
@@ -17,7 +17,7 @@ class MarketControllerTest extends TestCase
protected function setUp(): void
{
parent::setUp();
- $this->actingAs(factory(\App\Models\User::class, 'superAdmin')->create());
+ $this->actingAs(factory(\App\Models\User::class)->states('superAdmin')->create());
}
public function testDownload()
diff --git a/tests/HttpTest/ControllersTest/PlayerControllerTest.php b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
index 9c2d616c..77f75861 100644
--- a/tests/HttpTest/ControllersTest/PlayerControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
@@ -293,7 +293,7 @@ class PlayerControllerTest extends TestCase
$player = factory(Player::class)->create();
$user = $player->user;
$skin = factory(Texture::class)->create();
- $cape = factory(Texture::class, 'cape')->create();
+ $cape = factory(Texture::class)->states('cape')->create();
// Set a not-existed texture
$this->actingAs($user)
diff --git a/tests/HttpTest/ControllersTest/PluginControllerTest.php b/tests/HttpTest/ControllersTest/PluginControllerTest.php
index 5907b640..ca144258 100644
--- a/tests/HttpTest/ControllersTest/PluginControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PluginControllerTest.php
@@ -73,7 +73,7 @@ class PluginControllerTest extends TestCase
// Plugin is enabled but it doesn't have config view
$this->get('/admin/plugins/config/fake3')
- ->assertSee(e(trans('admin.plugins.operations.no-config-notice')))
+ ->assertSee(trans('admin.plugins.operations.no-config-notice'))
->assertNotFound();
// Plugin has config view
diff --git a/tests/HttpTest/ControllersTest/ReportControllerTest.php b/tests/HttpTest/ControllersTest/ReportControllerTest.php
index 7e3671b5..49bdbef2 100644
--- a/tests/HttpTest/ControllersTest/ReportControllerTest.php
+++ b/tests/HttpTest/ControllersTest/ReportControllerTest.php
@@ -121,7 +121,7 @@ class ReportControllerTest extends TestCase
public function testManage()
{
$uploader = factory(User::class)->create();
- $reporter = factory(User::class, 'admin')->create();
+ $reporter = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $uploader->uid]);
$report = new Report();
@@ -152,7 +152,7 @@ class ReportControllerTest extends TestCase
{
Event::fake();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $admin->uid]);
$report = new Report();
@@ -200,7 +200,7 @@ class ReportControllerTest extends TestCase
$uploader = factory(User::class)->create();
$reporter = factory(User::class)->create();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $uploader->uid]);
$report = new Report();
@@ -257,7 +257,7 @@ class ReportControllerTest extends TestCase
$uploader = factory(User::class)->create();
$reporter = factory(User::class)->create();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $uploader->uid]);
$report = new Report();
@@ -317,7 +317,7 @@ class ReportControllerTest extends TestCase
$uploader = factory(User::class)->create();
$reporter = factory(User::class)->create();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $uploader->uid]);
$report = new Report();
@@ -362,7 +362,7 @@ class ReportControllerTest extends TestCase
$uploader = factory(User::class)->create();
$reporter = factory(User::class)->create();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$texture = factory(Texture::class)->create(['uploader' => $uploader->uid]);
$report = new Report();
diff --git a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
index 56faf17a..6ec8cc87 100644
--- a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
+++ b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php
@@ -24,10 +24,10 @@ class SkinlibControllerTest extends TestCase
'total_pages' => 0,
]]);
- $steves = factory(Texture::class)->times(5)->create();
- $alexs = factory(Texture::class, 'alex')->times(5)->create();
+ $steves = factory(Texture::class, 5)->create();
+ $alexs = factory(Texture::class, 5)->states('alex')->create();
$skins = $steves->merge($alexs);
- $capes = factory(Texture::class, 'cape')->times(5)->create();
+ $capes = factory(Texture::class, 5)->states('cape')->create();
// Default arguments
$items = $this->getJson('/skinlib/data')
@@ -250,7 +250,7 @@ class SkinlibControllerTest extends TestCase
}));
// Administrators can see private textures
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$items = $this->actingAs($admin)
->getJson('/skinlib/data')
->assertJson(['data' => [
@@ -381,7 +381,6 @@ class SkinlibControllerTest extends TestCase
$file->path(),
'test.png',
'image/png',
- 50,
UPLOAD_ERR_NO_TMP_DIR,
true
);
@@ -942,7 +941,7 @@ class SkinlibControllerTest extends TestCase
]);
$this->assertEquals('steve', Texture::find($texture->tid)->type);
- $duplicate = factory(Texture::class, 'alex')->create([
+ $duplicate = factory(Texture::class)->states('alex')->create([
'uploader' => $other->uid,
'hash' => $texture->hash,
]);
diff --git a/tests/HttpTest/ControllersTest/TextureControllerTest.php b/tests/HttpTest/ControllersTest/TextureControllerTest.php
index 73116a57..fb536099 100644
--- a/tests/HttpTest/ControllersTest/TextureControllerTest.php
+++ b/tests/HttpTest/ControllersTest/TextureControllerTest.php
@@ -66,7 +66,7 @@ class TextureControllerTest extends TestCase
$this->get('/preview/'.$skin->tid)->assertHeader('Content-Type', 'image/png');
$this->assertTrue(Cache::has('preview-t'.$skin->tid));
- $cape = factory(Texture::class, 'cape')->create();
+ $cape = factory(Texture::class)->states('cape')->create();
$disk->put($cape->hash, '');
$this->get('/preview/'.$cape->tid.'?height=100')->assertHeader('Content-Type', 'image/png');
$this->assertTrue(Cache::has('preview-t'.$cape->tid));
diff --git a/tests/HttpTest/ControllersTest/UserControllerTest.php b/tests/HttpTest/ControllersTest/UserControllerTest.php
index d1f675c4..16bb6a9b 100644
--- a/tests/HttpTest/ControllersTest/UserControllerTest.php
+++ b/tests/HttpTest/ControllersTest/UserControllerTest.php
@@ -46,7 +46,7 @@ class UserControllerTest extends TestCase
$this->actingAs($user)
->get('/user')
->assertViewHas('statistics')
- ->assertSee((new Parsedown())->text(option_localized('announcement')))
+ ->assertSee((new Parsedown())->text(option_localized('announcement')), false)
->assertSee((string) $user->score);
$filter->assertApplied('grid:user.index');
$filter->assertApplied('user_avatar', function ($url, $user) use ($uid) {
@@ -513,7 +513,7 @@ class UserControllerTest extends TestCase
$user = factory(User::class)->create();
$uid = $user->uid;
$steve = factory(\App\Models\Texture::class)->create();
- $cape = factory(\App\Models\Texture::class, 'cape')->create();
+ $cape = factory(\App\Models\Texture::class)->states('cape')->create();
// Without `tid` field
$this->actingAs($user)
diff --git a/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php b/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php
index c63c9107..88d56f14 100644
--- a/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php
+++ b/tests/HttpTest/MiddlewareTest/CheckInstallationTest.php
@@ -28,7 +28,7 @@ class CheckInstallationTest extends TestCase
['version' => config('app.version')]
));
- $this->actingAs(factory(User::class, 'superAdmin')->make());
+ $this->actingAs(factory(User::class)->states('superAdmin')->make());
$this->mock(Filesystem::class, function ($mock) {
$mock->shouldReceive('exists')
->with(storage_path('install.lock'))
diff --git a/tests/HttpTest/MiddlewareTest/CheckRoleTest.php b/tests/HttpTest/MiddlewareTest/CheckRoleTest.php
index bb129cd0..2f305472 100644
--- a/tests/HttpTest/MiddlewareTest/CheckRoleTest.php
+++ b/tests/HttpTest/MiddlewareTest/CheckRoleTest.php
@@ -12,13 +12,13 @@ class CheckRole extends TestCase
->get('/admin')
->assertForbidden();
- $this->actAs(factory(User::class, 'admin')->create())
+ $this->actAs(factory(User::class)->states('admin')->create())
->get('/admin')
->assertSuccessful();
$this->get('/admin/update')->assertForbidden();
- $this->actAs(factory(User::class, 'superAdmin')->create())
+ $this->actAs(factory(User::class)->states('superAdmin')->create())
->get('/admin/update')
->assertSuccessful();
}
diff --git a/tests/HttpTest/MiddlewareTest/ForbiddenIETest.php b/tests/HttpTest/MiddlewareTest/ForbiddenIETest.php
index c6837d96..4cbae52d 100644
--- a/tests/HttpTest/MiddlewareTest/ForbiddenIETest.php
+++ b/tests/HttpTest/MiddlewareTest/ForbiddenIETest.php
@@ -7,8 +7,8 @@ class ForbiddenIETest extends TestCase
public function testHandle()
{
$this->get('/', ['user-agent' => 'MSIE'])
- ->assertSee(e(trans('errors.http.ie')));
+ ->assertSee(trans('errors.http.ie'));
$this->get('/', ['user-agent' => 'Trident'])
- ->assertSee(e(trans('errors.http.ie')));
+ ->assertSee(trans('errors.http.ie'));
}
}
diff --git a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
index 286058a7..65b93a55 100644
--- a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
+++ b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
@@ -12,7 +12,7 @@ class RedirectToSetupTest extends TestCase
public function testHandle()
{
- $superAdmin = factory(User::class, 'superAdmin')->create();
+ $superAdmin = factory(User::class)->states('superAdmin')->create();
$current = config('app.version');
config(['app.version' => '100.0.0']);
diff --git a/tests/HttpTest/MiddlewareTest/RejectBannedUserTest.php b/tests/HttpTest/MiddlewareTest/RejectBannedUserTest.php
index edd6691b..4c09eed6 100644
--- a/tests/HttpTest/MiddlewareTest/RejectBannedUserTest.php
+++ b/tests/HttpTest/MiddlewareTest/RejectBannedUserTest.php
@@ -8,7 +8,7 @@ class RejectBannedUserTest extends TestCase
{
public function testHandle()
{
- $user = factory(User::class, 'banned')->make();
+ $user = factory(User::class)->states('banned')->make();
$this->actingAs($user)->get('/user')->assertForbidden();
$this->get('/user', ['accept' => 'application/json'])
->assertForbidden()
diff --git a/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
index c592a3fa..f95cd26d 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/FootComposerTest.php
@@ -20,7 +20,7 @@ class FootComposerTest extends TestCase
]);
$user = factory(User::class)->create();
$this->actingAs($user);
- $this->get('/user')->assertSee('""');
+ $this->get('/user')->assertSee('""', false);
$crawler = new Crawler($this->get('/user')->getContent());
$this->assertCount(0, $crawler->filter('#disallowed'));
@@ -62,6 +62,6 @@ class FootComposerTest extends TestCase
$user = factory(User::class)->create();
$this->actingAs($user);
- $this->get('/user')->assertSee('');
+ $this->get('/user')->assertSee('', false);
}
}
diff --git a/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
index 528f8677..0ebc8e4f 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/HeadComposerTest.php
@@ -63,6 +63,6 @@ class HeadComposerTest extends TestCase
$event->contents[] = '';
});
- $this->get('/')->assertSee('');
+ $this->get('/')->assertSee('', false);
}
}
diff --git a/tests/HttpTest/ViewTest/ComposersTest/LanguagesMenuComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/LanguagesMenuComposerTest.php
index 873a13f6..c47c0caf 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/LanguagesMenuComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/LanguagesMenuComposerTest.php
@@ -7,6 +7,6 @@ class LanguagesMenuComposerTest extends TestCase
public function testCompose()
{
$this->get('/')->assertSee('?lang=en')->assertDontSee('en_US');
- $this->get('/?key=value')->assertSee('?key=value&lang=en');
+ $this->get('/?key=value')->assertSee('?key=value&lang=en');
}
}
diff --git a/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
index 1af39b7a..ddd1a1b0 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/SideMenuComposerTest.php
@@ -15,7 +15,7 @@ class SideMenuComposerTest extends TestCase
{
Event::fake();
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$this->actingAs($admin)->get('/user');
Event::assertDispatched(Events\ConfigureUserMenu::class);
Event::assertDispatched(Events\ConfigureExploreMenu::class);
@@ -53,7 +53,7 @@ class SideMenuComposerTest extends TestCase
);
});
- $admin = factory(User::class, 'admin')->create();
+ $admin = factory(User::class)->states('admin')->create();
$this->actingAs($admin)
->get('/admin')
->assertDontSee(trans('general.plugin-configs'));
diff --git a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
index c66c6506..9da18d22 100644
--- a/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
+++ b/tests/HttpTest/ViewTest/ComposersTest/UserPanelComposerTest.php
@@ -25,11 +25,11 @@ class UserPanelComposerTest extends TestCase
});
$this->get('/user')
- ->assertSee('Pro');
+ ->assertSee('Pro', false);
$user->permission = User::ADMIN;
$user->save();
$this->get('/user')
- ->assertSee('STAFF');
+ ->assertSee('STAFF', false);
}
}
diff --git a/tests/ModelsTest/PlayerTest.php b/tests/ModelsTest/PlayerTest.php
index fce2ebff..4eda20a7 100644
--- a/tests/ModelsTest/PlayerTest.php
+++ b/tests/ModelsTest/PlayerTest.php
@@ -15,7 +15,7 @@ class PlayerTest extends TestCase
$player = factory(Player::class)->create();
$this->assertEquals('default', $player->model);
- $alex = factory(Texture::class, 'alex')->create();
+ $alex = factory(Texture::class)->states('alex')->create();
$player->tid_skin = $alex->tid;
$player->save();
$player->refresh();
diff --git a/tests/ServicesTest/HookTest.php b/tests/ServicesTest/HookTest.php
index 664bd367..47f679f8 100644
--- a/tests/ServicesTest/HookTest.php
+++ b/tests/ServicesTest/HookTest.php
@@ -19,7 +19,7 @@ class HookTest extends TestCase
->get('/user')
->assertSee('Link A')
->assertSee('/to/a')
- ->assertSee('target="_blank"')
+ ->assertSee('target="_blank"', false)
->assertSee('fa-book');
// Out of bound
@@ -55,26 +55,26 @@ class HookTest extends TestCase
{
Hook::addStyleFileToPage('/style/all');
$this->get('/')
- ->assertSee('');
+ ->assertSee('', false);
Hook::addStyleFileToPage('/style/pattern', ['skinlib']);
$this->get('/')
->assertDontSee('');
$this->get('/skinlib')
- ->assertSee('');
+ ->assertSee('', false);
}
public function testAddScriptFileToPage()
{
Hook::addScriptFileToPage('/script/all');
$this->get('/')
- ->assertSee('');
+ ->assertSee('', false);
Hook::addScriptFileToPage('/script/pattern', ['skinlib']);
$this->get('/')
->assertDontSee('');
$this->get('/skinlib')
- ->assertSee('');
+ ->assertSee('', false);
}
public function testAddUserBadge()
@@ -82,7 +82,7 @@ class HookTest extends TestCase
Hook::addUserBadge('hi', 'green');
$this->actAs('normal')
->get('/user')
- ->assertSee('hi');
+ ->assertSee('hi', false);
}
public function testSendNotification()
diff --git a/tests/TestCase.php b/tests/TestCase.php
index f71efb79..e0411ffb 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -44,7 +44,7 @@ class TestCase extends \Illuminate\Foundation\Testing\TestCase
if ($role == 'normal') {
$role = factory(\App\Models\User::class)->create();
} else {
- $role = factory(\App\Models\User::class, $role)->create();
+ $role = factory(\App\Models\User::class)->states($role)->create();
}
}