refactor: add property $config

kenjis · kenjis · commit a220b5cf9ddb · 2022-09-21T14:33:49.000+09:00
diff --git a/src/Handlers/DatabaseHandler.php b/src/Handlers/DatabaseHandler.php
@@ -4,6 +4,7 @@
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\I18n\Time;
+use CodeIgniter\Settings\Config\Settings;
 use RuntimeException;
 
 /**
@@ -24,12 +25,15 @@ class DatabaseHandler extends ArrayHandler
      */
     private $hydrated = [];
 
+    private Settings $config;
+
     /**
      * Stores the configured database table.
      */
     public function __construct()
     {
-        $this->builder = db_connect(config('Settings')->database['group'])->table(config('Settings')->database['table']);
+        $this->config  = config('Settings');
+        $this->builder = db_connect($this->config->database['group'])->table($this->config->database['table']);
     }
 
     /**
@@ -97,7 +101,7 @@ public function set(string $class, string $property, $value = null, ?string $con
         }
 
         if ($result !== true) {
-            throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error writing to the database.');
+            throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error writing to the database.');
         }
 
         // Update storage
@@ -122,7 +126,7 @@ public function forget(string $class, string $property, ?string $context = null)
             ->delete();
 
         if (! $result) {
-            throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error writing to the database.');
+            throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error writing to the database.');
         }
 
         // Delete from local storage
@@ -160,7 +164,7 @@ private function hydrate(?string $context): void
         }
 
         if (is_bool($result = $query->get())) {
-            throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error reading from database.');
+            throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error reading from database.');
         }
 
         foreach ($result->getResultObject() as $row) {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use CodeIgniter\Database\BaseBuilder;`
`6`	`6`	`use CodeIgniter\I18n\Time;`
	`7`	`+use CodeIgniter\Settings\Config\Settings;`
`7`	`8`	`use RuntimeException;`
`8`	`9`
`9`	`10`	`/**`
`@@ -24,12 +25,15 @@ class DatabaseHandler extends ArrayHandler`
`24`	`25`	`*/`
`25`	`26`	`private $hydrated = [];`
`26`	`27`
	`28`	`+ private Settings $config;`
	`29`	`+`
`27`	`30`	`/**`
`28`	`31`	`* Stores the configured database table.`
`29`	`32`	`*/`
`30`	`33`	`public function __construct()`
`31`	`34`	`{`
`32`		`- $this->builder = db_connect(config('Settings')->database['group'])->table(config('Settings')->database['table']);`
	`35`	`+ $this->config = config('Settings');`
	`36`	`+ $this->builder = db_connect($this->config->database['group'])->table($this->config->database['table']);`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`/**`
`@@ -97,7 +101,7 @@ public function set(string $class, string $property, $value = null, ?string $con`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`if ($result !== true) {`
`100`		`- throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error writing to the database.');`
	`104`	`+ throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error writing to the database.');`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`// Update storage`
`@@ -122,7 +126,7 @@ public function forget(string $class, string $property, ?string $context = null)`
`122`	`126`	`->delete();`
`123`	`127`
`124`	`128`	`if (! $result) {`
`125`		`- throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error writing to the database.');`
	`129`	`+ throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error writing to the database.');`
`126`	`130`	`}`
`127`	`131`
`128`	`132`	`// Delete from local storage`
`@@ -160,7 +164,7 @@ private function hydrate(?string $context): void`
`160`	`164`	`}`
`161`	`165`
`162`	`166`	`if (is_bool($result = $query->get())) {`
`163`		`- throw new RuntimeException(db_connect(config('Settings')->database['group'])->error()['message'] ?? 'Error reading from database.');`
	`167`	`+ throw new RuntimeException(db_connect($this->config->database['group'])->error()['message'] ?? 'Error reading from database.');`
`164`	`168`	`}`
`165`	`169`
`166`	`170`	`foreach ($result->getResultObject() as $row) {`