@@ -53,7 +53,7 @@ |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
56 | - * @return bool|int |
|
56 | + * @return integer |
|
57 | 57 | * @throws Exception |
58 | 58 | */ |
59 | 59 | public function getID() |
@@ -50,7 +50,7 @@ |
||
50 | 50 | * |
51 | 51 | * @param string $dbName Database name |
52 | 52 | * |
53 | - * @return boolean |
|
53 | + * @return boolean|null |
|
54 | 54 | * @throws \InvalidArgumentException |
55 | 55 | */ |
56 | 56 | public function switchDatabase($dbName) |
@@ -162,7 +162,7 @@ |
||
162 | 162 | $this->conn->beginTransaction(); |
163 | 163 | |
164 | 164 | $dbh = null; |
165 | - $res = $this->conn->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $values . ');'); |
|
165 | + $res = $this->conn->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$values.');'); |
|
166 | 166 | foreach ($rows AS $row) { |
167 | 167 | $dbh = $res->execute($row); |
168 | 168 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | class ResolverInjector extends Injector |
21 | 21 | { |
22 | 22 | /** |
23 | - * @return bool |
|
23 | + * @return IResolver |
|
24 | 24 | * @throws Exception |
25 | 25 | */ |
26 | 26 | public function build() |
@@ -20,7 +20,7 @@ |
||
20 | 20 | class ResolverInjector extends Injector |
21 | 21 | { |
22 | 22 | /** |
23 | - * @return bool |
|
23 | + * @return IResolver |
|
24 | 24 | * @throws Exception |
25 | 25 | */ |
26 | 26 | public function build() |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | public static function finder(IQuery $query = null, $single = false) |
108 | 108 | { |
109 | 109 | $query = ($query instanceof Query) ? $query : new Query((new ConnectionInjector)->build()); |
110 | - $query->table = static::$tableName . ' m'; |
|
110 | + $query->table = static::$tableName.' m'; |
|
111 | 111 | $query->objectName = get_called_class(); |
112 | 112 | $query->single = $single; |
113 | 113 | |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | $sql = new Query((new ConnectionInjector)->build()); |
166 | 166 | |
167 | 167 | if ((new ConnectionInjector)->build()->getDriverType() === 'pgsql') { |
168 | - $sql->addWhere('"m"."' . $relation['On'][1] . '"=:' . $relation['On'][0]); |
|
168 | + $sql->addWhere('"m"."'.$relation['On'][1].'"=:'.$relation['On'][0]); |
|
169 | 169 | } else { |
170 | - $sql->addWhere('`m`.`' . $relation['On'][1] . '`=:' . $relation['On'][0]); |
|
170 | + $sql->addWhere('`m`.`'.$relation['On'][1].'`=:'.$relation['On'][0]); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | if ($relation['Where']) { |
@@ -380,9 +380,9 @@ discard block |
||
380 | 380 | if (!$where) { |
381 | 381 | if (self::$primaryKey) { |
382 | 382 | if ((new ConnectionInjector)->build()->getDriverType() === 'pgsql') { |
383 | - $where .= '"' . self::$primaryKey . '" = :' . self::$primaryKey; |
|
383 | + $where .= '"'.self::$primaryKey.'" = :'.self::$primaryKey; |
|
384 | 384 | } else { |
385 | - $where .= '`' . self::$primaryKey . '` = :' . self::$primaryKey; |
|
385 | + $where .= '`'.self::$primaryKey.'` = :'.self::$primaryKey; |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | } else { |
@@ -155,7 +155,7 @@ |
||
155 | 155 | $query->distinct = true; |
156 | 156 | $query->select = $this->db->getDriverType() === 'pgsql' ? '"role" AS "name"' : '`role` AS `name`'; |
157 | 157 | $query->table = $this->db->getDriverType() === 'pgsql' ? '"rbac_user"' : '`rbac_user`'; |
158 | - $query->addWhere(($this->db->getDriverType() === 'pgsql' ? '"user"=' : '`user`=') . $userId); |
|
158 | + $query->addWhere(($this->db->getDriverType() === 'pgsql' ? '"user"=' : '`user`=').$userId); |
|
159 | 159 | $query->single = false; |
160 | 160 | |
161 | 161 | return $query->run(\PDO::FETCH_ASSOC); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | if (0 !== count($this->js)) { |
109 | 109 | /** @noinspection ForeachSourceInspection */ |
110 | 110 | foreach ($this->js AS $script) { |
111 | - $this->view->registerScriptFile($this->publishPath . $script, $this->isHead); |
|
111 | + $this->view->registerScriptFile($this->publishPath.$script, $this->isHead); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | if (0 !== count($this->css)) { |
122 | 122 | /** @noinspection ForeachSourceInspection */ |
123 | 123 | foreach ($this->css AS $style) { |
124 | - $this->view->registerCssFile($this->publishPath . $style, $this->isHead); |
|
124 | + $this->view->registerCssFile($this->publishPath.$style, $this->isHead); |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | } |