Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into use_new_laravel_scim_server

Brady Wetheringtonc79f5b8b745a
diff --cc app/Models/Group.php
index 1cf1f2d955,408236f38f..589c980b1c
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@@ -75,26 -81,6 +81,12 @@@ class Group extends SnipeMode
return $this->belongsToMany(User::class, 'users_groups');
}
+ /* this is just a shim for SCIM to work */
+ public function members()
+ {
+ return $this->users();
+ }
+
- /**
- * Get the user that created the group
- *
- * @author A. Gianotto <[email protected]>
- *
- * @since [v6.3.0]
- *
- * @return Relation
- */
- public function adminuser()
- {
- return $this->belongsTo(User::class, 'created_by')->withTrashed();
- }
-
/**
* Decode JSON permissions into array
*
diff --cc composer.lock
index 3ba9fb6022,69b1e35a33..6be8a1ee9e
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -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": "9b90f7c41700d032674e3024516a963f",
- "content-hash": "7ad2fea76ed176b9a86ba5eeb0b07557",
++ "content-hash": "010e4f225586a6b3e7bc98f2f71cc0c6",
"packages": [
{
"name": "alek13/slack",
@@@ -95,11 -95,9 +95,10 @@@
"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"
},
- "default-branch": true,
"type": "library",
"extra": {
"laravel": {