Page MenuHomeDevCentral
Files F12602826

D3859.id9997.diff
No OneTemporary
Actions

D3859.id9997.diff
View Options

diff --git a/workspaces/src/Engines/Auth/AuthenticationMethod.php b/workspaces/src/Engines/Auth/AuthenticationMethod.php
--- a/workspaces/src/Engines/Auth/AuthenticationMethod.php
+++ b/workspaces/src/Engines/Auth/AuthenticationMethod.php
@@ -119,7 +119,7 @@
* @return Option<User> the user if a user has been found; otherwise, false.
*/
private function findUser () : Option {
- $users = $this->context->userRepository;
+ $users = $this->context->resources->users;
if ($this->remoteUserId != '') {
$user = $users->getUserFromRemoteIdentity(
@@ -202,7 +202,7 @@
throw new Exception("Can't create user: the canCreateUser property is set at false.");
}
- $users = $this->context->userRepository;
+ $users = $this->context->resources->users;
$user = $users->create();
$user->name = $this->name;
diff --git a/workspaces/src/Engines/Framework/Application.php b/workspaces/src/Engines/Framework/Application.php
--- a/workspaces/src/Engines/Framework/Application.php
+++ b/workspaces/src/Engines/Framework/Application.php
@@ -18,13 +18,12 @@
$context->config = $config;
$context->db = Database::load($config["sql"]);
- $context->userRepository = new UserRepository($context->db);
$context->resources = new Resources(
- $context->userRepository,
+ new UserRepository($context->db),
);
$context->session = Session::load(
$context->db,
- $context->userRepository,
+ $context->resources->users,
);
$context->url = get_current_url_fragments();
$context->initializeTemplateEngine($context->config['Theme']);
diff --git a/workspaces/src/Engines/Framework/Context.php b/workspaces/src/Engines/Framework/Context.php
--- a/workspaces/src/Engines/Framework/Context.php
+++ b/workspaces/src/Engines/Framework/Context.php
@@ -45,11 +45,6 @@
*/
public array $config;
- /**
- * @var UserRepository the users already loaded from database
- */
- public UserRepository $userRepository;
-
public Resources $resources;
/**
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
@@ -16,7 +16,7 @@
class Resources {
public function __construct (
- private UserRepository $users,
+ public UserRepository $users,
) {
}

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 13, 01:59 (19 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3160822
Default Alt Text
D3859.id9997.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