Page MenuHomeDevCentral
Files F13135144

D3867.id10013.diff
No OneTemporary
Actions

D3867.id10013.diff
View Options

diff --git a/workspaces/src/Engines/Auth/Actions/AddToGroupUserAction.php b/workspaces/src/Engines/Auth/Actions/AddToGroupUserAction.php
--- a/workspaces/src/Engines/Auth/Actions/AddToGroupUserAction.php
+++ b/workspaces/src/Engines/Auth/Actions/AddToGroupUserAction.php
@@ -20,12 +20,11 @@
use Waystone\Workspaces\Engines\Auth\UserAction;
use Waystone\Workspaces\Engines\Serialization\ArrayDeserializable;
+use Waystone\Workspaces\Engines\Users\UserGroup;
use Exception;
use JsonSerializable;
-use UserGroup;
-
/**
* User action to add a user into a group
*/
diff --git a/workspaces/src/Engines/Framework/Resources.php b/workspaces/src/Engines/Framework/Resources.php
--- a/workspaces/src/Engines/Framework/Resources.php
+++ b/workspaces/src/Engines/Framework/Resources.php
@@ -2,6 +2,7 @@
namespace Waystone\Workspaces\Engines\Framework;
+use Waystone\Workspaces\Engines\Users\UserGroup;
use Waystone\Workspaces\Engines\Users\UserRepository;
use Waystone\Workspaces\Engines\Workspaces\Workspace;
@@ -9,8 +10,6 @@
use Keruald\OmniTools\DataTypes\Option\Option;
use Keruald\OmniTools\DataTypes\Option\Some;
-use UserGroup;
-
use InvalidArgumentException;
class Resources {
diff --git a/workspaces/src/Engines/Users/User.php b/workspaces/src/Engines/Users/User.php
--- a/workspaces/src/Engines/Users/User.php
+++ b/workspaces/src/Engines/Users/User.php
@@ -23,8 +23,6 @@
use Keruald\Database\DatabaseEngine;
-use UserGroup;
-
/**
* User class
*/
diff --git a/workspaces/src/includes/objects/usergroup.php b/workspaces/src/Engines/Users/UserGroup.php
rename from workspaces/src/includes/objects/usergroup.php
rename to workspaces/src/Engines/Users/UserGroup.php
--- a/workspaces/src/includes/objects/usergroup.php
+++ b/workspaces/src/Engines/Users/UserGroup.php
@@ -15,8 +15,12 @@
* @filesource
*/
+namespace Waystone\Workspaces\Engines\Users;
+
use Waystone\Workspaces\Engines\Errors\ErrorHandling;
+use Exception;
+
/**
* UserGroup class
*
diff --git a/workspaces/src/includes/autoload.php b/workspaces/src/includes/autoload.php
--- a/workspaces/src/includes/autoload.php
+++ b/workspaces/src/includes/autoload.php
@@ -49,7 +49,6 @@
///
if ($name == 'Disclaimer') { require $dir . '/includes/objects/Disclaimer.php'; return true; }
- if ($name == 'UserGroup') { require $dir . '/includes/objects/usergroup.php'; return true; }
return false;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 20, 13:51 (19 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3188130
Default Alt Text
D3867.id10013.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator