@@ -21,7 +21,7 @@ |
||
21 | 21 | protected $pdo; |
22 | 22 | |
23 | 23 | /** |
24 | - * @param PDO $pdo |
|
24 | + * @param \PDO $pdo |
|
25 | 25 | */ |
26 | 26 | public function __construct(\PDO $pdo) |
27 | 27 | { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $this->columns = []; |
45 | 45 | |
46 | 46 | try { |
47 | - $query = $this->pdo->prepare('PRAGMA table_info("' . $tableName . '");'); |
|
47 | + $query = $this->pdo->prepare('PRAGMA table_info("'.$tableName.'");'); |
|
48 | 48 | |
49 | 49 | $query->execute(); |
50 | 50 | $query->setFetchMode(\PDO::FETCH_OBJ); |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | * @param \Rougin\Describe\Column &$column |
113 | 113 | * @return void |
114 | 114 | */ |
115 | - protected function setForeignColumn($tableName, $row, Column &$column) |
|
115 | + protected function setForeignColumn($tableName, $row, Column & $column) |
|
116 | 116 | { |
117 | - $query = $this->pdo->prepare('PRAGMA foreign_key_list("' . $tableName . '");'); |
|
117 | + $query = $this->pdo->prepare('PRAGMA foreign_key_list("'.$tableName.'");'); |
|
118 | 118 | |
119 | 119 | $query->execute(); |
120 | 120 | $query->setFetchMode(\PDO::FETCH_OBJ); |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | */ |
139 | 139 | protected function prepareForeignColumns(array $columns, $tableName) |
140 | 140 | { |
141 | - $query = $this->pdo->prepare('PRAGMA foreign_key_list("' . $tableName . '");'); |
|
141 | + $query = $this->pdo->prepare('PRAGMA foreign_key_list("'.$tableName.'");'); |
|
142 | 142 | |
143 | 143 | $query->execute(); |
144 | 144 | $query->setFetchMode(\PDO::FETCH_OBJ); |
@@ -157,9 +157,9 @@ discard block |
||
157 | 157 | * @param \Rougin\Describe\Column &$column |
158 | 158 | * @return void |
159 | 159 | */ |
160 | - protected function setProperties($row, Column &$column) |
|
160 | + protected function setProperties($row, Column & $column) |
|
161 | 161 | { |
162 | - if (! $row->notnull) { |
|
162 | + if ( ! $row->notnull) { |
|
163 | 163 | $column->setNull(true); |
164 | 164 | } |
165 | 165 |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public function __construct(array $database) |
27 | 27 | { |
28 | - $mysql = [ 'mysql', 'mysqli' ]; |
|
29 | - $sqlite = [ 'pdo', 'sqlite', 'sqlite3' ]; |
|
28 | + $mysql = ['mysql', 'mysqli']; |
|
29 | + $sqlite = ['pdo', 'sqlite', 'sqlite3']; |
|
30 | 30 | |
31 | 31 | // NOTE: To be removed in v1.0.0 |
32 | 32 | if (isset($database['default'])) { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | if (in_array($database['dbdriver'], $mysql)) { |
37 | - $dsn = 'mysql:host=' . $database['hostname'] . ';dbname=' . $database['database']; |
|
37 | + $dsn = 'mysql:host='.$database['hostname'].';dbname='.$database['database']; |
|
38 | 38 | $pdo = new \PDO($dsn, $database['username'], $database['password']); |
39 | 39 | |
40 | 40 | $this->driver = new MySQLDriver($pdo, $database['database']); |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $result = $object; |
25 | 25 | |
26 | 26 | if (method_exists($object, $method)) { |
27 | - $result = call_user_func_array([ $object, $method ], $parameters); |
|
27 | + $result = call_user_func_array([$object, $method], $parameters); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | return $result; |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function getDriver($driverName, $configuration = []) |
45 | 45 | { |
46 | - $mysql = [ 'mysql', 'mysqli' ]; |
|
47 | - $sqlite = [ 'pdo', 'sqlite', 'sqlite3' ]; |
|
46 | + $mysql = ['mysql', 'mysqli']; |
|
47 | + $sqlite = ['pdo', 'sqlite', 'sqlite3']; |
|
48 | 48 | |
49 | 49 | list($database, $hostname, $username, $password) = $this->parseConfiguration($configuration); |
50 | 50 | |
51 | 51 | if (in_array($driverName, $mysql)) { |
52 | - $dsn = 'mysql:host=' . $hostname . ';dbname=' . $database; |
|
52 | + $dsn = 'mysql:host='.$hostname.';dbname='.$database; |
|
53 | 53 | $pdo = new \PDO($dsn, $username, $password); |
54 | 54 | |
55 | 55 | return new MySQLDriver($pdo, $database); |
@@ -109,6 +109,6 @@ discard block |
||
109 | 109 | } |
110 | 110 | } |
111 | 111 | |
112 | - return [ $database, $hostname, $username, $password ]; |
|
112 | + return [$database, $hostname, $username, $password]; |
|
113 | 113 | } |
114 | 114 | } |
@@ -65,7 +65,7 @@ |
||
65 | 65 | $table = $this->driver->getTable($tableName); |
66 | 66 | |
67 | 67 | if (empty($table) || is_null($table)) { |
68 | - $message = '"' . $tableName . '" table not found in database!'; |
|
68 | + $message = '"'.$tableName.'" table not found in database!'; |
|
69 | 69 | |
70 | 70 | throw new Exceptions\TableNameNotFoundException($message); |
71 | 71 | } |
@@ -211,8 +211,8 @@ |
||
211 | 211 | */ |
212 | 212 | public function setDataType($dataType) |
213 | 213 | { |
214 | - $dataTypes = [ 'integer', 'string', 'string' ]; |
|
215 | - $shortHand = [ 'int', 'varchar', 'text' ]; |
|
214 | + $dataTypes = ['integer', 'string', 'string']; |
|
215 | + $shortHand = ['int', 'varchar', 'text']; |
|
216 | 216 | |
217 | 217 | $index = array_search($dataType, $shortHand); |
218 | 218 |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->columns = []; |
52 | 52 | |
53 | 53 | try { |
54 | - $information = $this->pdo->prepare('DESCRIBE ' . $tableName); |
|
54 | + $information = $this->pdo->prepare('DESCRIBE '.$tableName); |
|
55 | 55 | |
56 | 56 | $information->execute(); |
57 | 57 | $information->setFetchMode(\PDO::FETCH_OBJ); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * @param \Rougin\Describe\Column &$column |
123 | 123 | * @return void |
124 | 124 | */ |
125 | - protected function setKey($row, Column &$column) |
|
125 | + protected function setKey($row, Column & $column) |
|
126 | 126 | { |
127 | 127 | switch ($row->Key) { |
128 | 128 | case 'PRI': |
@@ -150,14 +150,14 @@ discard block |
||
150 | 150 | * @param \Rougin\Describe\Column &$column |
151 | 151 | * @return void |
152 | 152 | */ |
153 | - protected function setForeignColumn($tableName, $row, Column &$column) |
|
153 | + protected function setForeignColumn($tableName, $row, Column & $column) |
|
154 | 154 | { |
155 | - $query = 'SELECT COLUMN_NAME as "column",' . |
|
156 | - 'REFERENCED_COLUMN_NAME as "referenced_column",' . |
|
157 | - 'CONCAT(REFERENCED_TABLE_SCHEMA, ".", REFERENCED_TABLE_NAME) as "referenced_table"' . |
|
158 | - 'FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ' . |
|
159 | - 'WHERE CONSTRAINT_SCHEMA = "' . $this->database . '" ' . |
|
160 | - 'AND TABLE_NAME = "' . $tableName . '";'; |
|
155 | + $query = 'SELECT COLUMN_NAME as "column",'. |
|
156 | + 'REFERENCED_COLUMN_NAME as "referenced_column",'. |
|
157 | + 'CONCAT(REFERENCED_TABLE_SCHEMA, ".", REFERENCED_TABLE_NAME) as "referenced_table"'. |
|
158 | + 'FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE '. |
|
159 | + 'WHERE CONSTRAINT_SCHEMA = "'.$this->database.'" '. |
|
160 | + 'AND TABLE_NAME = "'.$tableName.'";'; |
|
161 | 161 | |
162 | 162 | $foreignTable = $this->pdo->prepare($query); |
163 | 163 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | * @param \Rougin\Describe\Column &$column |
182 | 182 | * @return void |
183 | 183 | */ |
184 | - protected function setProperties($row, Column &$column) |
|
184 | + protected function setProperties($row, Column & $column) |
|
185 | 185 | { |
186 | 186 | $null = 'Null'; |
187 | 187 |