A free open source IT asset/license management system
WIP: switching to new version of laravel-scim-server
Brady Wetherington61df3bc46231
diff --git a/composer.json b/composer.jsonindex f7b8641756..0a33a3b0df 100644--- a/composer.json+++ b/composer.json@@ -29,7 +29,7 @@"ext-mbstring": "*","ext-pdo": "*","alek13/slack": "^2.0",- "arietimmerman/laravel-scim-server": "dev-laravel_11_compatibility",+ "arietimmerman/laravel-scim-server": "dev-upstream_master","bacon/bacon-qr-code": "^2.0","barryvdh/laravel-debugbar": "^3.13","barryvdh/laravel-dompdf": "^2.0",diff --git a/composer.lock b/composer.lockindex f3a06b4556..9069fb0317 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": "4a00fb4c4b9a2ac161183e9ae9217298",+ "content-hash": "1086d1b9a8b59a62d87c4e74a5babf89","packages": [{"name": "alek13/slack",@@ -74,29 +74,30 @@},{"name": "arietimmerman/laravel-scim-server",- "version": "dev-laravel_11_compatibility",+ "version": "dev-upstream_master","source": {"type": "git","url": "https://github.com/grokability/laravel-scim-server.git",- "reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe"+ "reference": "da40db79d76cf3b4c7e57cde41df6ecf8119afb7"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/6c771799090bfe04dcee94a1dc9f82870aed4dbe",- "reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe",+ "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/da40db79d76cf3b4c7e57cde41df6ecf8119afb7",+ "reference": "da40db79d76cf3b4c7e57cde41df6ecf8119afb7","shasum": ""},"require": {- "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",- "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",- "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",- "php": "^7.0|^8.0",+ "illuminate/console": "^10.0|^11.0|^12.0",+ "illuminate/database": "^10.0|^11.0|^12.0",+ "illuminate/support": "^10.0|^11.0|^12.0",+ "php": "^8.0","tmilos/scim-filter-parser": "^1.3","tmilos/scim-schema": "^0.1.0"},"require-dev": {+ "friendsofphp/php-cs-fixer": "^3.66","laravel/legacy-factories": "*",- "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0"+ "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0"},"type": "library","extra": {@@ -130,9 +131,9 @@],"description": "Laravel Package for creating a SCIM server","support": {- "source": "https://github.com/grokability/laravel-scim-server/tree/laravel_11_compatibility"+ "source": "https://github.com/grokability/laravel-scim-server/tree/upstream_master"},- "time": "2025-01-20T14:49:28+00:00"+ "time": "2025-08-28T19:24:40+00:00"},{"name": "aws/aws-crt-php",