@@ -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 | * |
@@ -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 |
@@ -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 |
@@ -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 | * |
@@ -12,8 +12,8 @@ |
||
12 | 12 | |
13 | 13 | namespace chillerlan\Database\Query\Dialects\SQLite; |
14 | 14 | |
15 | -use chillerlan\Database\Query\CreateTableInterface; |
|
16 | 15 | use chillerlan\Database\Query\CreateTableAbstract; |
16 | +use chillerlan\Database\Query\CreateTableInterface; |
|
17 | 17 | use chillerlan\Database\Query\QueryException; |
18 | 18 | |
19 | 19 | /** |
@@ -49,7 +49,7 @@ |
||
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param $expr1 |
52 | - * @param null $expr2 |
|
52 | + * @param string|null $expr2 |
|
53 | 53 | * @param null $func |
54 | 54 | * |
55 | 55 | * @return void |
@@ -14,11 +14,11 @@ |
||
14 | 14 | |
15 | 15 | use chillerlan\Database\Drivers\DBDriverInterface; |
16 | 16 | use chillerlan\Database\Query\AlterInterface; |
17 | +use chillerlan\Database\Query\CreateDatabaseInterface; |
|
17 | 18 | use chillerlan\Database\Query\CreateInterface; |
19 | +use chillerlan\Database\Query\CreateTableInterface; |
|
18 | 20 | use chillerlan\Database\Query\DropInterface; |
19 | 21 | use chillerlan\Database\Query\StatementAbstract; |
20 | -use chillerlan\Database\Query\CreateDatabaseInterface; |
|
21 | -use chillerlan\Database\Query\CreateTableInterface; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @property \chillerlan\Database\Query\SelectInterface $select |