diff --git a/app/Models/User.php b/app/Models/User.php index e617467..01006f8 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,22 +2,19 @@ namespace App\Models; -use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; -// use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\DB; use Laravel\Sanctum\HasApiTokens; -use LdapRecord\Laravel\Auth\AuthenticatesWithLdap; -use Illuminate\Contracts\Auth\Access\Authorizable ; -use Spatie\Permission\Traits\HasRole; +use Spatie\Permission\Traits\HasRoles; +use Illuminate\Foundation\Auth\Access\Authorizable; class User extends Authenticatable { - use HasApiTokens, HasFactory, Notifiable, AuthenticateswithLdap, HasRoles; + use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable; /** * The attributes that are mass assignable. @@ -49,6 +46,8 @@ class User extends Authenticatable protected $casts = [ 'email_verified_at' => 'datetime', ]; + + protected $guard_name = 'web'; public function getLdapDomainColumn() { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index c6daa99..2c84d01 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -26,10 +26,10 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); // - Gate::define('admin', function(User $user ){ - return $user->isAdmin - ? Response::allow() - : Response::deny('E\'necessario essere amministratori per accedere a questa risorsa'); + Gate::before(function ($user, $ability) { + if ($user->hasRole('admin')) { + return true; + } }); } } diff --git a/composer.json b/composer.json index cab09aa..5f1be95 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "php": "^7.3|^8.0", "barryvdh/laravel-dompdf": "^2.0", "directorytree/ldaprecord": "^2.9", - "directorytree/ldaprecord-laravel": "^2.5", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel-notification-channels/telegram": "^2.0", diff --git a/composer.lock b/composer.lock index 9103649..db84f33 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": "c69944f6249d2fefae8ae862a932e01e", + "content-hash": "e6ac2be787f145ea140b72b55e302e90", "packages": [ { "name": "asm89/stack-cors", @@ -62,154 +62,6 @@ }, "time": "2022-01-18T09:12:03+00:00" }, - { - "name": "aws/aws-crt-php", - "version": "v1.2.1", - "source": { - "type": "git", - "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", - "yoast/phpunit-polyfills": "^1.0" - }, - "suggest": { - "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "AWS SDK Common Runtime Team", - "email": "aws-sdk-common-runtime@amazon.com" - } - ], - "description": "AWS Common Runtime for PHP", - "homepage": "https://github.com/awslabs/aws-crt-php", - "keywords": [ - "amazon", - "aws", - "crt", - "sdk" - ], - "support": { - "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" - }, - "time": "2023-03-24T20:22:19+00:00" - }, - { - "name": "aws/aws-sdk-php", - "version": "3.263.5", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "8fc1ca5b34e6197b0d7bebbd66d2889695c8d1ef" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8fc1ca5b34e6197b0d7bebbd66d2889695c8d1ef", - "reference": "8fc1ca5b34e6197b0d7bebbd66d2889695c8d1ef", - "shasum": "" - }, - "require": { - "aws/aws-crt-php": "^1.0.4", - "ext-json": "*", - "ext-pcre": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0", - "guzzlehttp/psr7": "^1.8.5 || ^2.3", - "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5" - }, - "require-dev": { - "andrewsville/php-token-reflection": "^1.4", - "aws/aws-php-sns-message-validator": "~1.0", - "behat/behat": "~3.0", - "composer/composer": "^1.10.22", - "dms/phpunit-arraysubset-asserts": "^0.4.0", - "doctrine/cache": "~1.4", - "ext-dom": "*", - "ext-openssl": "*", - "ext-pcntl": "*", - "ext-sockets": "*", - "nette/neon": "^2.3", - "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", - "psr/cache": "^1.0", - "psr/simple-cache": "^1.0", - "sebastian/comparator": "^1.2.3 || ^4.0", - "yoast/phpunit-polyfills": "^1.0" - }, - "suggest": { - "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", - "doctrine/cache": "To use the DoctrineCacheAdapter", - "ext-curl": "To send requests using cURL", - "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", - "ext-sockets": "To use client-side monitoring" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "Aws\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Amazon Web Services", - "homepage": "http://aws.amazon.com" - } - ], - "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", - "homepage": "http://aws.amazon.com/sdkforphp", - "keywords": [ - "amazon", - "aws", - "cloud", - "dynamodb", - "ec2", - "glacier", - "s3", - "sdk" - ], - "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", - "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.263.5" - }, - "time": "2023-04-06T18:22:35+00:00" - }, { "name": "barryvdh/laravel-dompdf", "version": "v2.0.1", @@ -364,26 +216,25 @@ }, { "name": "brick/math", - "version": "0.10.2", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", + "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478", + "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478", "shasum": "" }, "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^9.0", - "vimeo/psalm": "4.25.0" + "vimeo/psalm": "5.0.0" }, "type": "library", "autoload": { @@ -408,7 +259,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.10.2" + "source": "https://github.com/brick/math/tree/0.11.0" }, "funding": [ { @@ -416,7 +267,7 @@ "type": "github" } ], - "time": "2022-08-10T22:54:19+00:00" + "time": "2023-01-15T23:15:59+00:00" }, { "name": "composer/semver", @@ -576,16 +427,16 @@ }, { "name": "directorytree/ldaprecord", - "version": "v2.20.3", + "version": "v2.20.4", "source": { "type": "git", "url": "https://github.com/DirectoryTree/LdapRecord.git", - "reference": "f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947" + "reference": "caeb62c20f132f03feb4d2409edb2068981bc135" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947", - "reference": "f8cb5c9440f0bd54e9d4683c4d0bcf6c8bc40947", + "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/caeb62c20f132f03feb4d2409edb2068981bc135", + "reference": "caeb62c20f132f03feb4d2409edb2068981bc135", "shasum": "" }, "require": { @@ -646,73 +497,7 @@ "type": "github" } ], - "time": "2023-03-10T15:22:31+00:00" - }, - { - "name": "directorytree/ldaprecord-laravel", - "version": "v2.7.3", - "source": { - "type": "git", - "url": "https://github.com/DirectoryTree/LdapRecord-Laravel.git", - "reference": "5f36d4ba6edbf56d97211fb892188aa6f9aceabc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord-Laravel/zipball/5f36d4ba6edbf56d97211fb892188aa6f9aceabc", - "reference": "5f36d4ba6edbf56d97211fb892188aa6f9aceabc", - "shasum": "" - }, - "require": { - "directorytree/ldaprecord": "^2.4.4", - "ext-json": "*", - "ext-ldap": "*", - "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0|^10.0", - "php": ">=7.3", - "ramsey/uuid": "*" - }, - "require-dev": { - "laravel/sanctum": "*", - "mockery/mockery": "^1.0", - "orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "spatie/ray": "^1.28" - }, - "type": "project", - "extra": { - "laravel": { - "providers": [ - "LdapRecord\\Laravel\\LdapServiceProvider", - "LdapRecord\\Laravel\\LdapAuthServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "LdapRecord\\Laravel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "LDAP Authentication & Management for Laravel.", - "keywords": [ - "adldap2", - "laravel", - "ldap", - "ldaprecord" - ], - "support": { - "issues": "https://github.com/DirectoryTree/LdapRecord-Laravel/issues", - "source": "https://github.com/DirectoryTree/LdapRecord-Laravel/tree/v2.7.3" - }, - "funding": [ - { - "url": "https://github.com/stevebauman", - "type": "github" - } - ], - "time": "2023-02-09T14:29:14+00:00" + "time": "2023-05-19T20:13:32+00:00" }, { "name": "doctrine/inflector", @@ -1277,22 +1062,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/promises": "^1.5.3 || ^2.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1303,7 +1088,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -1317,9 +1103,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "7.5-dev" } }, "autoload": { @@ -1385,7 +1168,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + "source": "https://github.com/guzzle/guzzle/tree/7.7.0" }, "funding": [ { @@ -1401,38 +1184,37 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-05-21T14:04:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1469,7 +1251,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/2.0.0" }, "funding": [ { @@ -1485,26 +1267,26 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T13:50:22+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.4", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf" + "reference": "b635f279edd83fc275f822a1188157ffea568ff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", - "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", + "reference": "b635f279edd83fc275f822a1188157ffea568ff6", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -1524,9 +1306,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -1588,7 +1367,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.4" + "source": "https://github.com/guzzle/psr7/tree/2.5.0" }, "funding": [ { @@ -1604,7 +1383,7 @@ "type": "tidelift" } ], - "time": "2023-03-09T13:19:02+00:00" + "time": "2023-04-17T16:11:26+00:00" }, { "name": "laravel-notification-channels/telegram", @@ -2425,71 +2204,6 @@ ], "time": "2022-10-04T09:16:37+00:00" }, - { - "name": "league/flysystem-aws-s3-v3", - "version": "1.0.30", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d", - "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d", - "shasum": "" - }, - "require": { - "aws/aws-sdk-php": "^3.20.0", - "league/flysystem": "^1.0.40", - "php": ">=5.5.0" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "~1.0.1", - "phpspec/phpspec": "^2.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Flysystem\\AwsS3v3\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Flysystem adapter for the AWS S3 SDK v3.x", - "support": { - "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.30" - }, - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], - "time": "2022-07-02T13:51:38+00:00" - }, { "name": "league/mime-type-detection", "version": "1.11.0", @@ -2813,26 +2527,24 @@ }, { "name": "masterminds/html5", - "version": "2.7.6", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "897eb517a343a2281f11bc5556d6548db7d93947" + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", - "reference": "897eb517a343a2281f11bc5556d6548db7d93947", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-dom": "*", - "ext-libxml": "*", "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -2876,9 +2588,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" + "source": "https://github.com/Masterminds/html5-php/tree/2.8.0" }, - "time": "2022-08-18T16:18:26+00:00" + "time": "2023-04-26T07:27:39+00:00" }, { "name": "monolog/monolog", @@ -2982,67 +2694,6 @@ ], "time": "2023-02-06T13:44:46+00:00" }, - { - "name": "mtdowling/jmespath.php", - "version": "2.6.1", - "source": { - "type": "git", - "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "shasum": "" - }, - "require": { - "php": "^5.4 || ^7.0 || ^8.0", - "symfony/polyfill-mbstring": "^1.17" - }, - "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" - }, - "bin": [ - "bin/jp.php" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "files": [ - "src/JmesPath.php" - ], - "psr-4": { - "JmesPath\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Declaratively specify how to extract elements from a JSON document", - "keywords": [ - "json", - "jsonpath" - ], - "support": { - "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" - }, - "time": "2021-06-14T00:11:39+00:00" - }, { "name": "myclabs/php-enum", "version": "1.8.4", @@ -3108,16 +2759,16 @@ }, { "name": "nesbot/carbon", - "version": "2.66.0", + "version": "2.67.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "496712849902241f04902033b0441b269effe001" + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001", - "reference": "496712849902241f04902033b0441b269effe001", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8", + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8", "shasum": "" }, "require": { @@ -3206,7 +2857,7 @@ "type": "tidelift" } ], - "time": "2023-01-29T18:53:47+00:00" + "time": "2023-05-25T22:09:47+00:00" }, { "name": "nette/schema", @@ -3359,16 +3010,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -3409,9 +3060,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "opis/closure", @@ -3848,21 +3499,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3882,7 +3533,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -3894,27 +3545,27 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client/tree/1.0.2" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -3934,7 +3585,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -3949,9 +3600,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", @@ -4109,16 +3760,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.14", + "version": "v0.11.18", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17" + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17", - "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "shasum": "" }, "require": { @@ -4179,9 +3830,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.14" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" }, - "time": "2023-03-28T03:41:01+00:00" + "time": "2023-05-23T02:31:11+00:00" }, { "name": "ralouphie/getallheaders", @@ -4318,20 +3969,20 @@ }, { "name": "ramsey/uuid", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2" + "reference": "60a4c63ab724854332900504274f6150ff26d286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286", + "reference": "60a4c63ab724854332900504274f6150ff26d286", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10", + "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.2 || ^2.0" @@ -4394,7 +4045,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.3" + "source": "https://github.com/ramsey/uuid/tree/4.7.4" }, "funding": [ { @@ -4406,7 +4057,7 @@ "type": "tidelift" } ], - "time": "2023-01-12T18:13:24+00:00" + "time": "2023-04-15T23:01:58+00:00" }, { "name": "rap2hpoutre/fast-excel", @@ -4526,45 +4177,80 @@ }, { "name": "secondtruth/startmin", - "version": "v1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/secondtruth/startmin.git", - "reference": "a2dd9d5623fb16a838cee4c245cdf36d70c98002" + "reference": "d1778e71353eb815f66515e8324d950b97a2b0ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/secondtruth/startmin/zipball/a2dd9d5623fb16a838cee4c245cdf36d70c98002", - "reference": "a2dd9d5623fb16a838cee4c245cdf36d70c98002", + "url": "https://api.github.com/repos/secondtruth/startmin/zipball/d1778e71353eb815f66515e8324d950b97a2b0ab", + "reference": "d1778e71353eb815f66515e8324d950b97a2b0ab", "shasum": "" }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "ISC" + "MIT" ], "authors": [ { "name": "Christian Neff", "email": "christian.neff@gmail.com", - "homepage": "http://www.secondtruth.de", + "homepage": "https://secondtruth.de", "role": "Developer" + }, + { + "name": "Ed Preston", + "email": "hello@prestonsoft.com", + "homepage": "https://prestonsoft.com", + "role": "Contributor" + }, + { + "name": "David Miller", + "email": "hello@davidmiller.io", + "homepage": "https://davidmiller.io", + "role": "Original Author" } ], - "description": "Admin dashboard template for Bootstrap", + "description": "An admin dashboard template for Bootstrap", "homepage": "http://www.secondtruth.de", "keywords": [ "admin", "backend", + "dashboard", "template", "theme", "web" ], "support": { "issues": "https://github.com/secondtruth/startmin/issues", - "source": "https://github.com/secondtruth/startmin/tree/master" + "source": "https://github.com/secondtruth/startmin/tree/v1.2.0" }, - "time": "2018-12-11T18:14:53+00:00" + "funding": [ + { + "url": "https://paypal.me/secondtruth", + "type": "custom" + }, + { + "url": "https://ko-fi.com/secondtruth", + "type": "ko_fi" + }, + { + "url": "https://liberapay.com/secondtruth", + "type": "liberapay" + }, + { + "url": "https://opencollective.com/secondtruth", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/secondtruth", + "type": "patreon" + } + ], + "time": "2023-05-07T15:13:53+00:00" }, { "name": "sfneal/actions", @@ -4673,68 +4359,6 @@ }, "time": "2021-08-16T16:20:30+00:00" }, - { - "name": "sfneal/aws-s3-helpers", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/sfneal/aws-s3-helpers.git", - "reference": "dde609e832d12ea6c07dc3efcdfbda057b4ce498" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sfneal/aws-s3-helpers/zipball/dde609e832d12ea6c07dc3efcdfbda057b4ce498", - "reference": "dde609e832d12ea6c07dc3efcdfbda057b4ce498", - "shasum": "" - }, - "require": { - "aws/aws-sdk-php": "^3.185", - "laravel/framework": ">=8.40", - "league/flysystem-aws-s3-v3": ">=1.0.29", - "php": ">=7.4" - }, - "require-dev": { - "orchestra/testbench": ">=6.7", - "phpunit/phpunit": ">=7.5.20", - "scrutinizer/ocular": "^1.8", - "sfneal/mock-models": ">=0.7" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Sfneal\\Helpers\\Aws\\S3\\Providers\\S3HelpersServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Sfneal\\Helpers\\Aws\\S3\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stephen Neal", - "email": "stephen.neal14@gmail.com", - "role": "Developer" - } - ], - "description": "Abstraction layers for interacting with AWS S3 storage", - "homepage": "https://github.com/sfneal/aws-s3-helpers", - "keywords": [ - "aws-s3-helpers", - "sfneal" - ], - "support": { - "issues": "https://github.com/sfneal/aws-s3-helpers/issues", - "source": "https://github.com/sfneal/aws-s3-helpers/tree/1.0.1" - }, - "time": "2021-07-09T16:01:16+00:00" - }, { "name": "sfneal/caching", "version": "2.1.2", @@ -5017,16 +4641,16 @@ }, { "name": "sfneal/view-export", - "version": "2.10.2", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/sfneal/view-export.git", - "reference": "c134dacb66d5d35ae4b182f02255b393ba372d6e" + "reference": "7c928bd8acc9e485b66c8ae8be82d74d3b7f95c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sfneal/view-export/zipball/c134dacb66d5d35ae4b182f02255b393ba372d6e", - "reference": "c134dacb66d5d35ae4b182f02255b393ba372d6e", + "url": "https://api.github.com/repos/sfneal/view-export/zipball/7c928bd8acc9e485b66c8ae8be82d74d3b7f95c8", + "reference": "7c928bd8acc9e485b66c8ae8be82d74d3b7f95c8", "shasum": "" }, "require": { @@ -5034,7 +4658,6 @@ "laravel/framework": ">=7", "maatwebsite/excel": ">=3.1", "php": ">=7.4", - "sfneal/aws-s3-helpers": "^1.0", "sfneal/laravel-helpers": ">=1.0.3", "sfneal/queueables": "^2.0", "sfneal/string-helpers": ">=1.1", @@ -5077,9 +4700,9 @@ ], "support": { "issues": "https://github.com/sfneal/view-export/issues", - "source": "https://github.com/sfneal/view-export/tree/2.10.2" + "source": "https://github.com/sfneal/view-export/tree/2.10.0" }, - "time": "2021-07-08T17:02:23+00:00" + "time": "2021-06-30T18:45:54+00:00" }, { "name": "sfneal/view-models", @@ -5202,16 +4825,16 @@ }, { "name": "spatie/db-dumper", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/spatie/db-dumper.git", - "reference": "129b8254b2c9f10881a754a692bd9507b09a1893" + "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/db-dumper/zipball/129b8254b2c9f10881a754a692bd9507b09a1893", - "reference": "129b8254b2c9f10881a754a692bd9507b09a1893", + "url": "https://api.github.com/repos/spatie/db-dumper/zipball/3b9fd47899bf6a59d3452392121c9ce675d55d34", + "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34", "shasum": "" }, "require": { @@ -5219,7 +4842,7 @@ "symfony/process": "^5.0|^6.0" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "pestphp/pest": "^1.22" }, "type": "library", "autoload": { @@ -5249,7 +4872,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/db-dumper/tree/3.3.0" + "source": "https://github.com/spatie/db-dumper/tree/3.3.1" }, "funding": [ { @@ -5261,7 +4884,7 @@ "type": "github" } ], - "time": "2022-09-01T20:20:26+00:00" + "time": "2023-05-02T11:05:31+00:00" }, { "name": "spatie/laravel-backup", @@ -5643,16 +5266,16 @@ }, { "name": "spatie/temporary-directory", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/spatie/temporary-directory.git", - "reference": "e2818d871783d520b319c2d38dc37c10ecdcde20" + "reference": "0c804873f6b4042aa8836839dca683c7d0f71831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/e2818d871783d520b319c2d38dc37c10ecdcde20", - "reference": "e2818d871783d520b319c2d38dc37c10ecdcde20", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/0c804873f6b4042aa8836839dca683c7d0f71831", + "reference": "0c804873f6b4042aa8836839dca683c7d0f71831", "shasum": "" }, "require": { @@ -5688,7 +5311,7 @@ ], "support": { "issues": "https://github.com/spatie/temporary-directory/issues", - "source": "https://github.com/spatie/temporary-directory/tree/2.1.1" + "source": "https://github.com/spatie/temporary-directory/tree/2.1.2" }, "funding": [ { @@ -5700,7 +5323,7 @@ "type": "github" } ], - "time": "2022-08-23T07:15:15+00:00" + "time": "2023-04-28T07:47:42+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5780,16 +5403,16 @@ }, { "name": "symfony/console", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", "shasum": "" }, "require": { @@ -5859,7 +5482,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.22" + "source": "https://github.com/symfony/console/tree/v5.4.24" }, "funding": [ { @@ -5875,20 +5498,20 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-05-26T05:13:16+00:00" }, { "name": "symfony/css-selector", - "version": "v6.2.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "aedf3cb0f5b929ec255d96bbb4909e9932c769e0" + "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/aedf3cb0f5b929ec255d96bbb4909e9932c769e0", - "reference": "aedf3cb0f5b929ec255d96bbb4909e9932c769e0", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf", + "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf", "shasum": "" }, "require": { @@ -5924,7 +5547,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.2.7" + "source": "https://github.com/symfony/css-selector/tree/v6.3.0" }, "funding": [ { @@ -5940,20 +5563,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:44:56+00:00" + "time": "2023-03-20T16:43:42+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { @@ -5962,7 +5585,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -5991,7 +5614,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" }, "funding": [ { @@ -6007,20 +5630,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:25:55+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549" + "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/56a94aa8cb5a5fbc411551d8d014a296b5456549", - "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", + "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", "shasum": "" }, "require": { @@ -6062,7 +5685,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.21" + "source": "https://github.com/symfony/error-handler/tree/v5.4.24" }, "funding": [ { @@ -6078,28 +5701,29 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-05-02T16:13:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.2.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339" + "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339", - "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", + "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/event-dispatcher-contracts": "^2|^3" + "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<5.4" + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" }, "provide": { "psr/event-dispatcher-implementation": "1.0", @@ -6112,13 +5736,9 @@ "symfony/error-handler": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/http-foundation": "^5.4|^6.0", - "symfony/service-contracts": "^1.1|^2|^3", + "symfony/service-contracts": "^2.5|^3", "symfony/stopwatch": "^5.4|^6.0" }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, "type": "library", "autoload": { "psr-4": { @@ -6145,7 +5765,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.8" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0" }, "funding": [ { @@ -6161,33 +5781,30 @@ "type": "tidelift" } ], - "time": "2023-03-20T16:06:02+00:00" + "time": "2023-04-21T14:41:17+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd" + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", - "reference": "0ad3b6f1e4e2da5690fefe075cd53a238646d8dd", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", "shasum": "" }, "require": { "php": ">=8.1", "psr/event-dispatcher": "^1" }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6224,7 +5841,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" }, "funding": [ { @@ -6240,7 +5857,7 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/finder", @@ -6307,16 +5924,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313" + "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/05cd1acdd0e3ce8473aaba1d86c188321d85f313", - "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3c59f97f6249ce552a44f01b93bfcbd786a954f5", + "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5", "shasum": "" }, "require": { @@ -6363,7 +5980,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.22" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.24" }, "funding": [ { @@ -6379,20 +5996,20 @@ "type": "tidelift" } ], - "time": "2023-03-28T07:28:17+00:00" + "time": "2023-05-19T07:21:23+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2d3a8be2c756353627398827c409af6f126c096d" + "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2d3a8be2c756353627398827c409af6f126c096d", - "reference": "2d3a8be2c756353627398827c409af6f126c096d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f38b722e1557eb3f487d351b48f5a1279b50e9d1", + "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1", "shasum": "" }, "require": { @@ -6475,7 +6092,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.22" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.24" }, "funding": [ { @@ -6491,20 +6108,20 @@ "type": "tidelift" } ], - "time": "2023-03-31T11:54:37+00:00" + "time": "2023-05-27T08:06:30+00:00" }, { "name": "symfony/mime", - "version": "v5.4.21", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd" + "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", - "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", + "url": "https://api.github.com/repos/symfony/mime/zipball/ae0a1032a450a3abf305ee44fc55ed423fbf16e3", + "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3", "shasum": "" }, "require": { @@ -6559,7 +6176,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.21" + "source": "https://github.com/symfony/mime/tree/v5.4.23" }, "funding": [ { @@ -6575,7 +6192,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-04-19T09:49:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7317,16 +6934,16 @@ }, { "name": "symfony/process", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b" + "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b", - "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b", + "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", + "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", "shasum": "" }, "require": { @@ -7359,7 +6976,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.22" + "source": "https://github.com/symfony/process/tree/v5.4.24" }, "funding": [ { @@ -7375,7 +6992,7 @@ "type": "tidelift" } ], - "time": "2023-03-06T21:29:33+00:00" + "time": "2023-05-17T11:26:05+00:00" }, { "name": "symfony/routing", @@ -7552,16 +7169,16 @@ }, { "name": "symfony/string", - "version": "v6.2.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" + "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", - "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", + "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f", + "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f", "shasum": "" }, "require": { @@ -7572,13 +7189,13 @@ "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { "symfony/error-handler": "^5.4|^6.0", "symfony/http-client": "^5.4|^6.0", "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", + "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", @@ -7618,7 +7235,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.8" + "source": "https://github.com/symfony/string/tree/v6.3.0" }, "funding": [ { @@ -7634,32 +7251,34 @@ "type": "tidelift" } ], - "time": "2023-03-20T16:06:02+00:00" + "time": "2023-03-21T21:06:29+00:00" }, { "name": "symfony/translation", - "version": "v6.2.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "817535dbb1721df8b3a8f2489dc7e50bcd6209b5" + "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/817535dbb1721df8b3a8f2489dc7e50bcd6209b5", - "reference": "817535dbb1721df8b3a8f2489dc7e50bcd6209b5", + "url": "https://api.github.com/repos/symfony/translation/zipball/f72b2cba8f79dd9d536f534f76874b58ad37876f", + "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f", "shasum": "" }, "require": { "php": ">=8.1", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.3|^3.0" + "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { "symfony/config": "<5.4", "symfony/console": "<5.4", "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", "symfony/twig-bundle": "<5.4", "symfony/yaml": "<5.4" }, @@ -7673,20 +7292,14 @@ "symfony/console": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/finder": "^5.4|^6.0", - "symfony/http-client-contracts": "^1.1|^2.0|^3.0", + "symfony/http-client-contracts": "^2.5|^3.0", "symfony/http-kernel": "^5.4|^6.0", "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", "symfony/routing": "^5.4|^6.0", - "symfony/service-contracts": "^1.1.2|^2|^3", + "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^5.4|^6.0" }, - "suggest": { - "nikic/php-parser": "To use PhpAstExtractor", - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, "type": "library", "autoload": { "files": [ @@ -7716,7 +7329,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.2.8" + "source": "https://github.com/symfony/translation/tree/v6.3.0" }, "funding": [ { @@ -7732,32 +7345,29 @@ "type": "tidelift" } ], - "time": "2023-03-31T09:14:44+00:00" + "time": "2023-05-19T12:46:45+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "dfec258b9dd17a6b24420d464c43bffe347441c8" + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dfec258b9dd17a6b24420d464c43bffe347441c8", - "reference": "dfec258b9dd17a6b24420d464c43bffe347441c8", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", "shasum": "" }, "require": { "php": ">=8.1" }, - "suggest": { - "symfony/translation-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -7797,7 +7407,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.2.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" }, "funding": [ { @@ -7813,20 +7423,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:32:47+00:00" + "time": "2023-05-30T17:17:10+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.22", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", "shasum": "" }, "require": { @@ -7835,7 +7445,6 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { @@ -7886,7 +7495,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.24" }, "funding": [ { @@ -7902,20 +7511,20 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-05-25T13:05:00+00:00" }, { "name": "tightenco/collect", - "version": "v9.52.0", + "version": "v9.52.7", "source": { "type": "git", "url": "https://github.com/tighten/collect.git", - "reference": "d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b" + "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tighten/collect/zipball/d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b", - "reference": "d4772fe52bbc823d1d2e3d289d3f1ca8c0f3323b", + "url": "https://api.github.com/repos/tighten/collect/zipball/b15143cd11fe01a700fcc449df61adc64452fa6d", + "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d", "shasum": "" }, "require": { @@ -7954,9 +7563,9 @@ ], "support": { "issues": "https://github.com/tighten/collect/issues", - "source": "https://github.com/tighten/collect/tree/v9.52.0" + "source": "https://github.com/tighten/collect/tree/v9.52.7" }, - "time": "2023-02-17T21:37:36+00:00" + "time": "2023-04-14T21:51:36+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8632,16 +8241,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.21.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d" + "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2", + "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2", "shasum": "" }, "require": { @@ -8694,22 +8303,22 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.22.0" }, - "time": "2022-12-13T13:54:32+00:00" + "time": "2023-05-14T12:31:37+00:00" }, { "name": "filp/whoops", - "version": "2.15.1", + "version": "2.15.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "e864ac957acd66e1565f25efda61e37791a5db0b" + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b", - "reference": "e864ac957acd66e1565f25efda61e37791a5db0b", + "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", "shasum": "" }, "require": { @@ -8759,7 +8368,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.1" + "source": "https://github.com/filp/whoops/tree/2.15.2" }, "funding": [ { @@ -8767,7 +8376,7 @@ "type": "github" } ], - "time": "2023-03-06T18:09:13+00:00" + "time": "2023-04-12T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -8822,23 +8431,23 @@ }, { "name": "laravel/sail", - "version": "v1.21.4", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "5e59b4a57181020477e2b18943b27493638e3f89" + "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/5e59b4a57181020477e2b18943b27493638e3f89", - "reference": "5e59b4a57181020477e2b18943b27493638e3f89", + "url": "https://api.github.com/repos/laravel/sail/zipball/923e1e112b6a8598664dbb0ee79dd3137f1c9d56", + "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56", "shasum": "" }, "require": { "illuminate/console": "^8.0|^9.0|^10.0", "illuminate/contracts": "^8.0|^9.0|^10.0", "illuminate/support": "^8.0|^9.0|^10.0", - "php": "^7.3|^8.0", + "php": "^8.0", "symfony/yaml": "^6.0" }, "require-dev": { @@ -8883,20 +8492,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-03-30T12:28:55+00:00" + "time": "2023-05-04T14:52:56+00:00" }, { "name": "mockery/mockery", - "version": "1.5.1", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e" + "reference": "bac1765cb52bbd3364a870e920cb69cd859ee302" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/bac1765cb52bbd3364a870e920cb69cd859ee302", + "reference": "bac1765cb52bbd3364a870e920cb69cd859ee302", "shasum": "" }, "require": { @@ -8908,7 +8517,9 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.3" + "phpunit/phpunit": "^8.5 || ^9.3", + "psalm/plugin-phpunit": "^0.18", + "vimeo/psalm": "^5.9" }, "type": "library", "extra": { @@ -8917,8 +8528,12 @@ } }, "autoload": { - "psr-0": { - "Mockery": "library/" + "files": [ + "library/helpers.php", + "library/Mockery.php" + ], + "psr-4": { + "Mockery\\": "library/Mockery" } }, "notification-url": "https://packagist.org/downloads/", @@ -8953,9 +8568,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.5.1" + "source": "https://github.com/mockery/mockery/tree/1.6.0" }, - "time": "2022-09-07T15:32:08+00:00" + "time": "2023-05-03T12:55:29+00:00" }, { "name": "myclabs/deep-copy", @@ -9534,16 +9149,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.6", + "version": "9.6.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", "shasum": "" }, "require": { @@ -9617,7 +9232,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" }, "funding": [ { @@ -9633,7 +9248,7 @@ "type": "tidelift" } ], - "time": "2023-03-27T11:43:46+00:00" + "time": "2023-05-11T05:14:45+00:00" }, { "name": "sebastian/cli-parser", @@ -9935,16 +9550,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -9989,7 +9604,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -9997,7 +9612,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", @@ -10601,16 +10216,16 @@ }, { "name": "symfony/yaml", - "version": "v6.2.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57" + "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e8e6a1d59e050525f27a1f530aa9703423cb7f57", - "reference": "e8e6a1d59e050525f27a1f530aa9703423cb7f57", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927", + "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927", "shasum": "" }, "require": { @@ -10623,9 +10238,6 @@ "require-dev": { "symfony/console": "^5.4|^6.0" }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, "bin": [ "Resources/bin/yaml-lint" ], @@ -10655,7 +10267,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.2.7" + "source": "https://github.com/symfony/yaml/tree/v6.3.0" }, "funding": [ { @@ -10671,7 +10283,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:57:23+00:00" + "time": "2023-04-28T13:28:14+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/acl.php b/config/acl.php deleted file mode 100644 index b63763f..0000000 --- a/config/acl.php +++ /dev/null @@ -1,106 +0,0 @@ - [ - /* - | The model you want to use as Permission model must use the MateusJunges\ACL\Traits\PermissionsTrait - */ - 'permission' => Junges\ACL\Models\Permission::class, - - /* - | The model you want to use as Group model must use the MateusJunges\ACL\Traits\GroupsTrait - */ - 'group' => Junges\ACL\Models\Group::class, - ], - - /* - |-------------------------------------------------------------------------- - | Route Model Binding - |-------------------------------------------------------------------------- - | - | If you would like model binding to use a database column other than id when - | retrieving a given model class, you may override the getRouteKeyName method - | on the Eloquent model with yours. The default key used for route model binding - | in this package is the `id` database column. You can modify it by changing the - | following configuration: - | - */ - 'route_model_binding_keys' => [ - 'group_model' => 'id', - 'permission_model' => 'id', - ], - - /* - |-------------------------------------------------------------------------- - | Tables - |-------------------------------------------------------------------------- - | Specify the basics authentication tables that you are using. - | Once you required this package, the following tables are - | created by default when you run the command - | - | php artisan migrate - | - | If you want to change this tables, please keep the basic structure unchanged. - | - */ - 'tables' => [ - 'groups' => 'groups', - 'permissions' => 'permissions', - 'users' => 'users', - 'group_has_permissions' => 'group_has_permissions', - 'model_has_permissions' => 'model_has_permissions', - 'model_has_groups' => 'model_has_groups', - ], - - 'column_names' => [ - 'group_pivot_key' => null, - 'permission_pivot_key' => null, - 'model_morph_key' => 'model_id', - 'team_foreign_key' => 'team_id' - ], - - 'teams' => false, - - /* - |-------------------------------------------------------------------------- - | Ignition Solution Suggestions - |-------------------------------------------------------------------------- - | - | To enable the ignition solutions for laravel-acl, set this flag to true. - | - | The solutions will then be automatically registered with ignition if its installed. - | - */ - 'offer_solutions' => false, - - 'register_permission_check_method' => true, - - 'cache' => [ - /* - * All permissions are cached for 24 hours by default. If permissions or groups are updated, - * then the cache is flushed automatically. - */ - 'expiration_time' => DateInterval::createFromDateString('24 hours'), - - /* - * The cache key used to store permissions. - */ - 'key' => 'junges.acl.cache', - - /* - * You can optionally specify a cache driver to use for permissions caching using - * store drivers listed in config/cache.php. - */ - 'store' => 'default' - ] -]; diff --git a/config/app.php b/config/app.php index d60981b..cf42dc4 100644 --- a/config/app.php +++ b/config/app.php @@ -161,7 +161,7 @@ return [ Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class, - Spatie\Permission\PermissionServiceProvider::class, + /* * Package Service Providers... @@ -175,6 +175,7 @@ return [ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + Spatie\Permission\PermissionServiceProvider::class, ], diff --git a/config/auth.php b/config/auth.php index 378076e..ee1adfa 100644 --- a/config/auth.php +++ b/config/auth.php @@ -60,26 +60,14 @@ return [ */ 'providers' => [ - 'ldap' => [ - 'driver' => 'ldap', //'eloquent', - 'model' => LdapRecord\Models\ActiveDirectory\User::class, //App\Models\User::class, - 'rules' => [ - App\Ldap\Rules\OnlyInGroupUsers::class, - ], - 'database' => [ - 'model' => App\Models\User::class, - 'sync_passwords'=> false, - 'sync_attributes' => [ - 'name' => 'displayname', - 'email' => 'mail', - ], - ], + 'users' => [ + 'driver' => 'eloquent', + 'model' => App\Models\User::class, ], - - 'users' => [ + /*'users' => [ 'driver' => 'database', 'table' => 'users', - ], + ],*/ ], /* diff --git a/database/migrations/2023_04_06_150643_create_permissions_table.php b/database/migrations/2023_04_06_150643_create_permissions_table.php deleted file mode 100644 index 87b28e1..0000000 --- a/database/migrations/2023_04_06_150643_create_permissions_table.php +++ /dev/null @@ -1,29 +0,0 @@ -bigIncrements('id'); - $table->string('name'); - $table->string('guard_name'); - $table->text('description')->nullable(); - $table->softDeletes(); - $table->timestamps(); - - $table->unique(['name', 'guard_name']); - }); - } - - public function down() - { - $tables = config('acl.tables'); - Schema::dropIfExists($tables['permissions']); - } -} diff --git a/database/migrations/2023_04_06_150645_create_groups_table.php b/database/migrations/2023_04_06_150645_create_groups_table.php deleted file mode 100644 index 7c7ccc7..0000000 --- a/database/migrations/2023_04_06_150645_create_groups_table.php +++ /dev/null @@ -1,42 +0,0 @@ -bigIncrements('id'); - - if ($teams || config("acl.testing")) { - $table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable(); - $table->index($columnNames['team_foreign_key'], 'groups_team_foreign_key_index'); - } - - $table->string('name'); - $table->string('guard_name'); - $table->text('description')->nullable(); - $table->softDeletes(); - $table->timestamps(); - - if ($teams || config('acl.testing')) { - $table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']); - } else { - $table->unique(['name', 'guard_name']); - } - }); - } - - public function down() - { - $groupsTable = config('acl.tables.groups', 'groups'); - Schema::dropIfExists($groupsTable); - } -} diff --git a/database/migrations/2023_04_06_150647_create_model_has_permissions_table.php b/database/migrations/2023_04_06_150647_create_model_has_permissions_table.php deleted file mode 100644 index 87a9224..0000000 --- a/database/migrations/2023_04_06_150647_create_model_has_permissions_table.php +++ /dev/null @@ -1,47 +0,0 @@ -unsignedBigInteger(AclRegistrar::$pivotPermission); - $table->string('model_type'); - $table->unsignedBigInteger($columnNames['model_morph_key']); - $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_id_model_type_index'); - - $table->foreign(AclRegistrar::$pivotPermission) - ->references('id') - ->on($permissionsTable) - ->cascadeOnDelete(); - - if ($teams) { - $table->unsignedBigInteger($columnNames['team_foreign_key']); - $table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index'); - - $table->primary([$columnNames['team_foreign_key'], AclRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'], - 'model_has_permissions_permission_model_type_primary'); - } else { - $table->primary([AclRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'], - 'model_has_permissions_permission_model_type_primary'); - } - }); - } - - public function down() - { - $modelHasPermissionTable = config('acl.tables.model_has_permissions', 'model_has_permissions'); - Schema::dropIfExists($modelHasPermissionTable); - } -} diff --git a/database/migrations/2023_04_06_150649_create_model_has_groups_table.php b/database/migrations/2023_04_06_150649_create_model_has_groups_table.php deleted file mode 100644 index 601ee37..0000000 --- a/database/migrations/2023_04_06_150649_create_model_has_groups_table.php +++ /dev/null @@ -1,47 +0,0 @@ -unsignedBigInteger(AclRegistrar::$pivotGroup); - - $table->string('model_type'); - $table->unsignedBigInteger($columnNames['model_morph_key']); - $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_groups_model_id_model_type_index'); - - $table->foreign(AclRegistrar::$pivotGroup) - ->references('id') - ->on($groupsTable) - ->cascadeOnDelete(); - - if ($teams) { - $table->unsignedBigInteger($columnNames['team_foreign_key']); - $table->index($columnNames['team_foreign_key'], 'model_has_groups_team_foreign_key_index'); - - $table->primary([$columnNames['team_foreign_key'], AclRegistrar::$pivotGroup, $columnNames['model_morph_key'], 'model_type'], - 'model_has_groups_group_model_type_primary'); - } else { - $table->primary([AclRegistrar::$pivotGroup, $columnNames['model_morph_key'], 'model_type'], - 'model_has_groups_group_model_type_primary'); - } - }); - } - - public function down() - { - $modelHasGroupsTable = config('acl.tables.model_has_groups', 'model_has_groups'); - Schema::dropIfExists($modelHasGroupsTable); - } -} diff --git a/database/migrations/2023_04_06_150651_create_group_has_permissions_table.php b/database/migrations/2023_04_06_150651_create_group_has_permissions_table.php deleted file mode 100644 index ca45663..0000000 --- a/database/migrations/2023_04_06_150651_create_group_has_permissions_table.php +++ /dev/null @@ -1,40 +0,0 @@ -unsignedBigInteger(AclRegistrar::$pivotPermission); - $table->unsignedBigInteger(AclRegistrar::$pivotGroup); - - $table->foreign(AclRegistrar::$pivotPermission) - ->references('id') - ->on($permissionsTable) - ->cascadeOnDelete(); - - $table->foreign(AclRegistrar::$pivotGroup) - ->references('id') - ->on($groupsTable) - ->cascadeOnDelete(); - - $table->primary([AclRegistrar::$pivotPermission, AclRegistrar::$pivotGroup], 'group_has_permission_permission_id_group_id_primary'); - }); - } - - public function down() - { - $groupHasPermissionsTable = config('acl.tables.group_has_permissions', 'group_has_permissions'); - - Schema::dropIfExists($groupHasPermissionsTable); - } -} diff --git a/database/migrations/2023_05_30_111044_column_users_roles.php b/database/migrations/2023_05_30_111044_column_users_roles.php deleted file mode 100644 index ae66786..0000000 --- a/database/migrations/2023_05_30_111044_column_users_roles.php +++ /dev/null @@ -1,36 +0,0 @@ -softDeletes(); - $table->string('user_role',25)->default('user')->nullable(false); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - // - $table->dropColumn('user_role'); - $table->dropSoftDeletes(); - }); - } -} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 797a895..1dfa68d 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -18,6 +18,7 @@ class DatabaseSeeder extends Seeder UserSeeder::class, TagSeeder::class, CategorieSeeder::class, + RoleSeeder::class, ]); } } diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php new file mode 100644 index 0000000..b48deec --- /dev/null +++ b/database/seeders/RoleSeeder.php @@ -0,0 +1,83 @@ + 'admin' + ]); + $role_user = Role::create([ + 'name' => 'user' + ]); + $role_guest = Role::create([ + 'name' => 'guest' + ]); + + // Permission Creation + Permission::create([ + 'name' => 'conti' + ]); + Permission::create([ + 'name' => 'consumi' + ]); + Permission::create([ + 'name' => 'automobili' + ]); + Permission::create([ + 'name' => 'contatti' + ]); + Permission::create([ + 'name' => 'affitti' + ]); + Permission::create([ + 'name' => 'progetti' + ]); + Permission::create([ + 'name' => 'amministrazione' + ]); + + // Assegnazione permessi al ruolo user + $role_user->givePermissionTo('affitti'); + $role_user->givePermissionTo('automobili'); + $role_user->givePermissionTo('contatti'); + $role_user->givePermissionTo('consumi'); + $role_user->givePermissionTo('conti'); + $role_user->givePermissionTo('progetti'); + // Assegnazione permessi al ruolo guest + $role_guest->givePermissionTo('affitti'); + + $admin = User::create([ + 'name'=>'Amministratore', + 'email'=>'admin@localhost.local', + 'password'=>Hash::make('password'), + ])->assignRole($role_admin); + + $user = User::create([ + 'name'=>'Utente', + 'email'=>'user@localhost.local', + 'password'=>Hash::make('password'), + ])->assignRole($role_user); + + $guest = User::create([ + 'name'=>'Guest', + 'email'=>'guest@localhost.local', + 'password'=>Hash::make('password'), + ])->assignRole($role_guest); + } +} diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index d9d2561..f0c0b43 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -22,16 +22,9 @@ class UserSeeder extends Seeder 'name'=>'SystemUser', 'email'=>'system@localhost.local', 'password'=>Hash::make(Str::random(16)), - 'user_role'=>'user', - ] - ); - DB::table('users')->insert( - [ - 'name'=>'admin', - 'email'=>env('SYSADMIN_MAIL'), - 'password'=>Hash::make('admin'), - 'user_role'=>'admin', + ] ); + } } diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 55e4060..6a6eda5 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -1,7 +1,9 @@
  • Riepilogo
  • +@can('conti')
  • Spese/Incassi +
  • + +@endcan +@can('consumi')
  • Consumi @@ -28,8 +33,12 @@
  • Energia Elettrica
  • +@endcan +@can('automobili')
  • Automobili
  • +@endcan +@can('contatti')
  • Contatti @@ -40,8 +49,12 @@
  • Nuovo contatto
  • +@endcan +@can('progetti')
  • Progetti
  • +@endcan +@can('amministrazione')
  • Amministrazione
  • + @endcan diff --git a/resources/views/components/usermenu.blade.php b/resources/views/components/usermenu.blade.php index a194c57..29bf668 100644 --- a/resources/views/components/usermenu.blade.php +++ b/resources/views/components/usermenu.blade.php @@ -7,10 +7,10 @@