diff --git a/.idea/php.xml b/.idea/php.xml
index bfdb4d6..ec40896 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -95,8 +95,6 @@
-
-
@@ -118,6 +116,14 @@
+
+
+
+
+
+
+
+
diff --git a/.idea/portal.iml b/.idea/portal.iml
index ec4d9c8..ccb8e5a 100644
--- a/.idea/portal.iml
+++ b/.idea/portal.iml
@@ -23,14 +23,14 @@
+
-
-
+
@@ -38,6 +38,7 @@
+
@@ -65,6 +66,7 @@
+
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index c6a6de6..ed1a5e0 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
@@ -60,7 +60,7 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
- * @return \App\User
+ * @return \App\Models\User
*/
protected function create(array $data)
{
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index cdbf925..e389b4c 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -6,7 +6,7 @@ use App\Http\Requests\EventRequest;
use App\Models\Event;
use App\Http\Resources\Event as EventResource;
use App\Models\EventGuestsNonUsers;
-use App\User;
+use App\Models\User;
use Illuminate\Http\Request;
class EventController extends Controller
diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 8db32b5..afb8a1c 100644
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
use App\Http\Resources\Image as ImageResource;
use App\Models\Memo;
-use App\User;
+use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Intervention\Image\Facades\Image;
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index efb04e1..995fad1 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use App\Jobs\SendMailNewUserJob;
-use App\User;
+use App\Models\User;
use App\Http\Resources\User as UserResource;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
diff --git a/app/Http/Resources/Event.php b/app/Http/Resources/Event.php
index 48f6c75..39ea749 100644
--- a/app/Http/Resources/Event.php
+++ b/app/Http/Resources/Event.php
@@ -3,7 +3,7 @@
namespace App\Http\Resources;
use App\Http\Resources\User as UserResource;
-use App\Http\Resources\EventCategory as EventCategoryRessource;
+use App\Http\Resources\EventCategory as EventCategoryResource;
use App\Http\Resources\EventGuestWithoutEmail as GuestsWithoutEmailResource;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -28,7 +28,7 @@ class Event extends JsonResource
'start_date' => $this->start_date,
'end_date' => $this->end_date,
'location' => $this->location,
- 'category' => new EventCategoryRessource($this->category),
+ 'category' => new EventCategoryResource($this->category),
'invitations' => UserResource::collection($this->guests),
'invitations-with-email' => [
'data' => GuestsWithoutEmailResource::collection($this->emailedGuests)
diff --git a/app/Jobs/SendMailNewUserJob.php b/app/Jobs/SendMailNewUserJob.php
index db18734..a69a66f 100644
--- a/app/Jobs/SendMailNewUserJob.php
+++ b/app/Jobs/SendMailNewUserJob.php
@@ -3,7 +3,7 @@
namespace App\Jobs;
use App\Mail\NewUserInvitation;
-use App\User;
+use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Mail/NewUserInvitation.php b/app/Mail/NewUserInvitation.php
index 4aa3acc..1b44d19 100644
--- a/app/Mail/NewUserInvitation.php
+++ b/app/Mail/NewUserInvitation.php
@@ -2,7 +2,7 @@
namespace App\Mail;
-use App\User;
+use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 1d4c312..c11635d 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -2,7 +2,6 @@
namespace App\Models;
-use App\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/app/Models/Memo.php b/app/Models/Memo.php
index 58df691..4ca65a4 100644
--- a/app/Models/Memo.php
+++ b/app/Models/Memo.php
@@ -2,7 +2,7 @@
namespace App\Models;
-use App\User;
+use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\Relations\MorphOne;
diff --git a/app/Models/ToDoList.php b/app/Models/ToDoList.php
index e2cbb44..347d4b1 100644
--- a/app/Models/ToDoList.php
+++ b/app/Models/ToDoList.php
@@ -2,7 +2,7 @@
namespace App\Models;
-use App\User;
+use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Models/User.php b/app/Models/User.php
index a7be794..a5ad5e8 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -1,6 +1,6 @@
'App\Policies\ModelPolicy',
- 'App\User' => 'App\Policies\UserPolicy',
+ 'App\Models\User' => 'App\Policies\UserPolicy',
'App\Models\Memo' => 'App\Policies\MemoPolicy',
'App\Models\ToDoList' => 'App\Policies\ToDoListPolicy',
'App\Models\Bookmark' => 'App\Policies\BookmarkPolicy',
diff --git a/composer.json b/composer.json
index 6b52104..9a0b890 100644
--- a/composer.json
+++ b/composer.json
@@ -11,18 +11,19 @@
"php": "^7.2.5",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
- "guzzlehttp/guzzle": "^6.5",
+ "guzzlehttp/guzzle": "^7.0.1",
"intervention/image": "^2.5",
- "laravel/framework": "^7.0",
- "laravel/passport": "^9.3",
+ "laravel/framework": "^8.0",
+ "laravel/legacy-factories": "^1.0",
+ "laravel/passport": "^10.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0"
},
"require-dev": {
- "facade/ignition": "^2.0",
+ "facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
- "nunomaduro/collision": "^4.1",
+ "nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^8.5",
"spatie/laravel-web-tinker": "^1.7"
},
diff --git a/composer.lock b/composer.lock
index 7838d32..aa47f38 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": "a45926d2c7834e2317faa380e750e44f",
+ "content-hash": "1a08ea37954efebb7e59951b5d396e76",
"packages": [
{
"name": "asm89/stack-cors",
@@ -60,16 +60,16 @@
},
{
"name": "brick/math",
- "version": "0.8.15",
+ "version": "0.9.1",
"source": {
"type": "git",
"url": "https://github.com/brick/math.git",
- "reference": "9b08d412b9da9455b210459ff71414de7e6241cd"
+ "reference": "283a40c901101e66de7061bd359252c013dcc43c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/brick/math/zipball/9b08d412b9da9455b210459ff71414de7e6241cd",
- "reference": "9b08d412b9da9455b210459ff71414de7e6241cd",
+ "url": "https://api.github.com/repos/brick/math/zipball/283a40c901101e66de7061bd359252c013dcc43c",
+ "reference": "283a40c901101e66de7061bd359252c013dcc43c",
"shasum": ""
},
"require": {
@@ -108,7 +108,7 @@
"type": "tidelift"
}
],
- "time": "2020-04-15T15:59:35+00:00"
+ "time": "2020-08-18T23:57:15+00:00"
},
{
"name": "defuse/php-encryption",
@@ -375,30 +375,29 @@
},
{
"name": "dragonmantank/cron-expression",
- "version": "v2.3.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "72b6fbf76adb3cf5bc0db68559b33d41219aba27"
+ "reference": "fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/72b6fbf76adb3cf5bc0db68559b33d41219aba27",
- "reference": "72b6fbf76adb3cf5bc0db68559b33d41219aba27",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52",
+ "reference": "fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.1"
+ },
+ "replace": {
+ "mtdowling/cron-expression": "^1.0"
},
"require-dev": {
+ "phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^6.4|^7.0"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
"autoload": {
"psr-4": {
"Cron\\": "src/Cron/"
@@ -409,11 +408,6 @@
"MIT"
],
"authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
{
"name": "Chris Tankersley",
"email": "chris@ctankersley.com",
@@ -425,20 +419,26 @@
"cron",
"schedule"
],
- "time": "2019-03-31T00:38:28+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/dragonmantank",
+ "type": "github"
+ }
+ ],
+ "time": "2020-08-21T02:30:13+00:00"
},
{
"name": "egulias/email-validator",
- "version": "2.1.18",
+ "version": "2.1.20",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441"
+ "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441",
- "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f46887bc48db66c7f38f668eb7d6ae54583617ff",
+ "reference": "f46887bc48db66c7f38f668eb7d6ae54583617ff",
"shasum": ""
},
"require": {
@@ -483,7 +483,7 @@
"validation",
"validator"
],
- "time": "2020-06-16T20:11:17+00:00"
+ "time": "2020-09-06T13:44:32+00:00"
},
{
"name": "fideloper/proxy",
@@ -664,38 +664,107 @@
"time": "2020-04-28T08:47:37+00:00"
},
{
- "name": "guzzlehttp/guzzle",
- "version": "6.5.5",
+ "name": "graham-campbell/result-type",
+ "version": "v1.0.1",
"source": {
"type": "git",
- "url": "https://github.com/guzzle/guzzle.git",
- "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+ "url": "https://github.com/GrahamCampbell/Result-Type.git",
+ "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
- "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+ "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/7e279d2cd5d7fbb156ce46daada972355cea27bb",
+ "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0|^8.0",
+ "phpoption/phpoption": "^1.7.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^6.5|^7.5|^8.5|^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GrahamCampbell\\ResultType\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com"
+ }
+ ],
+ "description": "An Implementation Of The Result Type",
+ "keywords": [
+ "Graham Campbell",
+ "GrahamCampbell",
+ "Result Type",
+ "Result-Type",
+ "result"
+ ],
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-04-13T13:17:36+00:00"
+ },
+ {
+ "name": "guzzlehttp/guzzle",
+ "version": "7.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2",
+ "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
- "php": ">=5.5",
- "symfony/polyfill-intl-idn": "^1.17.0"
+ "php": "^7.2.5",
+ "psr/http-client": "^1.0"
+ },
+ "provide": {
+ "psr/http-client-implementation": "1.0"
},
"require-dev": {
+ "ergebnis/composer-normalize": "^2.0",
"ext-curl": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+ "php-http/client-integration-tests": "dev-phpunit8",
+ "phpunit/phpunit": "^8.5.5",
"psr/log": "^1.1"
},
"suggest": {
+ "ext-curl": "Required for CURL handler support",
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.5-dev"
+ "dev-master": "7.0-dev"
}
},
"autoload": {
@@ -715,6 +784,11 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
}
],
"description": "Guzzle is a PHP HTTP client library",
@@ -725,10 +799,12 @@
"framework",
"http",
"http client",
+ "psr-18",
+ "psr-7",
"rest",
"web service"
],
- "time": "2020-06-16T21:01:06+00:00"
+ "time": "2020-06-27T10:33:25+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -922,175 +998,23 @@
],
"time": "2019-11-02T09:15:47+00:00"
},
- {
- "name": "laminas/laminas-diactoros",
- "version": "2.3.1",
- "source": {
- "type": "git",
- "url": "https://github.com/laminas/laminas-diactoros.git",
- "reference": "2ffc7cc816f6207b27923ee15edf6fac668390aa"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/2ffc7cc816f6207b27923ee15edf6fac668390aa",
- "reference": "2ffc7cc816f6207b27923ee15edf6fac668390aa",
- "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": "^2.2.1"
- },
- "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": "^1.0",
- "phpunit/phpunit": "^7.5.18"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3.x-dev",
- "dev-develop": "2.4.x-dev"
- },
- "laminas": {
- "config-provider": "Laminas\\Diactoros\\ConfigProvider",
- "module": "Laminas\\Diactoros"
- }
- },
- "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-17",
- "psr-7"
- ],
- "funding": [
- {
- "url": "https://funding.communitybridge.org/projects/laminas-project",
- "type": "community_bridge"
- }
- ],
- "time": "2020-07-07T15:34:31+00:00"
- },
- {
- "name": "laminas/laminas-zendframework-bridge",
- "version": "1.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
- "reference": "fcd87520e4943d968557803919523772475e8ea3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
- "reference": "fcd87520e4943d968557803919523772475e8ea3",
- "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"
- ],
- "funding": [
- {
- "url": "https://funding.communitybridge.org/projects/laminas-project",
- "type": "community_bridge"
- }
- ],
- "time": "2020-05-20T16:45:56+00:00"
- },
{
"name": "laravel/framework",
- "version": "v7.23.0",
+ "version": "v8.0.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b"
+ "reference": "43bea00fd27c76c01fd009e46725a54885f4d2a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b",
- "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/43bea00fd27c76c01fd009e46725a54885f4d2a5",
+ "reference": "43bea00fd27c76c01fd009e46725a54885f4d2a5",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.4|^2.0",
- "dragonmantank/cron-expression": "^2.0",
+ "dragonmantank/cron-expression": "^3.0",
"egulias/email-validator": "^2.1.10",
"ext-json": "*",
"ext-mbstring": "*",
@@ -1099,24 +1023,23 @@
"league/flysystem": "^1.0.34",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.17",
- "opis/closure": "^3.1",
- "php": "^7.2.5",
+ "opis/closure": "^3.5.3",
+ "php": "^7.3",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
- "ramsey/uuid": "^3.7|^4.0",
+ "ramsey/uuid": "^4.0",
"swiftmailer/swiftmailer": "^6.0",
- "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/polyfill-php73": "^1.17",
- "symfony/process": "^5.0",
- "symfony/routing": "^5.0",
- "symfony/var-dumper": "^5.0",
+ "symfony/console": "^5.1",
+ "symfony/error-handler": "^5.1",
+ "symfony/finder": "^5.1",
+ "symfony/http-foundation": "^5.1",
+ "symfony/http-kernel": "^5.1",
+ "symfony/mime": "^5.1",
+ "symfony/process": "^5.1",
+ "symfony/routing": "^5.1",
+ "symfony/var-dumper": "^5.1",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
- "vlucas/phpdotenv": "^4.0",
+ "vlucas/phpdotenv": "^5.0",
"voku/portable-ascii": "^1.4.8"
},
"conflict": {
@@ -1130,6 +1053,7 @@
"illuminate/broadcasting": "self.version",
"illuminate/bus": "self.version",
"illuminate/cache": "self.version",
+ "illuminate/collections": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
"illuminate/container": "self.version",
@@ -1142,6 +1066,7 @@
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/log": "self.version",
+ "illuminate/macroable": "self.version",
"illuminate/mail": "self.version",
"illuminate/notifications": "self.version",
"illuminate/pagination": "self.version",
@@ -1160,15 +1085,14 @@
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.4",
- "guzzlehttp/guzzle": "^6.3.1|^7.0",
+ "guzzlehttp/guzzle": "^6.5.5|^7.0.1",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.3.1",
- "moontoast/math": "^1.1",
- "orchestra/testbench-core": "^5.0",
+ "orchestra/testbench-core": "^6.0",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^8.4|^9.0",
"predis/predis": "^1.1.1",
- "symfony/cache": "^5.0"
+ "symfony/cache": "^5.1"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
@@ -1181,36 +1105,42 @@
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
"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 HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0).",
+ "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
"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).",
+ "predis/predis": "Required to use the predis connector (^1.1.2).",
"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 (^5.0).",
- "symfony/filesystem": "Required to create relative storage directory symbolic links (^5.0).",
+ "symfony/cache": "Required to PSR-6 cache bridge (^5.1).",
+ "symfony/filesystem": "Required to enable support for relative symbolic links (^5.1).",
"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": "7.x-dev"
+ "dev-master": "8.x-dev"
}
},
"autoload": {
"files": [
+ "src/Illuminate/Collections/helpers.php",
+ "src/Illuminate/Events/functions.php",
"src/Illuminate/Foundation/helpers.php",
"src/Illuminate/Support/helpers.php"
],
"psr-4": {
- "Illuminate\\": "src/Illuminate/"
+ "Illuminate\\": "src/Illuminate/",
+ "Illuminate\\Support\\": [
+ "src/Illuminate/Macroable/",
+ "src/Illuminate/Collections/"
+ ]
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1229,51 +1159,101 @@
"framework",
"laravel"
],
- "time": "2020-08-04T14:36:37+00:00"
+ "time": "2020-09-08T15:15:32+00:00"
},
{
- "name": "laravel/passport",
- "version": "v9.3.2",
+ "name": "laravel/legacy-factories",
+ "version": "v1.0.4",
"source": {
"type": "git",
- "url": "https://github.com/laravel/passport.git",
- "reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45"
+ "url": "https://github.com/laravel/legacy-factories.git",
+ "reference": "57117fdf788520a04c99f86205155f2799271af9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/passport/zipball/192fe387c1c173c12f82784e2a1b51be8bd1bf45",
- "reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45",
+ "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/57117fdf788520a04c99f86205155f2799271af9",
+ "reference": "57117fdf788520a04c99f86205155f2799271af9",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/macroable": "^8.0",
+ "php": "^7.3",
+ "symfony/finder": "^3.4|^4.0|^5.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ },
+ "laravel": {
+ "providers": [
+ "Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "files": [
+ "helpers.php"
+ ],
+ "psr-4": {
+ "Illuminate\\Database\\Eloquent\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "The legacy version of the Laravel Eloquent factories.",
+ "homepage": "http://laravel.com",
+ "time": "2020-06-09T15:09:18+00:00"
+ },
+ {
+ "name": "laravel/passport",
+ "version": "v10.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/passport.git",
+ "reference": "71d1a70a920f991e4f459f4896b9a32fefb3f5d5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/passport/zipball/71d1a70a920f991e4f459f4896b9a32fefb3f5d5",
+ "reference": "71d1a70a920f991e4f459f4896b9a32fefb3f5d5",
"shasum": ""
},
"require": {
"ext-json": "*",
"firebase/php-jwt": "^5.0",
- "guzzlehttp/guzzle": "^6.0|^7.0",
- "illuminate/auth": "^6.18.31|^7.22.4",
- "illuminate/console": "^6.18.31|^7.22.4",
- "illuminate/container": "^6.18.31|^7.22.4",
- "illuminate/contracts": "^6.18.31|^7.22.4",
- "illuminate/cookie": "^6.18.31|^7.22.4",
- "illuminate/database": "^6.18.31|^7.22.4",
- "illuminate/encryption": "^6.18.31|^7.22.4",
- "illuminate/http": "^6.18.31|^7.22.4",
- "illuminate/support": "^6.18.31|^7.22.4",
- "laminas/laminas-diactoros": "^2.2",
+ "illuminate/auth": "^8.0",
+ "illuminate/console": "^8.0",
+ "illuminate/container": "^8.0",
+ "illuminate/contracts": "^8.0",
+ "illuminate/cookie": "^8.0",
+ "illuminate/database": "^8.0",
+ "illuminate/encryption": "^8.0",
+ "illuminate/http": "^8.0",
+ "illuminate/support": "^8.0",
"league/oauth2-server": "^8.1",
- "nyholm/psr7": "^1.0",
- "php": "^7.2",
+ "nyholm/psr7": "^1.3",
+ "php": "^7.3",
"phpseclib/phpseclib": "^2.0",
"symfony/psr-http-message-bridge": "^2.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
- "orchestra/testbench": "^4.4|^5.0",
- "phpunit/phpunit": "^8.0"
+ "orchestra/testbench": "^6.0",
+ "phpunit/phpunit": "^9.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "9.x-dev"
+ "dev-master": "10.x-dev"
},
"laravel": {
"providers": [
@@ -1283,7 +1263,8 @@
},
"autoload": {
"psr-4": {
- "Laravel\\Passport\\": "src/"
+ "Laravel\\Passport\\": "src/",
+ "Laravel\\Passport\\Database\\Factories\\": "database/factories/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1302,20 +1283,20 @@
"oauth",
"passport"
],
- "time": "2020-07-27T18:34:39+00:00"
+ "time": "2020-09-08T15:27:48+00:00"
},
{
"name": "laravel/tinker",
- "version": "v2.4.1",
+ "version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62"
+ "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/3c9ef136ca59366bc1b50b7f2500a946d5149c62",
- "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/58424c24e8aec31c3a3ac54eb3adb15e8a0a067b",
+ "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b",
"shasum": ""
},
"require": {
@@ -1366,31 +1347,31 @@
"laravel",
"psysh"
],
- "time": "2020-07-07T15:10:00+00:00"
+ "time": "2020-08-11T19:28:08+00:00"
},
{
"name": "laravel/ui",
- "version": "v2.1.0",
+ "version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
- "reference": "da9350533d0da60d5dc42fb7de9c561c72129bba"
+ "reference": "456daa330a32483b0fa9794334e60af6b2db3bf6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/ui/zipball/da9350533d0da60d5dc42fb7de9c561c72129bba",
- "reference": "da9350533d0da60d5dc42fb7de9c561c72129bba",
+ "url": "https://api.github.com/repos/laravel/ui/zipball/456daa330a32483b0fa9794334e60af6b2db3bf6",
+ "reference": "456daa330a32483b0fa9794334e60af6b2db3bf6",
"shasum": ""
},
"require": {
- "illuminate/console": "^7.0",
- "illuminate/filesystem": "^7.0",
- "illuminate/support": "^7.0",
+ "illuminate/console": "^7.0|^8.0",
+ "illuminate/filesystem": "^7.0|^8.0",
+ "illuminate/support": "^7.0|^8.0",
"php": "^7.2.5"
},
"require-dev": {
"mockery/mockery": "^1.0",
- "phpunit/phpunit": "^8.0"
+ "phpunit/phpunit": "^8.0|^9.0"
},
"type": "library",
"extra": {
@@ -1421,20 +1402,20 @@
"laravel",
"ui"
],
- "time": "2020-06-30T20:56:33+00:00"
+ "time": "2020-09-08T13:09:39+00:00"
},
{
"name": "lcobucci/jwt",
- "version": "3.3.2",
+ "version": "3.3.3",
"source": {
"type": "git",
"url": "https://github.com/lcobucci/jwt.git",
- "reference": "56f10808089e38623345e28af2f2d5e4eb579455"
+ "reference": "c1123697f6a2ec29162b82f170dd4a491f524773"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lcobucci/jwt/zipball/56f10808089e38623345e28af2f2d5e4eb579455",
- "reference": "56f10808089e38623345e28af2f2d5e4eb579455",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c1123697f6a2ec29162b82f170dd4a491f524773",
+ "reference": "c1123697f6a2ec29162b82f170dd4a491f524773",
"shasum": ""
},
"require": {
@@ -1486,20 +1467,20 @@
"type": "patreon"
}
],
- "time": "2020-05-22T08:21:12+00:00"
+ "time": "2020-08-20T13:22:28+00:00"
},
{
"name": "league/commonmark",
- "version": "1.5.3",
+ "version": "1.5.4",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "2574454b97e4103dc4e36917bd783b25624aefcd"
+ "reference": "21819c989e69bab07e933866ad30c7e3f32984ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2574454b97e4103dc4e36917bd783b25624aefcd",
- "reference": "2574454b97e4103dc4e36917bd783b25624aefcd",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba",
+ "reference": "21819c989e69bab07e933866ad30c7e3f32984ba",
"shasum": ""
},
"require": {
@@ -1581,7 +1562,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-19T22:47:30+00:00"
+ "time": "2020-08-18T01:19:12+00:00"
},
{
"name": "league/event",
@@ -1635,28 +1616,29 @@
},
{
"name": "league/flysystem",
- "version": "1.0.70",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493"
+ "reference": "9be3b16c877d477357c015cec057548cf9b2a14a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493",
- "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a",
+ "reference": "9be3b16c877d477357c015cec057548cf9b2a14a",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
- "php": ">=5.5.9"
+ "league/mime-type-detection": "^1.3",
+ "php": "^7.2.5 || ^8.0"
},
"conflict": {
"league/flysystem-sftp": "<1.0.6"
},
"require-dev": {
- "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
- "phpunit/phpunit": "^5.7.26"
+ "phpspec/prophecy": "^1.11.1",
+ "phpunit/phpunit": "^8.5.8"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -1721,7 +1703,58 @@
"type": "other"
}
],
- "time": "2020-07-26T07:20:36+00:00"
+ "time": "2020-08-23T07:39:11+00:00"
+ },
+ {
+ "name": "league/mime-type-detection",
+ "version": "1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/mime-type-detection.git",
+ "reference": "fda190b62b962d96a069fcc414d781db66d65b69"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69",
+ "reference": "fda190b62b962d96a069fcc414d781db66d65b69",
+ "shasum": ""
+ },
+ "require": {
+ "ext-fileinfo": "*",
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "^0.12.36",
+ "phpunit/phpunit": "^8.5.8"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\MimeTypeDetection\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Frank de Jonge",
+ "email": "info@frankdejonge.nl"
+ }
+ ],
+ "description": "Mime-type detection for Flysystem",
+ "funding": [
+ {
+ "url": "https://github.com/frankdejonge",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-08-09T10:34:01+00:00"
},
{
"name": "league/oauth2-server",
@@ -1899,16 +1932,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.38.0",
+ "version": "2.39.2",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b"
+ "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b",
- "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/326efde1bc09077a26cb77f6e2e32e13f06c27f2",
+ "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2",
"shasum": ""
},
"require": {
@@ -1921,7 +1954,7 @@
"doctrine/orm": "^2.7",
"friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
"kylekatarnls/multi-tester": "^2.0",
- "phpmd/phpmd": "^2.8",
+ "phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.35",
"phpunit/phpunit": "^7.5 || ^8.0",
@@ -1984,20 +2017,20 @@
"type": "tidelift"
}
],
- "time": "2020-08-04T19:12:46+00:00"
+ "time": "2020-09-10T12:16:42+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.7.0",
+ "version": "v4.9.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300"
+ "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
- "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/88e519766fc58bd46b8265561fb79b54e2e00b28",
+ "reference": "88e519766fc58bd46b8265561fb79b54e2e00b28",
"shasum": ""
},
"require": {
@@ -2005,8 +2038,8 @@
"php": ">=7.0"
},
"require-dev": {
- "ircmaxell/php-yacc": "0.0.5",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+ "ircmaxell/php-yacc": "^0.0.7",
+ "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/php-parse"
@@ -2014,7 +2047,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.7-dev"
+ "dev-master": "4.9-dev"
}
},
"autoload": {
@@ -2036,7 +2069,7 @@
"parser",
"php"
],
- "time": "2020-07-25T13:18:53+00:00"
+ "time": "2020-08-30T16:15:20+00:00"
},
{
"name": "nyholm/psr7",
@@ -2113,16 +2146,16 @@
},
{
"name": "opis/closure",
- "version": "3.5.5",
+ "version": "3.5.7",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c"
+ "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
- "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
+ "url": "https://api.github.com/repos/opis/closure/zipball/4531e53afe2fc660403e76fb7644e95998bff7bf",
+ "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf",
"shasum": ""
},
"require": {
@@ -2170,7 +2203,7 @@
"serialization",
"serialize"
],
- "time": "2020-06-17T14:59:55+00:00"
+ "time": "2020-09-06T17:02:15+00:00"
},
{
"name": "paragonie/random_compat",
@@ -2334,16 +2367,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.28",
+ "version": "2.0.29",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
+ "reference": "497856a8d997f640b4a516062f84228a772a48a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
- "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8",
+ "reference": "497856a8d997f640b4a516062f84228a772a48a8",
"shasum": ""
},
"require": {
@@ -2352,7 +2385,6 @@
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "^4.8.35|^5.7|^6.0",
- "sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
@@ -2436,7 +2468,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-08T09:08:33+00:00"
+ "time": "2020-09-08T04:24:43+00:00"
},
{
"name": "psr/container",
@@ -2533,6 +2565,55 @@
],
"time": "2019-01-08T18:20:26+00:00"
},
+ {
+ "name": "psr/http-client",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-client.git",
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0 || ^8.0",
+ "psr/http-message": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP clients",
+ "homepage": "https://github.com/php-fig/http-client",
+ "keywords": [
+ "http",
+ "http-client",
+ "psr",
+ "psr-18"
+ ],
+ "time": "2020-06-29T06:28:15+00:00"
+ },
{
"name": "psr/http-factory",
"version": "1.0.1",
@@ -2844,35 +2925,38 @@
},
{
"name": "ramsey/collection",
- "version": "1.0.1",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/collection.git",
- "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca"
+ "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/collection/zipball/925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca",
- "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca",
+ "url": "https://api.github.com/repos/ramsey/collection/zipball/24d93aefb2cd786b7edd9f45b554aea20b28b9b1",
+ "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1",
"shasum": ""
},
"require": {
- "php": "^7.2"
+ "php": "^7.2 || ^8"
},
"require-dev": {
- "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+ "captainhook/captainhook": "^5.3",
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "ergebnis/composer-normalize": "^2.6",
"fzaninotto/faker": "^1.5",
- "jakub-onderka/php-parallel-lint": "^1",
+ "hamcrest/hamcrest-php": "^2",
"jangregor/phpstan-prophecy": "^0.6",
"mockery/mockery": "^1.3",
"phpstan/extension-installer": "^1",
- "phpstan/phpdoc-parser": "0.4.1",
- "phpstan/phpstan": "^0.12",
- "phpstan/phpstan-mockery": "^0.12",
- "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/phpstan": "^0.12.32",
+ "phpstan/phpstan-mockery": "^0.12.5",
+ "phpstan/phpstan-phpunit": "^0.12.11",
"phpunit/phpunit": "^8.5",
- "slevomat/coding-standard": "^6.0",
- "squizlabs/php_codesniffer": "^3.5"
+ "psy/psysh": "^0.10.4",
+ "slevomat/coding-standard": "^6.3",
+ "squizlabs/php_codesniffer": "^3.5",
+ "vimeo/psalm": "^3.12.2"
},
"type": "library",
"autoload": {
@@ -2892,7 +2976,6 @@
}
],
"description": "A PHP 7.2+ library for representing and manipulating collections.",
- "homepage": "https://github.com/ramsey/collection",
"keywords": [
"array",
"collection",
@@ -2901,24 +2984,30 @@
"queue",
"set"
],
- "time": "2020-01-05T00:22:59+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/ramsey",
+ "type": "github"
+ }
+ ],
+ "time": "2020-09-10T20:58:17+00:00"
},
{
"name": "ramsey/uuid",
- "version": "4.1.0",
+ "version": "4.1.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43"
+ "reference": "cd4032040a750077205918c86049aa0f43d22947"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/uuid/zipball/988dbefc7878d0a35f12afb4df1f7dd0bd153c43",
- "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43",
+ "url": "https://api.github.com/repos/ramsey/uuid/zipball/cd4032040a750077205918c86049aa0f43d22947",
+ "reference": "cd4032040a750077205918c86049aa0f43d22947",
"shasum": ""
},
"require": {
- "brick/math": "^0.8",
+ "brick/math": "^0.8 || ^0.9",
"ext-json": "*",
"php": "^7.2 || ^8",
"ramsey/collection": "^1.0",
@@ -2988,7 +3077,7 @@
"type": "github"
}
],
- "time": "2020-07-28T16:51:01+00:00"
+ "time": "2020-08-18T17:17:46+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -3054,16 +3143,16 @@
},
{
"name": "symfony/console",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "2226c68009627934b8cfc01260b4d287eab070df"
+ "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/2226c68009627934b8cfc01260b4d287eab070df",
- "reference": "2226c68009627934b8cfc01260b4d287eab070df",
+ "url": "https://api.github.com/repos/symfony/console/zipball/186f395b256065ba9b890c0a4e48a91d598fa2cf",
+ "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf",
"shasum": ""
},
"require": {
@@ -3143,11 +3232,11 @@
"type": "tidelift"
}
],
- "time": "2020-07-06T13:23:11+00:00"
+ "time": "2020-09-02T07:07:40+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3214,16 +3303,16 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v2.1.3",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
+ "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
- "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+ "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
"shasum": ""
},
"require": {
@@ -3232,7 +3321,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -3274,20 +3363,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-06T08:49:21+00:00"
+ "time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b"
+ "reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b",
- "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/525636d4b84e06c6ca72d96b6856b5b169416e6a",
+ "reference": "525636d4b84e06c6ca72d96b6856b5b169416e6a",
"shasum": ""
},
"require": {
@@ -3345,20 +3434,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-23T08:36:24+00:00"
+ "time": "2020-08-17T10:01:29+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "7827d55911f91c070fc293ea51a06eec80797d76"
+ "reference": "94871fc0a69c3c5da57764187724cdce0755899c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7827d55911f91c070fc293ea51a06eec80797d76",
- "reference": "7827d55911f91c070fc293ea51a06eec80797d76",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/94871fc0a69c3c5da57764187724cdce0755899c",
+ "reference": "94871fc0a69c3c5da57764187724cdce0755899c",
"shasum": ""
},
"require": {
@@ -3431,20 +3520,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-18T18:24:02+00:00"
+ "time": "2020-08-13T14:19:42+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v2.1.3",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b"
+ "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f6f613d74cfc5a623fc36294d3451eb7fa5a042b",
- "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2",
+ "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2",
"shasum": ""
},
"require": {
@@ -3457,7 +3546,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -3507,20 +3596,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-06T13:23:11+00:00"
+ "time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
+ "reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
- "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/2b765f0cf6612b3636e738c0689b29aa63088d5d",
+ "reference": "2b765f0cf6612b3636e738c0689b29aa63088d5d",
"shasum": ""
},
"require": {
@@ -3570,20 +3659,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-08-17T10:01:29+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702"
+ "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1f0d6627e680591c61e9176f04a0dc887b4e6702",
- "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/41a4647f12870e9d41d9a7d72ff0614a27208558",
+ "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558",
"shasum": ""
},
"require": {
@@ -3645,20 +3734,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-23T10:04:31+00:00"
+ "time": "2020-08-17T07:48:54+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3"
+ "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d6dd8f6420e377970ddad0d6317d4ce4186fc6b3",
- "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3e32676e6cb5d2081c91a56783471ff8a7f7110b",
+ "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b",
"shasum": ""
},
"require": {
@@ -3758,20 +3847,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-24T04:22:56+00:00"
+ "time": "2020-09-02T08:15:18+00:00"
},
{
"name": "symfony/mime",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6"
+ "reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/149fb0ad35aae3c7637b496b38478797fa6a7ea6",
- "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/89a2c9b4cb7b5aa516cf55f5194c384f444c81dc",
+ "reference": "89a2c9b4cb7b5aa516cf55f5194c384f444c81dc",
"shasum": ""
},
"require": {
@@ -3835,7 +3924,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-23T10:04:31+00:00"
+ "time": "2020-08-17T10:01:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4619,7 +4708,7 @@
},
{
"name": "symfony/process",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -4761,16 +4850,16 @@
},
{
"name": "symfony/routing",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d"
+ "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/08c9a82f09d12ee048f85e76e0d783f82844eb5d",
- "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/47b0218344cb6af25c93ca8ee1137fafbee5005d",
+ "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d",
"shasum": ""
},
"require": {
@@ -4849,20 +4938,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-18T18:24:02+00:00"
+ "time": "2020-08-10T08:03:57+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v2.1.3",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
- "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+ "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
"shasum": ""
},
"require": {
@@ -4875,7 +4964,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4925,20 +5014,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-06T13:23:11+00:00"
+ "time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/string",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b"
+ "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/f629ba9b611c76224feb21fe2bcbf0b6f992300b",
- "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b",
+ "url": "https://api.github.com/repos/symfony/string/zipball/0de4cc1e18bb596226c06a82e2e7e9bc6001a63a",
+ "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a",
"shasum": ""
},
"require": {
@@ -5010,20 +5099,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-08T08:27:49+00:00"
+ "time": "2020-08-17T07:48:54+00:00"
},
{
"name": "symfony/translation",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427"
+ "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/4b9bf719f0fa5b05253c37fc7b335337ec7ec427",
- "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/917b02cdc5f33e0309b8e9d33ee1480b20687413",
+ "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413",
"shasum": ""
},
"require": {
@@ -5102,20 +5191,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-30T17:42:22+00:00"
+ "time": "2020-08-17T10:01:29+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v2.1.3",
+ "version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63"
+ "reference": "77ce1c3627c9f39643acd9af086631f842c50c4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63",
- "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/77ce1c3627c9f39643acd9af086631f842c50c4d",
+ "reference": "77ce1c3627c9f39643acd9af086631f842c50c4d",
"shasum": ""
},
"require": {
@@ -5127,7 +5216,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -5177,20 +5266,20 @@
"type": "tidelift"
}
],
- "time": "2020-07-06T13:23:11+00:00"
+ "time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v5.1.3",
+ "version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a"
+ "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2ebe1c7bb52052624d6dc1250f4abe525655d75a",
- "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b43a3905262bcf97b2510f0621f859ca4f5287be",
+ "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be",
"shasum": ""
},
"require": {
@@ -5267,7 +5356,7 @@
"type": "tidelift"
}
],
- "time": "2020-06-24T13:36:18+00:00"
+ "time": "2020-08-17T07:42:30+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -5320,37 +5409,39 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v4.1.8",
+ "version": "v5.1.0",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "572af79d913627a9d70374d27a6f5d689a35de32"
+ "reference": "448c76d7a9e30c341ff5bc367a923af74ae18467"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/572af79d913627a9d70374d27a6f5d689a35de32",
- "reference": "572af79d913627a9d70374d27a6f5d689a35de32",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/448c76d7a9e30c341ff5bc367a923af74ae18467",
+ "reference": "448c76d7a9e30c341ff5bc367a923af74ae18467",
"shasum": ""
},
"require": {
- "php": "^5.5.9 || ^7.0 || ^8.0",
- "phpoption/phpoption": "^1.7.3",
- "symfony/polyfill-ctype": "^1.17"
+ "ext-pcre": "*",
+ "graham-campbell/result-type": "^1.0.1",
+ "php": "^7.1.3 || ^8.0",
+ "phpoption/phpoption": "^1.7.4",
+ "symfony/polyfill-ctype": "^1.17",
+ "symfony/polyfill-mbstring": "^1.17",
+ "symfony/polyfill-php80": "^1.17"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-filter": "*",
- "ext-pcre": "*",
- "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
+ "phpunit/phpunit": "^7.5.20 || ^8.5.2 || ^9.0"
},
"suggest": {
- "ext-filter": "Required to use the boolean validator.",
- "ext-pcre": "Required to use most of the library."
+ "ext-filter": "Required to use the boolean validator."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "5.1-dev"
}
},
"autoload": {
@@ -5390,7 +5481,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T19:22:52+00:00"
+ "time": "2020-07-14T19:26:25+00:00"
},
{
"name": "voku/portable-ascii",
@@ -5536,21 +5627,21 @@
},
{
"name": "facade/flare-client-php",
- "version": "1.3.4",
+ "version": "1.3.5",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
- "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4"
+ "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/0eeb0de4fc1078433f0915010bd8f41e998adcb4",
- "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/25907a113bfc212a38d458ae365bfb902b4e7fb8",
+ "reference": "25907a113bfc212a38d458ae365bfb902b4e7fb8",
"shasum": ""
},
"require": {
"facade/ignition-contracts": "~1.0",
- "illuminate/pipeline": "^5.5|^6.0|^7.0",
+ "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0",
"php": "^7.1",
"symfony/http-foundation": "^3.3|^4.1|^5.0",
"symfony/mime": "^3.4|^4.0|^5.1",
@@ -5594,20 +5685,20 @@
"type": "github"
}
],
- "time": "2020-07-13T23:25:57+00:00"
+ "time": "2020-08-26T18:06:23+00:00"
},
{
"name": "facade/ignition",
- "version": "2.3.5",
+ "version": "2.3.7",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7"
+ "reference": "b364db8860a63c1fb58b72b9718863c21df08762"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/58dc4a8df3d41174c677a370b6779b694e4539e7",
- "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/b364db8860a63c1fb58b72b9718863c21df08762",
+ "reference": "b364db8860a63c1fb58b72b9718863c21df08762",
"shasum": ""
},
"require": {
@@ -5626,7 +5717,7 @@
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
"mockery/mockery": "^1.3",
- "orchestra/testbench": "5.0",
+ "orchestra/testbench": "^5.0|^6.0",
"psalm/plugin-laravel": "^1.2"
},
"suggest": {
@@ -5666,7 +5757,7 @@
"laravel",
"page"
],
- "time": "2020-08-01T21:20:01+00:00"
+ "time": "2020-09-06T19:26:27+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -5877,16 +5968,16 @@
},
{
"name": "mockery/mockery",
- "version": "1.4.1",
+ "version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6"
+ "reference": "20cab678faed06fac225193be281ea0fddb43b93"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/1404386ca3410b04fe58b9517e85d702ab33b2c6",
- "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/20cab678faed06fac225193be281ea0fddb43b93",
+ "reference": "20cab678faed06fac225193be281ea0fddb43b93",
"shasum": ""
},
"require": {
@@ -5898,7 +5989,7 @@
"phpunit/phpunit": "<8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.5 || ^9.0"
+ "phpunit/phpunit": "^8.5 || ^9.3"
},
"type": "library",
"extra": {
@@ -5941,7 +6032,7 @@
"test double",
"testing"
],
- "time": "2020-07-09T08:31:54+00:00"
+ "time": "2020-08-11T18:10:13+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -5999,35 +6090,35 @@
},
{
"name": "nunomaduro/collision",
- "version": "v4.2.0",
+ "version": "v5.0.2",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "d50490417eded97be300a92cd7df7badc37a9018"
+ "reference": "4a343299054e9368d0db4a982a780cc4ffa12707"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/d50490417eded97be300a92cd7df7badc37a9018",
- "reference": "d50490417eded97be300a92cd7df7badc37a9018",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/4a343299054e9368d0db4a982a780cc4ffa12707",
+ "reference": "4a343299054e9368d0db4a982a780cc4ffa12707",
"shasum": ""
},
"require": {
"facade/ignition-contracts": "^1.0",
- "filp/whoops": "^2.4",
- "php": "^7.2.5",
+ "filp/whoops": "^2.7.2",
+ "php": "^7.3",
"symfony/console": "^5.0"
},
"require-dev": {
- "facade/ignition": "^2.0",
- "fideloper/proxy": "^4.2",
- "friendsofphp/php-cs-fixer": "^2.16",
- "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"
+ "fideloper/proxy": "^4.4.0",
+ "friendsofphp/php-cs-fixer": "^2.16.4",
+ "fruitcake/laravel-cors": "^2.0.1",
+ "laravel/framework": "^8.0",
+ "laravel/tinker": "^2.4.1",
+ "nunomaduro/larastan": "^0.6.2",
+ "nunomaduro/mock-final-classes": "^1.0",
+ "orchestra/testbench": "^6.0",
+ "phpstan/phpstan": "^0.12.36",
+ "phpunit/phpunit": "^9.3.3"
},
"type": "library",
"extra": {
@@ -6079,7 +6170,7 @@
"type": "patreon"
}
],
- "time": "2020-04-04T19:56:08+00:00"
+ "time": "2020-08-27T18:58:22+00:00"
},
{
"name": "phar-io/manifest",
@@ -6234,16 +6325,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "5.2.0",
+ "version": "5.2.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "3170448f5769fe19f456173d833734e0ff1b84df"
+ "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df",
- "reference": "3170448f5769fe19f456173d833734e0ff1b84df",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44",
+ "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44",
"shasum": ""
},
"require": {
@@ -6282,7 +6373,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2020-07-20T20:05:34+00:00"
+ "time": "2020-08-15T11:14:08+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@@ -6642,6 +6733,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2019-09-17T06:23:10+00:00"
},
{
@@ -6739,16 +6831,16 @@
},
{
"name": "scrivo/highlight.php",
- "version": "v9.18.1.1",
+ "version": "v9.18.1.2",
"source": {
"type": "git",
"url": "https://github.com/scrivo/highlight.php.git",
- "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558"
+ "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/52fc21c99fd888e33aed4879e55a3646f8d40558",
- "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558",
+ "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/efb6e445494a9458aa59b0af5edfa4bdcc6809d9",
+ "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9",
"shasum": ""
},
"require": {
@@ -6804,7 +6896,13 @@
"highlight.php",
"syntax"
],
- "time": "2020-03-02T05:59:21+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/allejo",
+ "type": "github"
+ }
+ ],
+ "time": "2020-08-27T03:24:44+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -7423,27 +7521,27 @@
},
{
"name": "spatie/laravel-web-tinker",
- "version": "1.7.4",
+ "version": "1.7.5",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-web-tinker.git",
- "reference": "18cb5b4b2645a778ce356caabe09af556f277fc4"
+ "reference": "bcdc383240ff3518dcd75510a66c87bd1d47c45c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-web-tinker/zipball/18cb5b4b2645a778ce356caabe09af556f277fc4",
- "reference": "18cb5b4b2645a778ce356caabe09af556f277fc4",
+ "url": "https://api.github.com/repos/spatie/laravel-web-tinker/zipball/bcdc383240ff3518dcd75510a66c87bd1d47c45c",
+ "reference": "bcdc383240ff3518dcd75510a66c87bd1d47c45c",
"shasum": ""
},
"require": {
- "illuminate/cookie": "^5.8|^6.0|^7.0",
- "illuminate/session": "^5.8|^6.0|^7.0",
- "illuminate/support": "^5.8|^6.0|^7.0",
+ "illuminate/cookie": "^5.8|^6.0|^7.0|^8.0",
+ "illuminate/session": "^5.8|^6.0|^7.0|^8.0",
+ "illuminate/support": "^5.8|^6.0|^7.0|^8.0",
"laravel/tinker": "^1.0|^2.0",
"php": "^7.2"
},
"require-dev": {
- "orchestra/testbench": "^3.8|^4.0|^5.0",
+ "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0",
"phpunit/phpunit": "^8.0|^9.0"
},
"type": "library",
@@ -7487,7 +7585,7 @@
"type": "custom"
}
],
- "time": "2020-07-23T18:41:41+00:00"
+ "time": "2020-09-09T09:48:48+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/config/auth.php b/config/auth.php
index 04c6eec..1192b86 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -68,7 +68,7 @@ return [
'providers' => [
'users' => [
'driver' => 'eloquent',
- 'model' => App\User::class,
+ 'model' => App\Models\User::class,
],
// 'users' => [
diff --git a/database/factories/BookmarkFactory.php b/database/factories/BookmarkFactory.php
index bedc0cd..74ce6e6 100644
--- a/database/factories/BookmarkFactory.php
+++ b/database/factories/BookmarkFactory.php
@@ -7,7 +7,7 @@ use Faker\Generator as Faker;
$factory->define(Bookmark::class, function (Faker $faker) {
return [
- 'user_id' => factory(\App\User::class),
+ 'user_id' => factory(\App\Models\User::class),
'name' => $faker->words(3, [false]),
'url' => $faker->url,
'favicon' => $faker->imageUrl(),
diff --git a/database/factories/EventFactory.php b/database/factories/EventFactory.php
index 2e5d9f3..ef73b73 100644
--- a/database/factories/EventFactory.php
+++ b/database/factories/EventFactory.php
@@ -2,6 +2,7 @@
/** @var \Illuminate\Database\Eloquent\Factory $factory */
+use App\Models\User;
use App\Models\Event;
use App\Models\EventCategory;
use Faker\Generator as Faker;
@@ -11,7 +12,7 @@ $factory->define(Event::class, function (Faker $faker) {
$endDate = $faker->dateTimeBetween($startDate, date_add($startDate, date_interval_create_from_date_string('10 days')));
$endDate = (rand(0, 1) === 0) ? null : $endDate;
return [
- 'user_id' => factory(\App\User::class),
+ 'user_id' => factory(User::class),
'category_id' => factory(EventCategory::class),
'name' => $faker->words(3, [false]),
'description' => $faker->words(rand(10, 300), [false]),
diff --git a/database/factories/MemoFactory.php b/database/factories/MemoFactory.php
index aefbb57..1cc80d3 100644
--- a/database/factories/MemoFactory.php
+++ b/database/factories/MemoFactory.php
@@ -7,7 +7,7 @@ use Faker\Generator as Faker;
$factory->define(\App\Models\Memo::class, function (Faker $faker) {
return [
- 'user_id' => factory(\App\User::class),
+ 'user_id' => factory(\App\Models\User::class),
'name' => $faker->words(3, [false]),
'memo' => $faker->text($maxNbChars = 200),
];
diff --git a/database/factories/ToDoListFactory.php b/database/factories/ToDoListFactory.php
index 6287b75..43c606a 100644
--- a/database/factories/ToDoListFactory.php
+++ b/database/factories/ToDoListFactory.php
@@ -7,7 +7,7 @@ use Faker\Generator as Faker;
$factory->define(ToDoList::class, function (Faker $faker) {
return [
- 'user_id' => factory(\App\User::class),
+ 'user_id' => factory(\App\Models\User::class),
'name' => $faker->words(3, [false]),
];
});
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 741edea..fa9360e 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,7 +2,7 @@
/** @var \Illuminate\Database\Eloquent\Factory $factory */
-use App\User;
+use App\Models\User;
use Faker\Generator as Faker;
use Illuminate\Support\Str;
diff --git a/tests/Feature/BookmarkTest.php b/tests/Feature/BookmarkTest.php
index ccd9a90..d79a2a6 100644
--- a/tests/Feature/BookmarkTest.php
+++ b/tests/Feature/BookmarkTest.php
@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\Bookmark;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
@@ -17,7 +17,7 @@ class BookmarkTest extends TestCase
{
$this->withoutExceptionHandling();
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/bookmarks', $this->data());
@@ -49,7 +49,7 @@ class BookmarkTest extends TestCase
/** @test */
public function bookmark_url_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/bookmarks', array_merge($this->data(), ['url' => '']));
$response->assertSessionHasErrors('url');
diff --git a/tests/Feature/EventsTest.php b/tests/Feature/EventsTest.php
index f33ce59..54efccd 100644
--- a/tests/Feature/EventsTest.php
+++ b/tests/Feature/EventsTest.php
@@ -5,7 +5,8 @@ namespace Tests\Feature;
use App\Models\Event;
use App\Models\EventCategory;
use App\Models\EventGuestsNonUsers;
-use App\User;
+use App\Models\Memo;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Tests\TestCase;
@@ -49,7 +50,7 @@ class EventsTest extends TestCase
/** @test */
public function event_category_name_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(['role' => 2]), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(['role' => 2]), 'api');
$response = $this->post('/api/events/categories', ['name' => '', 'description' => 'test name required']);
$response->assertSessionHasErrors('name');
@@ -241,7 +242,7 @@ class EventsTest extends TestCase
'location' => $event->location,
'category' => [
'data' => [
- 'category_id' => 1
+ 'event_category_id' => 1
],
],
]
@@ -256,7 +257,7 @@ class EventsTest extends TestCase
/** @test */
public function event_name_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/events', array_merge($this->data(), ['name' => '']));
$response->assertSessionHasErrors('name');
@@ -266,7 +267,7 @@ class EventsTest extends TestCase
/** @test */
public function event_start_date_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/events', array_merge($this->data(), ['start_date' => '']));
$response->assertSessionHasErrors('start_date');
@@ -296,7 +297,7 @@ class EventsTest extends TestCase
'location' => $event->location,
'category' => [
'data' => [
- 'category_id' => 1
+ 'event_category_id' => 1
],
],
]
@@ -308,6 +309,7 @@ class EventsTest extends TestCase
/** @test */
public function all_event_can_be_retrieved()
{
+ $this->withoutExceptionHandling();
$this->actingAs($user = factory(User::class)->create(), 'api');
$events = factory(Event::class, 10)->create(['user_id' => $user->id]);
@@ -348,7 +350,7 @@ class EventsTest extends TestCase
'start_date' => '2020-07-20 09:00:00',
'category' => [
'data' => [
- 'category_id' => $event->category_id,
+ 'event_category_id' => $event->category_id,
],
],
]
diff --git a/tests/Feature/ImagesTest.php b/tests/Feature/ImagesTest.php
index d87df54..f9ed282 100644
--- a/tests/Feature/ImagesTest.php
+++ b/tests/Feature/ImagesTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature;
use App\Models\Image;
use App\Models\Memo;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Http\UploadedFile;
diff --git a/tests/Feature/MemosTest.php b/tests/Feature/MemosTest.php
index 31b9949..01b28e5 100644
--- a/tests/Feature/MemosTest.php
+++ b/tests/Feature/MemosTest.php
@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\Memo;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Symfony\Component\HttpFoundation\Response;
@@ -28,7 +28,7 @@ class MemosTest extends TestCase
{
$this->withoutExceptionHandling();
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', $this->data());
@@ -52,7 +52,7 @@ class MemosTest extends TestCase
/** @test */
public function memo_name_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', array_merge($this->data(), ['name' => '']));
$response->assertSessionHasErrors('name');
@@ -62,7 +62,7 @@ class MemosTest extends TestCase
/** @test */
public function memo_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/memos', array_merge($this->data(), ['memo' => '']));
$response->assertSessionHasErrors('memo');
diff --git a/tests/Feature/ToDoItemsTest.php b/tests/Feature/ToDoItemsTest.php
index f114a3e..ae402c0 100644
--- a/tests/Feature/ToDoItemsTest.php
+++ b/tests/Feature/ToDoItemsTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature;
use App\Models\ToDo;
use App\Models\ToDoList;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
diff --git a/tests/Feature/ToDoListsTest.php b/tests/Feature/ToDoListsTest.php
index 7c21539..0ba1010 100644
--- a/tests/Feature/ToDoListsTest.php
+++ b/tests/Feature/ToDoListsTest.php
@@ -3,7 +3,7 @@
namespace Tests\Feature;
use App\Models\ToDoList;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
@@ -44,7 +44,7 @@ class ToDoListsTest extends TestCase
/** @test */
public function to_do_list_name_are_required()
{
- $this->actingAs($user = factory(\App\User::class)->create(), 'api');
+ $this->actingAs($user = factory(\App\Models\User::class)->create(), 'api');
$response = $this->post('/api/to-do-lists/', ['name' => '']);
$response->assertSessionHasErrors('name');
diff --git a/tests/Feature/UserAuthTest.php b/tests/Feature/UserAuthTest.php
index b346ea8..3fa7cdd 100644
--- a/tests/Feature/UserAuthTest.php
+++ b/tests/Feature/UserAuthTest.php
@@ -2,7 +2,7 @@
namespace Tests\Feature;
-use App\User;
+use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Symfony\Component\HttpFoundation\Response;