diff --git a/Dockerfile b/Dockerfile
index 53cddcf..2f8807c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,31 @@
-#Installiere Alpine, PHP und Nginx
-FROM serversideup/php:8.3-fpm-nginx-alpine
-USER root
-
-# Workdirectory setzen
-WORKDIR /var/www/html
-
-# Packages installieren
-RUN apk add --update libjpeg-turbo-dev libpng-dev libzip-dev ghostscript openldap npm
-
-# Ldap certificate prüfen auf never stellen
-RUN echo "TLS_REQCERT never" >> /etc/openldap/ldap.conf && install-php-extensions ldap imagick gd
-
-# Projekt kopieren
-COPY . /var/www/html
-
-# .env.example kopieren
-COPY .env.example.productive /var/www/html/.env
-
-# Laravel.log file erstellen
-RUN touch /var/www/html/storage/logs/laravel.log && chown -R www-data:www-data /var/www/html/storage/logs/laravel.log && chown -R www-data:www-data /var/www/html && composer install --no-dev --optimize-autoloader
-
-RUN npm i && npm run build
-
-# Laravel App Key generieren
-RUN php artisan key:generate
-
-# Imagick Limits erhöhen
-RUN sed -ri -e 's///g' /etc/ImageMagick-6/policy.xml
-RUN sed -ri -e 's///g' /etc/ImageMagick-6/policy.xml
-RUN sed -ri -e 's///g' /etc/ImageMagick-6/policy.xml
-
-# User auf www-data setzen
-USER www-data
+#Installiere Alpine, PHP und Nginx
+FROM serversideup/php:8.3-fpm-nginx-alpine
+USER root
+
+# Workdirectory setzen
+WORKDIR /var/www/html
+
+# Projekt kopieren
+COPY . /var/www/html
+
+# .env.example kopieren
+COPY .env.example.productive /var/www/html/.env
+
+# Packages installieren
+RUN apk add --no-cache --virtual build-depend --update libjpeg-turbo-dev libpng-dev libzip-dev ghostscript openldap npm imagemagick && \
+ echo "TLS_REQCERT never" >> /etc/openldap/ldap.conf && \
+ install-php-extensions ldap imagick gd && \
+ touch /var/www/html/storage/logs/laravel.log && \
+ chown -R www-data:www-data /var/www/html/storage/logs/laravel.log && \
+ chown -R www-data:www-data /var/www/html && \
+ composer install --no-dev --optimize-autoloader && \
+ npm i && \
+ npm run build && \
+ php artisan key:generate && \
+ sed -ri -e 's///g' /etc/ImageMagick-7/policy.xml && \
+ sed -ri -e 's///g' /etc/ImageMagick-7/policy.xml && \
+ sed -ri -e 's///g' /etc/ImageMagick-7/policy.xml && \
+ apk del build-depend
+
+# User auf www-data setzen
+USER www-data
diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index baae255..2145858 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -198,6 +198,11 @@ public function destroy(string $id)
public function discover(Request $request) {
$ip = request()->ip();
+ // If HTTP_X_FORWARDED_FOR is set, use that instead
+ if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ }
+
$device = Device::where('ip_address', $ip)->first();
if($device) {
diff --git a/composer.lock b/composer.lock
index 962d4fb..d34702f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -212,16 +212,16 @@
},
{
"name": "directorytree/ldaprecord",
- "version": "v3.6.4",
+ "version": "v3.7.0",
"source": {
"type": "git",
"url": "https://github.com/DirectoryTree/LdapRecord.git",
- "reference": "81768726262e3000675598821353c801e71df71d"
+ "reference": "4113aa08f72bbc76630fad3b05d57cd431fb0839"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/81768726262e3000675598821353c801e71df71d",
- "reference": "81768726262e3000675598821353c801e71df71d",
+ "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/4113aa08f72bbc76630fad3b05d57cd431fb0839",
+ "reference": "4113aa08f72bbc76630fad3b05d57cd431fb0839",
"shasum": ""
},
"require": {
@@ -284,7 +284,7 @@
"type": "github"
}
],
- "time": "2024-05-13T15:57:23+00:00"
+ "time": "2024-07-26T21:20:12+00:00"
},
{
"name": "directorytree/ldaprecord-laravel",
@@ -769,24 +769,24 @@
},
{
"name": "graham-campbell/result-type",
- "version": "v1.1.2",
+ "version": "v1.1.3",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
- "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
- "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+ "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+ "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
- "phpoption/phpoption": "^1.9.2"
+ "phpoption/phpoption": "^1.9.3"
},
"require-dev": {
- "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"autoload": {
@@ -815,7 +815,7 @@
],
"support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues",
- "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+ "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
},
"funding": [
{
@@ -827,26 +827,26 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T22:16:48+00:00"
+ "time": "2024-07-20T21:45:45+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.8.1",
+ "version": "7.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
- "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -857,9 +857,9 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
- "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "guzzle/client-integration-tests": "3.0.2",
"php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -937,7 +937,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+ "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
},
"funding": [
{
@@ -953,20 +953,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:35:24+00:00"
+ "time": "2024-07-24T11:22:20+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+ "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+ "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
"shasum": ""
},
"require": {
@@ -974,7 +974,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"type": "library",
"extra": {
@@ -1020,7 +1020,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.2"
+ "source": "https://github.com/guzzle/promises/tree/2.0.3"
},
"funding": [
{
@@ -1036,20 +1036,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:19:20+00:00"
+ "time": "2024-07-18T10:29:17+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.6.2",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"shasum": ""
},
"require": {
@@ -1064,8 +1064,8 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "http-interop/http-factory-tests": "0.9.0",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1136,7 +1136,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+ "source": "https://github.com/guzzle/psr7/tree/2.7.0"
},
"funding": [
{
@@ -1152,7 +1152,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:05:35+00:00"
+ "time": "2024-07-18T11:15:46+00:00"
},
{
"name": "guzzlehttp/uri-template",
@@ -1326,16 +1326,16 @@
},
{
"name": "laravel/framework",
- "version": "v11.15.0",
+ "version": "v11.21.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b"
+ "reference": "9d9d36708d56665b12185493f684abce38ad2d30"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/ba85f1c019bed59b3c736c9c4502805efd0ba84b",
- "reference": "ba85f1c019bed59b3c736c9c4502805efd0ba84b",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/9d9d36708d56665b12185493f684abce38ad2d30",
+ "reference": "9d9d36708d56665b12185493f684abce38ad2d30",
"shasum": ""
},
"require": {
@@ -1528,20 +1528,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-07-09T15:38:12+00:00"
+ "time": "2024-08-20T15:00:52+00:00"
},
{
"name": "laravel/prompts",
- "version": "v0.1.24",
+ "version": "v0.1.25",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
- "reference": "409b0b4305273472f3754826e68f4edbd0150149"
+ "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
- "reference": "409b0b4305273472f3754826e68f4edbd0150149",
+ "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
+ "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
"shasum": ""
},
"require": {
@@ -1584,9 +1584,9 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
- "source": "https://github.com/laravel/prompts/tree/v0.1.24"
+ "source": "https://github.com/laravel/prompts/tree/v0.1.25"
},
- "time": "2024-06-17T13:58:22+00:00"
+ "time": "2024-08-12T22:06:33+00:00"
},
{
"name": "laravel/sanctum",
@@ -1654,26 +1654,27 @@
},
{
"name": "laravel/serializable-closure",
- "version": "v1.3.3",
+ "version": "v1.3.4",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
- "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+ "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
- "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+ "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
- "nesbot/carbon": "^2.61",
+ "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+ "nesbot/carbon": "^2.61|^3.0",
"pestphp/pest": "^1.21.3",
"phpstan/phpstan": "^1.8.2",
- "symfony/var-dumper": "^5.4.11"
+ "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
},
"type": "library",
"extra": {
@@ -1710,7 +1711,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
- "time": "2023-11-08T14:08:06+00:00"
+ "time": "2024-08-02T07:48:17+00:00"
},
{
"name": "laravel/tinker",
@@ -1843,16 +1844,16 @@
},
{
"name": "league/commonmark",
- "version": "2.4.2",
+ "version": "2.5.3",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+ "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
- "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+ "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
"shasum": ""
},
"require": {
@@ -1865,8 +1866,8 @@
},
"require-dev": {
"cebe/markdown": "^1.0",
- "commonmark/cmark": "0.30.3",
- "commonmark/commonmark.js": "0.30.0",
+ "commonmark/cmark": "0.31.1",
+ "commonmark/commonmark.js": "0.31.1",
"composer/package-versions-deprecated": "^1.8",
"embed/embed": "^4.4",
"erusev/parsedown": "^1.0",
@@ -1888,7 +1889,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.5-dev"
+ "dev-main": "2.6-dev"
}
},
"autoload": {
@@ -1945,7 +1946,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-02T11:59:32+00:00"
+ "time": "2024-08-16T11:46:16+00:00"
},
{
"name": "league/config",
@@ -2219,16 +2220,16 @@
},
{
"name": "livewire/livewire",
- "version": "v3.5.2",
+ "version": "v3.5.6",
"source": {
"type": "git",
"url": "https://github.com/livewire/livewire.git",
- "reference": "636725c1f87bc7844dd80277488268db27eec1aa"
+ "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/livewire/livewire/zipball/636725c1f87bc7844dd80277488268db27eec1aa",
- "reference": "636725c1f87bc7844dd80277488268db27eec1aa",
+ "url": "https://api.github.com/repos/livewire/livewire/zipball/597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
+ "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
"shasum": ""
},
"require": {
@@ -2236,6 +2237,7 @@
"illuminate/routing": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0",
"illuminate/validation": "^10.0|^11.0",
+ "laravel/prompts": "^0.1.24",
"league/mime-type-detection": "^1.9",
"php": "^8.1",
"symfony/console": "^6.0|^7.0",
@@ -2244,7 +2246,6 @@
"require-dev": {
"calebporzio/sushi": "^2.1",
"laravel/framework": "^10.15.0|^11.0",
- "laravel/prompts": "^0.1.6",
"mockery/mockery": "^1.3.1",
"orchestra/testbench": "^8.21.0|^9.0",
"orchestra/testbench-dusk": "^8.24|^9.1",
@@ -2283,7 +2284,7 @@
"description": "A front-end framework for Laravel.",
"support": {
"issues": "https://github.com/livewire/livewire/issues",
- "source": "https://github.com/livewire/livewire/tree/v3.5.2"
+ "source": "https://github.com/livewire/livewire/tree/v3.5.6"
},
"funding": [
{
@@ -2291,7 +2292,7 @@
"type": "github"
}
],
- "time": "2024-07-03T17:22:45+00:00"
+ "time": "2024-08-19T11:52:18+00:00"
},
{
"name": "monolog/monolog",
@@ -2396,16 +2397,16 @@
},
{
"name": "nesbot/carbon",
- "version": "3.6.0",
+ "version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "39c8ef752db6865717cc3fba63970c16f057982c"
+ "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/39c8ef752db6865717cc3fba63970c16f057982c",
- "reference": "39c8ef752db6865717cc3fba63970c16f057982c",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
+ "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
"shasum": ""
},
"require": {
@@ -2498,7 +2499,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-20T15:52:59+00:00"
+ "time": "2024-08-19T06:22:39+00:00"
},
{
"name": "nette/schema",
@@ -2564,20 +2565,20 @@
},
{
"name": "nette/utils",
- "version": "v4.0.4",
+ "version": "v4.0.5",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
- "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+ "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
- "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+ "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+ "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
"shasum": ""
},
"require": {
- "php": ">=8.0 <8.4"
+ "php": "8.0 - 8.4"
},
"conflict": {
"nette/finder": "<3",
@@ -2644,9 +2645,9 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
- "source": "https://github.com/nette/utils/tree/v4.0.4"
+ "source": "https://github.com/nette/utils/tree/v4.0.5"
},
- "time": "2024-01-17T16:50:36+00:00"
+ "time": "2024-08-07T15:39:19+00:00"
},
{
"name": "nikic/php-parser",
@@ -2885,16 +2886,16 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.9.2",
+ "version": "1.9.3",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
- "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+ "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
"shasum": ""
},
"require": {
@@ -2902,13 +2903,13 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
"dev-master": "1.9-dev"
@@ -2944,7 +2945,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
},
"funding": [
{
@@ -2956,7 +2957,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T21:59:55+00:00"
+ "time": "2024-07-20T21:41:07+00:00"
},
{
"name": "psr/cache",
@@ -3868,16 +3869,16 @@
},
{
"name": "symfony/cache",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae"
+ "reference": "8ac37acee794372f9732fe8a61a8221f6762148e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/e933e1d947ffb88efcdd34a2bd51561cab7deaae",
- "reference": "e933e1d947ffb88efcdd34a2bd51561cab7deaae",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/8ac37acee794372f9732fe8a61a8221f6762148e",
+ "reference": "8ac37acee794372f9732fe8a61a8221f6762148e",
"shasum": ""
},
"require": {
@@ -3945,7 +3946,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v7.1.2"
+ "source": "https://github.com/symfony/cache/tree/v7.1.3"
},
"funding": [
{
@@ -3961,7 +3962,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-11T13:32:38+00:00"
+ "time": "2024-07-17T06:10:24+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -4115,16 +4116,16 @@
},
{
"name": "symfony/console",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "0aa29ca177f432ab68533432db0de059f39c92ae"
+ "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/0aa29ca177f432ab68533432db0de059f39c92ae",
- "reference": "0aa29ca177f432ab68533432db0de059f39c92ae",
+ "url": "https://api.github.com/repos/symfony/console/zipball/cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9",
+ "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9",
"shasum": ""
},
"require": {
@@ -4188,7 +4189,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.1.2"
+ "source": "https://github.com/symfony/console/tree/v7.1.3"
},
"funding": [
{
@@ -4204,7 +4205,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-28T10:03:55+00:00"
+ "time": "2024-07-26T12:41:01+00:00"
},
{
"name": "symfony/css-selector",
@@ -4340,16 +4341,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32"
+ "reference": "432bb369952795c61ca1def65e078c4a80dad13c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
- "reference": "2412d3dddb5c9ea51a39cfbff1c565fc9844ca32",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/432bb369952795c61ca1def65e078c4a80dad13c",
+ "reference": "432bb369952795c61ca1def65e078c4a80dad13c",
"shasum": ""
},
"require": {
@@ -4395,7 +4396,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/v7.1.2"
+ "source": "https://github.com/symfony/error-handler/tree/v7.1.3"
},
"funding": [
{
@@ -4411,7 +4412,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-25T19:55:06+00:00"
+ "time": "2024-07-26T13:02:51+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -4571,16 +4572,16 @@
},
{
"name": "symfony/finder",
- "version": "v7.1.1",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
+ "reference": "717c6329886f32dc65e27461f80f2a465412fdca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
- "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/717c6329886f32dc65e27461f80f2a465412fdca",
+ "reference": "717c6329886f32dc65e27461f80f2a465412fdca",
"shasum": ""
},
"require": {
@@ -4615,7 +4616,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v7.1.1"
+ "source": "https://github.com/symfony/finder/tree/v7.1.3"
},
"funding": [
{
@@ -4631,20 +4632,20 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-07-24T07:08:44+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v7.1.1",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa"
+ "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
- "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
+ "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a",
"shasum": ""
},
"require": {
@@ -4692,7 +4693,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v7.1.1"
+ "source": "https://github.com/symfony/http-foundation/tree/v7.1.3"
},
"funding": [
{
@@ -4708,20 +4709,20 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-07-26T12:41:01+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6"
+ "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
- "reference": "ae3fa717db4d41a55d14c2bd92399e37cf5bc0f6",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db9702f3a04cc471ec8c70e881825db26ac5f186",
+ "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186",
"shasum": ""
},
"require": {
@@ -4806,7 +4807,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/v7.1.2"
+ "source": "https://github.com/symfony/http-kernel/tree/v7.1.3"
},
"funding": [
{
@@ -4822,7 +4823,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-28T13:13:31+00:00"
+ "time": "2024-07-26T14:58:15+00:00"
},
{
"name": "symfony/mailer",
@@ -5700,16 +5701,16 @@
},
{
"name": "symfony/process",
- "version": "v7.1.1",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
+ "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
- "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
+ "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca",
+ "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca",
"shasum": ""
},
"require": {
@@ -5741,7 +5742,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v7.1.1"
+ "source": "https://github.com/symfony/process/tree/v7.1.3"
},
"funding": [
{
@@ -5757,20 +5758,20 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-07-26T12:44:47+00:00"
},
{
"name": "symfony/routing",
- "version": "v7.1.1",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0"
+ "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/60c31bab5c45af7f13091b87deb708830f3c96c0",
- "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/8a908a3f22d5a1b5d297578c2ceb41b02fa916d0",
+ "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0",
"shasum": ""
},
"require": {
@@ -5822,7 +5823,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v7.1.1"
+ "source": "https://github.com/symfony/routing/tree/v7.1.3"
},
"funding": [
{
@@ -5838,7 +5839,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-07-17T06:10:24+00:00"
},
{
"name": "symfony/service-contracts",
@@ -5925,16 +5926,16 @@
},
{
"name": "symfony/string",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8"
+ "reference": "ea272a882be7f20cad58d5d78c215001617b7f07"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8",
- "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8",
+ "url": "https://api.github.com/repos/symfony/string/zipball/ea272a882be7f20cad58d5d78c215001617b7f07",
+ "reference": "ea272a882be7f20cad58d5d78c215001617b7f07",
"shasum": ""
},
"require": {
@@ -5992,7 +5993,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v7.1.2"
+ "source": "https://github.com/symfony/string/tree/v7.1.3"
},
"funding": [
{
@@ -6008,20 +6009,20 @@
"type": "tidelift"
}
],
- "time": "2024-06-28T09:27:18+00:00"
+ "time": "2024-07-22T10:25:37+00:00"
},
{
"name": "symfony/translation",
- "version": "v7.1.1",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3"
+ "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
- "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1",
+ "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1",
"shasum": ""
},
"require": {
@@ -6086,7 +6087,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v7.1.1"
+ "source": "https://github.com/symfony/translation/tree/v7.1.3"
},
"funding": [
{
@@ -6102,7 +6103,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:57:53+00:00"
+ "time": "2024-07-26T12:41:01+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -6258,16 +6259,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v7.1.2",
+ "version": "v7.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d"
+ "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5857c57c6b4b86524c08cf4f4bc95327270a816d",
- "reference": "5857c57c6b4b86524c08cf4f4bc95327270a816d",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/86af4617cca75a6e28598f49ae0690f3b9d4591f",
+ "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f",
"shasum": ""
},
"require": {
@@ -6321,7 +6322,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v7.1.2"
+ "source": "https://github.com/symfony/var-dumper/tree/v7.1.3"
},
"funding": [
{
@@ -6337,7 +6338,7 @@
"type": "tidelift"
}
],
- "time": "2024-06-28T08:00:31+00:00"
+ "time": "2024-07-26T12:41:01+00:00"
},
{
"name": "symfony/var-exporter",
@@ -6470,23 +6471,23 @@
},
{
"name": "vlucas/phpdotenv",
- "version": "v5.6.0",
+ "version": "v5.6.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
- "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+ "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
"shasum": ""
},
"require": {
"ext-pcre": "*",
- "graham-campbell/result-type": "^1.1.2",
+ "graham-campbell/result-type": "^1.1.3",
"php": "^7.2.5 || ^8.0",
- "phpoption/phpoption": "^1.9.2",
+ "phpoption/phpoption": "^1.9.3",
"symfony/polyfill-ctype": "^1.24",
"symfony/polyfill-mbstring": "^1.24",
"symfony/polyfill-php80": "^1.24"
@@ -6503,7 +6504,7 @@
"extra": {
"bamarni-bin": {
"bin-links": true,
- "forward-command": true
+ "forward-command": false
},
"branch-alias": {
"dev-master": "5.6-dev"
@@ -6538,7 +6539,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
- "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+ "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
},
"funding": [
{
@@ -6550,7 +6551,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-12T22:43:29+00:00"
+ "time": "2024-07-20T21:52:34+00:00"
},
{
"name": "voku/portable-ascii",
@@ -6873,16 +6874,16 @@
},
{
"name": "laravel/pint",
- "version": "v1.16.2",
+ "version": "v1.17.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
- "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca"
+ "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/pint/zipball/51f1ba679a6afe0315621ad143d788bd7ded0eca",
- "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca",
+ "url": "https://api.github.com/repos/laravel/pint/zipball/e8a88130a25e3f9d4d5785e6a1afca98268ab110",
+ "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110",
"shasum": ""
},
"require": {
@@ -6893,13 +6894,13 @@
"php": "^8.1.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^3.59.3",
- "illuminate/view": "^10.48.12",
- "larastan/larastan": "^2.9.7",
+ "friendsofphp/php-cs-fixer": "^3.61.1",
+ "illuminate/view": "^10.48.18",
+ "larastan/larastan": "^2.9.8",
"laravel-zero/framework": "^10.4.0",
"mockery/mockery": "^1.6.12",
"nunomaduro/termwind": "^1.15.1",
- "pestphp/pest": "^2.34.8"
+ "pestphp/pest": "^2.35.0"
},
"bin": [
"builds/pint"
@@ -6935,20 +6936,20 @@
"issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint"
},
- "time": "2024-07-09T15:58:08+00:00"
+ "time": "2024-08-06T15:11:54+00:00"
},
{
"name": "laravel/sail",
- "version": "v1.30.2",
+ "version": "v1.31.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
- "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887"
+ "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/sail/zipball/f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
- "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
+ "url": "https://api.github.com/repos/laravel/sail/zipball/3d06dd18cee8059baa7b388af00ba47f6d96bd85",
+ "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85",
"shasum": ""
},
"require": {
@@ -6998,7 +6999,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
- "time": "2024-07-05T16:01:51+00:00"
+ "time": "2024-08-02T07:45:47+00:00"
},
{
"name": "mockery/mockery",
@@ -7145,38 +7146,38 @@
},
{
"name": "nunomaduro/collision",
- "version": "v8.1.1",
+ "version": "v8.4.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9"
+ "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/13e5d538b95a744d85f447a321ce10adb28e9af9",
- "reference": "13e5d538b95a744d85f447a321ce10adb28e9af9",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a",
+ "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a",
"shasum": ""
},
"require": {
"filp/whoops": "^2.15.4",
"nunomaduro/termwind": "^2.0.1",
"php": "^8.2.0",
- "symfony/console": "^7.0.4"
+ "symfony/console": "^7.1.3"
},
"conflict": {
"laravel/framework": "<11.0.0 || >=12.0.0",
"phpunit/phpunit": "<10.5.1 || >=12.0.0"
},
"require-dev": {
- "larastan/larastan": "^2.9.2",
- "laravel/framework": "^11.0.0",
- "laravel/pint": "^1.14.0",
- "laravel/sail": "^1.28.2",
- "laravel/sanctum": "^4.0.0",
+ "larastan/larastan": "^2.9.8",
+ "laravel/framework": "^11.19.0",
+ "laravel/pint": "^1.17.1",
+ "laravel/sail": "^1.31.0",
+ "laravel/sanctum": "^4.0.2",
"laravel/tinker": "^2.9.0",
- "orchestra/testbench-core": "^9.0.0",
- "pestphp/pest": "^2.34.1 || ^3.0.0",
- "sebastian/environment": "^6.0.1 || ^7.0.0"
+ "orchestra/testbench-core": "^9.2.3",
+ "pestphp/pest": "^2.35.0 || ^3.0.0",
+ "sebastian/environment": "^6.1.0 || ^7.0.0"
},
"type": "library",
"extra": {
@@ -7238,7 +7239,7 @@
"type": "patreon"
}
],
- "time": "2024-03-06T16:20:09+00:00"
+ "time": "2024-08-03T15:32:23+00:00"
},
{
"name": "phar-io/manifest",
@@ -7683,16 +7684,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "11.2.7",
+ "version": "11.3.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "15c7e69dec4a8f246840859e6b430bd2abeb5039"
+ "reference": "fe179875ef0c14e90b75617002767eae0a742641"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/15c7e69dec4a8f246840859e6b430bd2abeb5039",
- "reference": "15c7e69dec4a8f246840859e6b430bd2abeb5039",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fe179875ef0c14e90b75617002767eae0a742641",
+ "reference": "fe179875ef0c14e90b75617002767eae0a742641",
"shasum": ""
},
"require": {
@@ -7713,7 +7714,7 @@
"phpunit/php-timer": "^7.0.1",
"sebastian/cli-parser": "^3.0.2",
"sebastian/code-unit": "^3.0.1",
- "sebastian/comparator": "^6.0.1",
+ "sebastian/comparator": "^6.0.2",
"sebastian/diff": "^6.0.2",
"sebastian/environment": "^7.2.0",
"sebastian/exporter": "^6.1.3",
@@ -7731,7 +7732,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "11.2-dev"
+ "dev-main": "11.3-dev"
}
},
"autoload": {
@@ -7763,7 +7764,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/11.2.7"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/11.3.1"
},
"funding": [
{
@@ -7779,7 +7780,7 @@
"type": "tidelift"
}
],
- "time": "2024-07-10T11:50:09+00:00"
+ "time": "2024-08-13T06:14:23+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -7953,16 +7954,16 @@
},
{
"name": "sebastian/comparator",
- "version": "6.0.1",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "131942b86d3587291067a94f295498ab6ac79c20"
+ "reference": "450d8f237bd611c45b5acf0733ce43e6bb280f81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/131942b86d3587291067a94f295498ab6ac79c20",
- "reference": "131942b86d3587291067a94f295498ab6ac79c20",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/450d8f237bd611c45b5acf0733ce43e6bb280f81",
+ "reference": "450d8f237bd611c45b5acf0733ce43e6bb280f81",
"shasum": ""
},
"require": {
@@ -8018,7 +8019,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
- "source": "https://github.com/sebastianbergmann/comparator/tree/6.0.1"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/6.0.2"
},
"funding": [
{
@@ -8026,7 +8027,7 @@
"type": "github"
}
],
- "time": "2024-07-03T04:48:07+00:00"
+ "time": "2024-08-12T06:07:25+00:00"
},
{
"name": "sebastian/complexity",
@@ -8706,16 +8707,16 @@
},
{
"name": "spatie/backtrace",
- "version": "1.6.1",
+ "version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/spatie/backtrace.git",
- "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
+ "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
- "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
+ "url": "https://api.github.com/repos/spatie/backtrace/zipball/1a9a145b044677ae3424693f7b06479fc8c137a9",
+ "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9",
"shasum": ""
},
"require": {
@@ -8753,7 +8754,7 @@
"spatie"
],
"support": {
- "source": "https://github.com/spatie/backtrace/tree/1.6.1"
+ "source": "https://github.com/spatie/backtrace/tree/1.6.2"
},
"funding": [
{
@@ -8765,20 +8766,20 @@
"type": "other"
}
],
- "time": "2024-04-24T13:22:11+00:00"
+ "time": "2024-07-22T08:21:24+00:00"
},
{
"name": "spatie/error-solutions",
- "version": "1.0.5",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/error-solutions.git",
- "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13"
+ "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/error-solutions/zipball/4bb6c734dc992b2db3e26df1ef021c75d2218b13",
- "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13",
+ "url": "https://api.github.com/repos/spatie/error-solutions/zipball/ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+ "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67",
"shasum": ""
},
"require": {
@@ -8831,7 +8832,7 @@
],
"support": {
"issues": "https://github.com/spatie/error-solutions/issues",
- "source": "https://github.com/spatie/error-solutions/tree/1.0.5"
+ "source": "https://github.com/spatie/error-solutions/tree/1.1.1"
},
"funding": [
{
@@ -8839,20 +8840,20 @@
"type": "github"
}
],
- "time": "2024-07-09T12:13:32+00:00"
+ "time": "2024-07-25T11:06:04+00:00"
},
{
"name": "spatie/flare-client-php",
- "version": "1.7.0",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/flare-client-php.git",
- "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
+ "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
- "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
+ "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
+ "reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"shasum": ""
},
"require": {
@@ -8870,7 +8871,7 @@
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
- "spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
+ "spatie/pest-plugin-snapshots": "^1.0|^2.0"
},
"type": "library",
"extra": {
@@ -8900,7 +8901,7 @@
],
"support": {
"issues": "https://github.com/spatie/flare-client-php/issues",
- "source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
+ "source": "https://github.com/spatie/flare-client-php/tree/1.8.0"
},
"funding": [
{
@@ -8908,7 +8909,7 @@
"type": "github"
}
],
- "time": "2024-06-12T14:39:14+00:00"
+ "time": "2024-08-01T08:27:26+00:00"
},
{
"name": "spatie/ignition",
diff --git a/database/migrations/2023_09_13_174302_create_permission_tables.php b/database/migrations/2024_08_21_085652_create_permission_tables.php
similarity index 71%
rename from database/migrations/2023_09_13_174302_create_permission_tables.php
rename to database/migrations/2024_08_21_085652_create_permission_tables.php
index 04c3278..9c7044b 100644
--- a/database/migrations/2023_09_13_174302_create_permission_tables.php
+++ b/database/migrations/2024_08_21_085652_create_permission_tables.php
@@ -3,20 +3,19 @@
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
-use Spatie\Permission\PermissionRegistrar;
-class CreatePermissionTables extends Migration
+return new class extends Migration
{
/**
* Run the migrations.
- *
- * @return void
*/
- public function up()
+ public function up(): void
{
+ $teams = config('permission.teams');
$tableNames = config('permission.table_names');
$columnNames = config('permission.column_names');
- $teams = config('permission.teams');
+ $pivotRole = $columnNames['role_pivot_key'] ?? 'role_id';
+ $pivotPermission = $columnNames['permission_pivot_key'] ?? 'permission_id';
if (empty($tableNames)) {
throw new \Exception('Error: config/permission.php not loaded. Run [php artisan config:clear] and try again.');
@@ -26,22 +25,24 @@ public function up()
}
Schema::create($tableNames['permissions'], function (Blueprint $table) {
+ //$table->engine('InnoDB');
$table->bigIncrements('id'); // permission id
- $table->string('name'); // For MySQL 8.0 use string('name', 125);
- $table->string('guard_name'); // For MySQL 8.0 use string('guard_name', 125);
+ $table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
+ $table->string('guard_name'); // For MyISAM use string('guard_name', 25);
$table->timestamps();
$table->unique(['name', 'guard_name']);
});
Schema::create($tableNames['roles'], function (Blueprint $table) use ($teams, $columnNames) {
+ //$table->engine('InnoDB');
$table->bigIncrements('id'); // role id
if ($teams || config('permission.testing')) { // permission.testing is a fix for sqlite testing
$table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable();
$table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index');
}
- $table->string('name'); // For MySQL 8.0 use string('name', 125);
- $table->string('guard_name'); // For MySQL 8.0 use string('guard_name', 125);
+ $table->string('name'); // For MyISAM use string('name', 225); // (or 166 for InnoDB with Redundant/Compact row format)
+ $table->string('guard_name'); // For MyISAM use string('guard_name', 25);
$table->timestamps();
if ($teams || config('permission.testing')) {
$table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']);
@@ -50,14 +51,14 @@ public function up()
}
});
- Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) {
- $table->unsignedBigInteger(PermissionRegistrar::$pivotPermission);
+ Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) {
+ $table->unsignedBigInteger($pivotPermission);
$table->string('model_type');
$table->unsignedBigInteger($columnNames['model_morph_key']);
$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index');
- $table->foreign(PermissionRegistrar::$pivotPermission)
+ $table->foreign($pivotPermission)
->references('id') // permission id
->on($tableNames['permissions'])
->onDelete('cascade');
@@ -65,23 +66,23 @@ public function up()
$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'], PermissionRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
+ $table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'],
'model_has_permissions_permission_model_type_primary');
} else {
- $table->primary([PermissionRegistrar::$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
+ $table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'],
'model_has_permissions_permission_model_type_primary');
}
});
- Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $teams) {
- $table->unsignedBigInteger(PermissionRegistrar::$pivotRole);
+ Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) {
+ $table->unsignedBigInteger($pivotRole);
$table->string('model_type');
$table->unsignedBigInteger($columnNames['model_morph_key']);
$table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index');
- $table->foreign(PermissionRegistrar::$pivotRole)
+ $table->foreign($pivotRole)
->references('id') // role id
->on($tableNames['roles'])
->onDelete('cascade');
@@ -89,29 +90,29 @@ public function up()
$table->unsignedBigInteger($columnNames['team_foreign_key']);
$table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index');
- $table->primary([$columnNames['team_foreign_key'], PermissionRegistrar::$pivotRole, $columnNames['model_morph_key'], 'model_type'],
+ $table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'],
'model_has_roles_role_model_type_primary');
} else {
- $table->primary([PermissionRegistrar::$pivotRole, $columnNames['model_morph_key'], 'model_type'],
+ $table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'],
'model_has_roles_role_model_type_primary');
}
});
- Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
- $table->unsignedBigInteger(PermissionRegistrar::$pivotPermission);
- $table->unsignedBigInteger(PermissionRegistrar::$pivotRole);
+ Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) {
+ $table->unsignedBigInteger($pivotPermission);
+ $table->unsignedBigInteger($pivotRole);
- $table->foreign(PermissionRegistrar::$pivotPermission)
+ $table->foreign($pivotPermission)
->references('id') // permission id
->on($tableNames['permissions'])
->onDelete('cascade');
- $table->foreign(PermissionRegistrar::$pivotRole)
+ $table->foreign($pivotRole)
->references('id') // role id
->on($tableNames['roles'])
->onDelete('cascade');
- $table->primary([PermissionRegistrar::$pivotPermission, PermissionRegistrar::$pivotRole], 'role_has_permissions_permission_id_role_id_primary');
+ $table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary');
});
app('cache')
@@ -121,10 +122,8 @@ public function up()
/**
* Reverse the migrations.
- *
- * @return void
*/
- public function down()
+ public function down(): void
{
$tableNames = config('permission.table_names');
@@ -138,4 +137,4 @@ public function down()
Schema::drop($tableNames['roles']);
Schema::drop($tableNames['permissions']);
}
-}
+};