@@ -12,7 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\Database; |
| 14 | 14 | |
| 15 | -use ArrayAccess, Countable, Iterator; |
|
| 15 | +use ArrayAccess; |
|
| 16 | +use Countable; |
|
| 17 | +use Iterator; |
|
| 16 | 18 | use chillerlan\Database\Traits\{Enumerable, Magic}; |
| 17 | 19 | |
| 18 | 20 | /** |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | ***************/ |
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | - * @param int|string $offset |
|
| 118 | + * @param integer $offset |
|
| 119 | 119 | * |
| 120 | 120 | * @return bool |
| 121 | 121 | */ |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | - * @param int|string $offset |
|
| 127 | + * @param integer $offset |
|
| 128 | 128 | * |
| 129 | - * @return \chillerlan\Database\DBResultRow|mixed|null |
|
| 129 | + * @return DBResultRow|null |
|
| 130 | 130 | */ |
| 131 | 131 | public function offsetGet($offset){ |
| 132 | 132 | return $this->array[$offset] ?? null; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | ************/ |
| 177 | 177 | |
| 178 | 178 | /** |
| 179 | - * @return \chillerlan\Database\DBResultRow|mixed |
|
| 179 | + * @return DBResultRow|null |
|
| 180 | 180 | */ |
| 181 | 181 | public function current(){ |
| 182 | 182 | return $this->offsetGet($this->offset); |
@@ -199,7 +199,7 @@ |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /** |
| 202 | - * @param $stmt |
|
| 202 | + * @param PDOStatement $stmt |
|
| 203 | 203 | * @param string|null $index |
| 204 | 204 | * @param bool $assoc |
| 205 | 205 | * |
@@ -161,16 +161,16 @@ |
||
| 161 | 161 | * |
| 162 | 162 | * @return void |
| 163 | 163 | */ |
| 164 | - protected function bindParams(PDOStatement &$stmt, array $values){ |
|
| 164 | + protected function bindParams(PDOStatement&$stmt, array $values){ |
|
| 165 | 165 | $param_no = 1; |
| 166 | 166 | |
| 167 | 167 | foreach($values as $v){ |
| 168 | 168 | |
| 169 | 169 | switch(gettype($v)){ |
| 170 | 170 | case 'boolean': $type = PDO::PARAM_BOOL; break; |
| 171 | - case 'integer': $type = PDO::PARAM_INT; break; |
|
| 171 | + case 'integer': $type = PDO::PARAM_INT; break; |
|
| 172 | 172 | case 'NULL' : $type = PDO::PARAM_NULL; break; |
| 173 | - default: $type = PDO::PARAM_STR; break; |
|
| 173 | + default: $type = PDO::PARAM_STR; break; |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | $stmt->bindValue($param_no, $v, $type); |
@@ -15,7 +15,8 @@ |
||
| 15 | 15 | use chillerlan\Database\Drivers\{ |
| 16 | 16 | DBDriverAbstract, DBDriverException, DBDriverInterface |
| 17 | 17 | }; |
| 18 | -use PDO, PDOStatement; |
|
| 18 | +use PDO; |
|
| 19 | +use PDOStatement; |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * @see http://php.net/manual/pdo.constants.php |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | * |
| 130 | 130 | * @var int |
| 131 | 131 | */ |
| 132 | - public $sqlite_flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE; |
|
| 132 | + public $sqlite_flags = SQLITE3_OPEN_READWRITE|SQLITE3_OPEN_CREATE; |
|
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | 135 | * An optional encryption key used when encrypting and decrypting an SQLite database. |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * |
| 44 | 44 | * @return mixed|null |
| 45 | 45 | */ |
| 46 | - public function __get(string $name) { |
|
| 46 | + public function __get(string $name){ |
|
| 47 | 47 | |
| 48 | 48 | if(isset($this->array[$name])){ |
| 49 | 49 | return $this->array[$name]; |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * |
| 44 | 44 | * @return mixed|null |
| 45 | 45 | */ |
| 46 | - public function __get(string $name) { |
|
| 46 | + public function __get(string $name){ |
|
| 47 | 47 | |
| 48 | 48 | if(isset($this->array[$name])){ |
| 49 | 49 | return $this->array[$name]; |
@@ -12,8 +12,11 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\DatabaseTest; |
| 14 | 14 | |
| 15 | +use ArrayAccess; |
|
| 16 | +use Countable; |
|
| 17 | +use Iterator; |
|
| 15 | 18 | use chillerlan\Database\DBResult; |
| 16 | -use Iterator, ArrayAccess, Countable, stdClass; |
|
| 19 | +use stdClass; |
|
| 17 | 20 | |
| 18 | 21 | class DBResultTest extends TestAbstract{ |
| 19 | 22 | |
@@ -45,6 +45,10 @@ |
||
| 45 | 45 | abstract protected function __raw(string $sql, string $index = null, bool $assoc = true); |
| 46 | 46 | abstract protected function __prepared(string $sql, array $values = [], string $index = null, bool $assoc = true); |
| 47 | 47 | abstract protected function __multi(string $sql, array $values); |
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @param callable $callback |
|
| 51 | + */ |
|
| 48 | 52 | abstract protected function __multi_callback(string $sql, array $data, $callback); |
| 49 | 53 | |
| 50 | 54 | /** |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\Database\Drivers; |
| 14 | 14 | |
| 15 | +use Psr\SimpleCache\CacheInterface; |
|
| 15 | 16 | use chillerlan\Database\DBOptions; |
| 16 | 17 | use chillerlan\Database\DBResult; |
| 17 | 18 | use chillerlan\Database\Traits\Magic; |
| 18 | -use Psr\SimpleCache\CacheInterface; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @property string $dialect |
@@ -18,21 +18,21 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | trait Magic{ |
| 20 | 20 | |
| 21 | - public function __get(string $name) { |
|
| 21 | + public function __get(string $name){ |
|
| 22 | 22 | return $this->get($name); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function __set(string $name, $value) { |
|
| 25 | + public function __set(string $name, $value){ |
|
| 26 | 26 | $this->set($name, $value); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - private function get(string $name) { |
|
| 29 | + private function get(string $name){ |
|
| 30 | 30 | $method = 'magic_get_'.$name; |
| 31 | 31 | |
| 32 | 32 | return method_exists($this, $method) ? $this->$method() : null; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - private function set(string $name, $value) { |
|
| 35 | + private function set(string $name, $value){ |
|
| 36 | 36 | $method = 'magic_set_'.$name; |
| 37 | 37 | |
| 38 | 38 | if(method_exists($this, $method)){ |
@@ -18,21 +18,21 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | trait Magic{ |
| 20 | 20 | |
| 21 | - public function __get(string $name) { |
|
| 21 | + public function __get(string $name){ |
|
| 22 | 22 | return $this->get($name); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function __set(string $name, $value) { |
|
| 25 | + public function __set(string $name, $value){ |
|
| 26 | 26 | $this->set($name, $value); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - private function get(string $name) { |
|
| 29 | + private function get(string $name){ |
|
| 30 | 30 | $method = 'magic_get_'.$name; |
| 31 | 31 | |
| 32 | 32 | return method_exists($this, $method) ? $this->$method() : null; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - private function set(string $name, $value) { |
|
| 35 | + private function set(string $name, $value){ |
|
| 36 | 36 | $method = 'magic_set_'.$name; |
| 37 | 37 | |
| 38 | 38 | if(method_exists($this, $method)){ |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\DatabaseTest\Drivers; |
| 14 | 14 | |
| 15 | -use chillerlan\Database\Drivers\DBDriverInterface; |
|
| 16 | -use chillerlan\DatabaseTest\TestAbstract; |
|
| 17 | 15 | use Psr\SimpleCache\CacheInterface; |
| 16 | +use chillerlan\DatabaseTest\TestAbstract; |
|
| 17 | +use chillerlan\Database\Drivers\DBDriverInterface; |
|
| 18 | 18 | |
| 19 | 19 | abstract class DriverTestAbstract extends TestAbstract{ |
| 20 | 20 | |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | /** |
| 54 | 54 | * @param $val1 |
| 55 | 55 | * @param null $val2 |
| 56 | - * @param null $operator |
|
| 56 | + * @param string $operator |
|
| 57 | 57 | * @param bool $bind |
| 58 | 58 | * @param string $join |
| 59 | 59 | * |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | $where = []; |
| 55 | 55 | |
| 56 | 56 | foreach($this->where as $k => $v){ |
| 57 | - $last = $this->where[$k-1] ?? false; |
|
| 57 | + $last = $this->where[$k - 1] ?? false; |
|
| 58 | 58 | |
| 59 | 59 | if(in_array($v, ['AND', 'OR', 'XOR', '(', ')'], true)){ |
| 60 | 60 | $where[] = $v; |