Rename vars and function

mevdschee · mevdschee · commit 0de825de0295 · 2018-09-01T19:48:40.000+02:00
diff --git a/api.php b/api.php
@@ -458,36 +458,36 @@ public function jsonSerialize()
 class ReflectedDatabase implements \JsonSerializable
 {
     private $name;
-    private $tables;
+    private $tableNames;
 
-    public function __construct(String $name, array $tables)
+    public function __construct(String $name, array $tableNames)
     {
         $this->name = $name;
-        $this->tables = [];
-        foreach ($tables as $table) {
-            $this->tables[$table] = true;
+        $this->tableNames = [];
+        foreach ($tableNames as $tableName) {
+            $this->tableNames[$tableName] = true;
         }
     }
 
     public static function fromReflection(GenericReflection $reflection): ReflectedDatabase
     {
         $name = $reflection->getDatabaseName();
-        $tables = [];
+        $tableNames = [];
         foreach ($reflection->getTables() as $table) {
             $tableName = $table['TABLE_NAME'];
             if (in_array($tableName, $reflection->getIgnoredTables())) {
                 continue;
             }
-            $tables[$tableName] = true;
+            $tableNames[$tableName] = true;
         }
-        return new ReflectedDatabase($name, array_keys($tables));
+        return new ReflectedDatabase($name, array_keys($tableNames));
     }
 
     public static function fromJson( /* object */$json): ReflectedDatabase
     {
         $name = $json->name;
-        $tables = $json->tables;
-        return new ReflectedDatabase($name, $tables);
+        $tableNames = $json->tables;
+        return new ReflectedDatabase($name, $tableNames);
     }
 
     public function getName(): String
@@ -497,19 +497,19 @@ public function getName(): String
 
     public function exists(String $tableName): bool
     {
-        return isset($this->tables[$tableName]);
+        return isset($this->tableNames[$tableName]);
     }
 
-    public function getTables(): array
+    public function getTableNames(): array
     {
-        return array_keys($this->tables);
+        return array_keys($this->tableNames);
     }
 
     public function serialize()
     {
         return [
             'name' => $this->name,
-            'tables' => array_keys($this->tables),
+            'tables' => array_keys($this->tableNames),
         ];
     }
 
@@ -861,7 +861,7 @@ public function getTable(String $tableName): ReflectedTable
 
     public function getTableNames(): array
     {
-        return $this->database->getTables();
+        return $this->database->getTableNames();
     }
 
     public function getDatabaseName(): String
diff --git a/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php b/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php
@@ -6,36 +6,36 @@
 class ReflectedDatabase implements \JsonSerializable
 {
     private $name;
-    private $tables;
+    private $tableNames;
 
-    public function __construct(String $name, array $tables)
+    public function __construct(String $name, array $tableNames)
     {
         $this->name = $name;
-        $this->tables = [];
-        foreach ($tables as $table) {
-            $this->tables[$table] = true;
+        $this->tableNames = [];
+        foreach ($tableNames as $tableName) {
+            $this->tableNames[$tableName] = true;
         }
     }
 
     public static function fromReflection(GenericReflection $reflection): ReflectedDatabase
     {
         $name = $reflection->getDatabaseName();
-        $tables = [];
+        $tableNames = [];
         foreach ($reflection->getTables() as $table) {
             $tableName = $table['TABLE_NAME'];
             if (in_array($tableName, $reflection->getIgnoredTables())) {
                 continue;
             }
-            $tables[$tableName] = true;
+            $tableNames[$tableName] = true;
         }
-        return new ReflectedDatabase($name, array_keys($tables));
+        return new ReflectedDatabase($name, array_keys($tableNames));
     }
 
     public static function fromJson( /* object */$json): ReflectedDatabase
     {
         $name = $json->name;
-        $tables = $json->tables;
-        return new ReflectedDatabase($name, $tables);
+        $tableNames = $json->tables;
+        return new ReflectedDatabase($name, $tableNames);
     }
 
     public function getName(): String
@@ -45,19 +45,19 @@ public function getName(): String
 
     public function exists(String $tableName): bool
     {
-        return isset($this->tables[$tableName]);
+        return isset($this->tableNames[$tableName]);
     }
 
-    public function getTables(): array
+    public function getTableNames(): array
     {
-        return array_keys($this->tables);
+        return array_keys($this->tableNames);
     }
 
     public function serialize()
     {
         return [
             'name' => $this->name,
-            'tables' => array_keys($this->tables),
+            'tables' => array_keys($this->tableNames),
         ];
     }
 
diff --git a/src/Tqdev/PhpCrudApi/Column/ReflectionService.php b/src/Tqdev/PhpCrudApi/Column/ReflectionService.php
@@ -74,7 +74,7 @@ public function getTable(String $tableName): ReflectedTable
 
     public function getTableNames(): array
     {
-        return $this->database->getTables();
+        return $this->database->getTableNames();
     }
 
     public function getDatabaseName(): String

Original file line number	Diff line number	Diff line change
`@@ -458,36 +458,36 @@ public function jsonSerialize()`
`458`	`458`	`class ReflectedDatabase implements \JsonSerializable`
`459`	`459`	`{`
`460`	`460`	`private $name;`
`461`		`- private $tables;`
	`461`	`+ private $tableNames;`
`462`	`462`
`463`		`- public function __construct(String $name, array $tables)`
	`463`	`+ public function __construct(String $name, array $tableNames)`
`464`	`464`	`{`
`465`	`465`	`$this->name = $name;`
`466`		`- $this->tables = [];`
`467`		`- foreach ($tables as $table) {`
`468`		`- $this->tables[$table] = true;`
	`466`	`+ $this->tableNames = [];`
	`467`	`+ foreach ($tableNames as $tableName) {`
	`468`	`+ $this->tableNames[$tableName] = true;`
`469`	`469`	`}`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`public static function fromReflection(GenericReflection $reflection): ReflectedDatabase`
`473`	`473`	`{`
`474`	`474`	`$name = $reflection->getDatabaseName();`
`475`		`- $tables = [];`
	`475`	`+ $tableNames = [];`
`476`	`476`	`foreach ($reflection->getTables() as $table) {`
`477`	`477`	`$tableName = $table['TABLE_NAME'];`
`478`	`478`	`if (in_array($tableName, $reflection->getIgnoredTables())) {`
`479`	`479`	`continue;`
`480`	`480`	`}`
`481`		`- $tables[$tableName] = true;`
	`481`	`+ $tableNames[$tableName] = true;`
`482`	`482`	`}`
`483`		`- return new ReflectedDatabase($name, array_keys($tables));`
	`483`	`+ return new ReflectedDatabase($name, array_keys($tableNames));`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`public static function fromJson( /* object */$json): ReflectedDatabase`
`487`	`487`	`{`
`488`	`488`	`$name = $json->name;`
`489`		`- $tables = $json->tables;`
`490`		`- return new ReflectedDatabase($name, $tables);`
	`489`	`+ $tableNames = $json->tables;`
	`490`	`+ return new ReflectedDatabase($name, $tableNames);`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`public function getName(): String`
`@@ -497,19 +497,19 @@ public function getName(): String`
`497`	`497`
`498`	`498`	`public function exists(String $tableName): bool`
`499`	`499`	`{`
`500`		`- return isset($this->tables[$tableName]);`
	`500`	`+ return isset($this->tableNames[$tableName]);`
`501`	`501`	`}`
`502`	`502`
`503`		`- public function getTables(): array`
	`503`	`+ public function getTableNames(): array`
`504`	`504`	`{`
`505`		`- return array_keys($this->tables);`
	`505`	`+ return array_keys($this->tableNames);`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`public function serialize()`
`509`	`509`	`{`
`510`	`510`	`return [`
`511`	`511`	`'name' => $this->name,`
`512`		`- 'tables' => array_keys($this->tables),`
	`512`	`+ 'tables' => array_keys($this->tableNames),`
`513`	`513`	`];`
`514`	`514`	`}`
`515`	`515`
`@@ -861,7 +861,7 @@ public function getTable(String $tableName): ReflectedTable`
`861`	`861`
`862`	`862`	`public function getTableNames(): array`
`863`	`863`	`{`
`864`		`- return $this->database->getTables();`
	`864`	`+ return $this->database->getTableNames();`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`public function getDatabaseName(): String`
Original file line number	Diff line number	Diff line change
`@@ -6,36 +6,36 @@`
`6`	`6`	`class ReflectedDatabase implements \JsonSerializable`
`7`	`7`	`{`
`8`	`8`	`private $name;`
`9`		`- private $tables;`
	`9`	`+ private $tableNames;`
`10`	`10`
`11`		`- public function __construct(String $name, array $tables)`
	`11`	`+ public function __construct(String $name, array $tableNames)`
`12`	`12`	`{`
`13`	`13`	`$this->name = $name;`
`14`		`- $this->tables = [];`
`15`		`- foreach ($tables as $table) {`
`16`		`- $this->tables[$table] = true;`
	`14`	`+ $this->tableNames = [];`
	`15`	`+ foreach ($tableNames as $tableName) {`
	`16`	`+ $this->tableNames[$tableName] = true;`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public static function fromReflection(GenericReflection $reflection): ReflectedDatabase`
`21`	`21`	`{`
`22`	`22`	`$name = $reflection->getDatabaseName();`
`23`		`- $tables = [];`
	`23`	`+ $tableNames = [];`
`24`	`24`	`foreach ($reflection->getTables() as $table) {`
`25`	`25`	`$tableName = $table['TABLE_NAME'];`
`26`	`26`	`if (in_array($tableName, $reflection->getIgnoredTables())) {`
`27`	`27`	`continue;`
`28`	`28`	`}`
`29`		`- $tables[$tableName] = true;`
	`29`	`+ $tableNames[$tableName] = true;`
`30`	`30`	`}`
`31`		`- return new ReflectedDatabase($name, array_keys($tables));`
	`31`	`+ return new ReflectedDatabase($name, array_keys($tableNames));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static function fromJson( /* object */$json): ReflectedDatabase`
`35`	`35`	`{`
`36`	`36`	`$name = $json->name;`
`37`		`- $tables = $json->tables;`
`38`		`- return new ReflectedDatabase($name, $tables);`
	`37`	`+ $tableNames = $json->tables;`
	`38`	`+ return new ReflectedDatabase($name, $tableNames);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function getName(): String`
`@@ -45,19 +45,19 @@ public function getName(): String`
`45`	`45`
`46`	`46`	`public function exists(String $tableName): bool`
`47`	`47`	`{`
`48`		`- return isset($this->tables[$tableName]);`
	`48`	`+ return isset($this->tableNames[$tableName]);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public function getTables(): array`
	`51`	`+ public function getTableNames(): array`
`52`	`52`	`{`
`53`		`- return array_keys($this->tables);`
	`53`	`+ return array_keys($this->tableNames);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function serialize()`
`57`	`57`	`{`
`58`	`58`	`return [`
`59`	`59`	`'name' => $this->name,`
`60`		`- 'tables' => array_keys($this->tables),`
	`60`	`+ 'tables' => array_keys($this->tableNames),`
`61`	`61`	`];`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getTable(String $tableName): ReflectedTable`
`74`	`74`
`75`	`75`	`public function getTableNames(): array`
`76`	`76`	`{`
`77`		`- return $this->database->getTables();`
	`77`	`+ return $this->database->getTableNames();`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public function getDatabaseName(): String`