Rename function

mevdschee · mevdschee · commit 4b5ee40ec015 · 2018-09-01T19:50:20.000+02:00
diff --git a/api.php b/api.php
@@ -806,21 +806,21 @@ public function __construct(GenericDB $db, Cache $cache, int $ttl)
         $this->db = $db;
         $this->cache = $cache;
         $this->ttl = $ttl;
-        $this->database = $this->loadTables(true);
+        $this->database = $this->loadDatabase(true);
         $this->tables = [];
     }
 
-    private function loadTables(bool $useCache): ReflectedDatabase
+    private function loadDatabase(bool $useCache): ReflectedDatabase
     {
         $data = $useCache ? $this->cache->get('ReflectedDatabase') : '';
         if ($data != '') {
-            $tables = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
+            $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
         } else {
-            $tables = ReflectedDatabase::fromReflection($this->db->reflection());
-            $data = gzcompress(json_encode($tables, JSON_UNESCAPED_UNICODE));
+            $database = ReflectedDatabase::fromReflection($this->db->reflection());
+            $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));
             $this->cache->set('ReflectedDatabase', $data, $this->ttl);
         }
-        return $tables;
+        return $database;
     }
 
     private function loadTable(String $tableName, bool $useCache): ReflectedTable
@@ -838,7 +838,7 @@ private function loadTable(String $tableName, bool $useCache): ReflectedTable
 
     public function refreshTables()
     {
-        $this->database = $this->loadTables(false);
+        $this->database = $this->loadDatabase(false);
     }
 
     public function refreshTable(String $tableName)
diff --git a/src/Tqdev/PhpCrudApi/Column/ReflectionService.php b/src/Tqdev/PhpCrudApi/Column/ReflectionService.php
@@ -19,21 +19,21 @@ public function __construct(GenericDB $db, Cache $cache, int $ttl)
         $this->db = $db;
         $this->cache = $cache;
         $this->ttl = $ttl;
-        $this->database = $this->loadTables(true);
+        $this->database = $this->loadDatabase(true);
         $this->tables = [];
     }
 
-    private function loadTables(bool $useCache): ReflectedDatabase
+    private function loadDatabase(bool $useCache): ReflectedDatabase
     {
         $data = $useCache ? $this->cache->get('ReflectedDatabase') : '';
         if ($data != '') {
-            $tables = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
+            $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));
         } else {
-            $tables = ReflectedDatabase::fromReflection($this->db->reflection());
-            $data = gzcompress(json_encode($tables, JSON_UNESCAPED_UNICODE));
+            $database = ReflectedDatabase::fromReflection($this->db->reflection());
+            $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));
             $this->cache->set('ReflectedDatabase', $data, $this->ttl);
         }
-        return $tables;
+        return $database;
     }
 
     private function loadTable(String $tableName, bool $useCache): ReflectedTable
@@ -51,7 +51,7 @@ private function loadTable(String $tableName, bool $useCache): ReflectedTable
 
     public function refreshTables()
     {
-        $this->database = $this->loadTables(false);
+        $this->database = $this->loadDatabase(false);
     }
 
     public function refreshTable(String $tableName)

Original file line number	Diff line number	Diff line change
`@@ -806,21 +806,21 @@ public function __construct(GenericDB $db, Cache $cache, int $ttl)`
`806`	`806`	`$this->db = $db;`
`807`	`807`	`$this->cache = $cache;`
`808`	`808`	`$this->ttl = $ttl;`
`809`		`- $this->database = $this->loadTables(true);`
	`809`	`+ $this->database = $this->loadDatabase(true);`
`810`	`810`	`$this->tables = [];`
`811`	`811`	`}`
`812`	`812`
`813`		`- private function loadTables(bool $useCache): ReflectedDatabase`
	`813`	`+ private function loadDatabase(bool $useCache): ReflectedDatabase`
`814`	`814`	`{`
`815`	`815`	`$data = $useCache ? $this->cache->get('ReflectedDatabase') : '';`
`816`	`816`	`if ($data != '') {`
`817`		`- $tables = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));`
	`817`	`+ $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));`
`818`	`818`	`} else {`
`819`		`- $tables = ReflectedDatabase::fromReflection($this->db->reflection());`
`820`		`- $data = gzcompress(json_encode($tables, JSON_UNESCAPED_UNICODE));`
	`819`	`+ $database = ReflectedDatabase::fromReflection($this->db->reflection());`
	`820`	`+ $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));`
`821`	`821`	`$this->cache->set('ReflectedDatabase', $data, $this->ttl);`
`822`	`822`	`}`
`823`		`- return $tables;`
	`823`	`+ return $database;`
`824`	`824`	`}`
`825`	`825`
`826`	`826`	`private function loadTable(String $tableName, bool $useCache): ReflectedTable`
`@@ -838,7 +838,7 @@ private function loadTable(String $tableName, bool $useCache): ReflectedTable`
`838`	`838`
`839`	`839`	`public function refreshTables()`
`840`	`840`	`{`
`841`		`- $this->database = $this->loadTables(false);`
	`841`	`+ $this->database = $this->loadDatabase(false);`
`842`	`842`	`}`
`843`	`843`
`844`	`844`	`public function refreshTable(String $tableName)`
Original file line number	Diff line number	Diff line change
`@@ -19,21 +19,21 @@ public function __construct(GenericDB $db, Cache $cache, int $ttl)`
`19`	`19`	`$this->db = $db;`
`20`	`20`	`$this->cache = $cache;`
`21`	`21`	`$this->ttl = $ttl;`
`22`		`- $this->database = $this->loadTables(true);`
	`22`	`+ $this->database = $this->loadDatabase(true);`
`23`	`23`	`$this->tables = [];`
`24`	`24`	`}`
`25`	`25`
`26`		`- private function loadTables(bool $useCache): ReflectedDatabase`
	`26`	`+ private function loadDatabase(bool $useCache): ReflectedDatabase`
`27`	`27`	`{`
`28`	`28`	`$data = $useCache ? $this->cache->get('ReflectedDatabase') : '';`
`29`	`29`	`if ($data != '') {`
`30`		`- $tables = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));`
	`30`	`+ $database = ReflectedDatabase::fromJson(json_decode(gzuncompress($data)));`
`31`	`31`	`} else {`
`32`		`- $tables = ReflectedDatabase::fromReflection($this->db->reflection());`
`33`		`- $data = gzcompress(json_encode($tables, JSON_UNESCAPED_UNICODE));`
	`32`	`+ $database = ReflectedDatabase::fromReflection($this->db->reflection());`
	`33`	`+ $data = gzcompress(json_encode($database, JSON_UNESCAPED_UNICODE));`
`34`	`34`	`$this->cache->set('ReflectedDatabase', $data, $this->ttl);`
`35`	`35`	`}`
`36`		`- return $tables;`
	`36`	`+ return $database;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private function loadTable(String $tableName, bool $useCache): ReflectedTable`
`@@ -51,7 +51,7 @@ private function loadTable(String $tableName, bool $useCache): ReflectedTable`
`51`	`51`
`52`	`52`	`public function refreshTables()`
`53`	`53`	`{`
`54`		`- $this->database = $this->loadTables(false);`
	`54`	`+ $this->database = $this->loadDatabase(false);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function refreshTable(String $tableName)`