@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * Push a new job onto the queue. |
27 | 27 | * |
28 | 28 | * @param string $queue |
29 | - * @param string|object $job |
|
29 | + * @param string $job |
|
30 | 30 | * @param mixed $data |
31 | 31 | * @return mixed |
32 | 32 | */ |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * Push a new job onto the queue after a delay. |
47 | 47 | * |
48 | 48 | * @param \DateTimeInterface|\DateInterval|int $delay |
49 | - * @param string|object $job |
|
49 | + * @param string $job |
|
50 | 50 | * @param mixed $data |
51 | 51 | * @param string $queue |
52 | 52 | * @return mixed |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * |
59 | 59 | * @param string $queue |
60 | 60 | * @param \DateTimeInterface|\DateInterval|int $delay |
61 | - * @param string|object $job |
|
61 | + * @param string $job |
|
62 | 62 | * @param mixed $data |
63 | 63 | * @return mixed |
64 | 64 | */ |
@@ -35,7 +35,7 @@ |
||
35 | 35 | /** |
36 | 36 | * Add a piece of shared data to the environment. |
37 | 37 | * |
38 | - * @param array|string $key |
|
38 | + * @param string $key |
|
39 | 39 | * @param mixed $value |
40 | 40 | * @return mixed |
41 | 41 | */ |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * Create a new database capsule manager. |
26 | 26 | * |
27 | 27 | * @param \Illuminate\Container\Container|null $container |
28 | - * @return void |
|
28 | + * @return string|null |
|
29 | 29 | */ |
30 | 30 | public function __construct(Container $container = null) |
31 | 31 | { |
@@ -2,13 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database\Capsule; |
4 | 4 | |
5 | -use PDO; |
|
6 | 5 | use Illuminate\Container\Container; |
7 | -use Illuminate\Database\DatabaseManager; |
|
8 | 6 | use Illuminate\Contracts\Events\Dispatcher; |
9 | -use Illuminate\Support\Traits\CapsuleManagerTrait; |
|
10 | -use Illuminate\Database\Eloquent\Model as Eloquent; |
|
11 | 7 | use Illuminate\Database\Connectors\ConnectionFactory; |
8 | +use Illuminate\Database\DatabaseManager; |
|
9 | +use Illuminate\Database\Eloquent\Model as Eloquent; |
|
10 | +use Illuminate\Support\Traits\CapsuleManagerTrait; |
|
11 | +use PDO; |
|
12 | 12 | |
13 | 13 | class Manager |
14 | 14 | { |
@@ -80,7 +80,7 @@ |
||
80 | 80 | /** |
81 | 81 | * Apply the callback's query changes if the given "value" is true. |
82 | 82 | * |
83 | - * @param mixed $value |
|
83 | + * @param boolean $value |
|
84 | 84 | * @param callable $callback |
85 | 85 | * @param callable $default |
86 | 86 | * @return mixed|$this |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Illuminate\Database\Concerns; |
4 | 4 | |
5 | 5 | use Illuminate\Container\Container; |
6 | -use Illuminate\Pagination\Paginator; |
|
7 | 6 | use Illuminate\Pagination\LengthAwarePaginator; |
7 | +use Illuminate\Pagination\Paginator; |
|
8 | 8 | |
9 | 9 | trait BuildsQueries |
10 | 10 | { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function each(callable $callback, $count = 1000) |
59 | 59 | { |
60 | - return $this->chunk($count, function ($results) use ($callback) { |
|
60 | + return $this->chunk($count, function($results) use ($callback) { |
|
61 | 61 | foreach ($results as $key => $value) { |
62 | 62 | if ($callback($value, $key) === false) { |
63 | 63 | return false; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function unless($value, $callback, $default = null) |
119 | 119 | { |
120 | - if (! $value) { |
|
120 | + if (!$value) { |
|
121 | 121 | return $callback($this, $value) ?: $this; |
122 | 122 | } elseif ($default) { |
123 | 123 | return $default($this, $value) ?: $this; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | public function each(callable $callback, $count = 1000) |
59 | 59 | { |
60 | - return $this->chunk($count, function ($results) use ($callback) { |
|
60 | + return $this->chunk($count, function ($results) use ($callback){ |
|
61 | 61 | foreach ($results as $key => $value) { |
62 | 62 | if ($callback($value, $key) === false) { |
63 | 63 | return false; |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | * Run a select statement against the database. |
297 | 297 | * |
298 | 298 | * @param string $query |
299 | - * @param array $bindings |
|
299 | + * @param string[] $bindings |
|
300 | 300 | * @return array |
301 | 301 | */ |
302 | 302 | public function selectFromWriteConnection($query, $bindings = []) |
@@ -943,7 +943,7 @@ discard block |
||
943 | 943 | /** |
944 | 944 | * Set the PDO connection. |
945 | 945 | * |
946 | - * @param \PDO|\Closure|null $pdo |
|
946 | + * @param null|PDO $pdo |
|
947 | 947 | * @return $this |
948 | 948 | */ |
949 | 949 | public function setPdo($pdo) |
@@ -2,21 +2,21 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database; |
4 | 4 | |
5 | -use PDO; |
|
6 | 5 | use Closure; |
7 | -use Exception; |
|
8 | -use PDOStatement; |
|
9 | -use LogicException; |
|
10 | 6 | use DateTimeInterface; |
11 | -use Illuminate\Support\Arr; |
|
12 | -use Illuminate\Database\Query\Expression; |
|
7 | +use Doctrine\DBAL\Connection as DoctrineConnection; |
|
8 | +use Exception; |
|
13 | 9 | use Illuminate\Contracts\Events\Dispatcher; |
14 | 10 | use Illuminate\Database\Events\QueryExecuted; |
15 | -use Doctrine\DBAL\Connection as DoctrineConnection; |
|
16 | -use Illuminate\Database\Query\Processors\Processor; |
|
17 | 11 | use Illuminate\Database\Query\Builder as QueryBuilder; |
18 | -use Illuminate\Database\Schema\Builder as SchemaBuilder; |
|
12 | +use Illuminate\Database\Query\Expression; |
|
19 | 13 | use Illuminate\Database\Query\Grammars\Grammar as QueryGrammar; |
14 | +use Illuminate\Database\Query\Processors\Processor; |
|
15 | +use Illuminate\Database\Schema\Builder as SchemaBuilder; |
|
16 | +use Illuminate\Support\Arr; |
|
17 | +use LogicException; |
|
18 | +use PDO; |
|
19 | +use PDOStatement; |
|
20 | 20 | |
21 | 21 | class Connection implements ConnectionInterface |
22 | 22 | { |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | // of the database result set. Each element in the array will be a single |
324 | 324 | // row from the database table, and will either be an array or objects. |
325 | 325 | $statement = $this->prepared($this->getPdoForSelect($useReadPdo) |
326 | - ->prepare($query)); |
|
326 | + ->prepare($query)); |
|
327 | 327 | |
328 | 328 | $this->bindValues($statement, $this->prepareBindings($bindings)); |
329 | 329 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | // mode and prepare the bindings for the query. Once that's done we will be |
353 | 353 | // ready to execute the query against the database and return the cursor. |
354 | 354 | $statement = $this->prepared($this->getPdoForSelect($useReadPdo) |
355 | - ->prepare($query)); |
|
355 | + ->prepare($query)); |
|
356 | 356 | |
357 | 357 | $this->bindValues( |
358 | 358 | $statement, $this->prepareBindings($bindings) |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | */ |
315 | 315 | public function select($query, $bindings = [], $useReadPdo = true) |
316 | 316 | { |
317 | - return $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo) { |
|
317 | + return $this->run($query, $bindings, function($query, $bindings) use ($useReadPdo) { |
|
318 | 318 | if ($this->pretending()) { |
319 | 319 | return []; |
320 | 320 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | */ |
344 | 344 | public function cursor($query, $bindings = [], $useReadPdo = true) |
345 | 345 | { |
346 | - $statement = $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo) { |
|
346 | + $statement = $this->run($query, $bindings, function($query, $bindings) use ($useReadPdo) { |
|
347 | 347 | if ($this->pretending()) { |
348 | 348 | return []; |
349 | 349 | } |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | */ |
445 | 445 | public function statement($query, $bindings = []) |
446 | 446 | { |
447 | - return $this->run($query, $bindings, function ($query, $bindings) { |
|
447 | + return $this->run($query, $bindings, function($query, $bindings){ |
|
448 | 448 | if ($this->pretending()) { |
449 | 449 | return true; |
450 | 450 | } |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | */ |
469 | 469 | public function affectingStatement($query, $bindings = []) |
470 | 470 | { |
471 | - return $this->run($query, $bindings, function ($query, $bindings) { |
|
471 | + return $this->run($query, $bindings, function($query, $bindings){ |
|
472 | 472 | if ($this->pretending()) { |
473 | 473 | return 0; |
474 | 474 | } |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | */ |
499 | 499 | public function unprepared($query) |
500 | 500 | { |
501 | - return $this->run($query, [], function ($query) { |
|
501 | + return $this->run($query, [], function($query){ |
|
502 | 502 | if ($this->pretending()) { |
503 | 503 | return true; |
504 | 504 | } |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | */ |
520 | 520 | public function pretend(Closure $callback) |
521 | 521 | { |
522 | - return $this->withFreshQueryLog(function () use ($callback) { |
|
522 | + return $this->withFreshQueryLog(function() use ($callback) { |
|
523 | 523 | $this->pretending = true; |
524 | 524 | |
525 | 525 | // Basically to make the database connection "pretend", we will just return |
@@ -799,7 +799,7 @@ discard block |
||
799 | 799 | */ |
800 | 800 | protected function fireConnectionEvent($event) |
801 | 801 | { |
802 | - if (! isset($this->events)) { |
|
802 | + if (!isset($this->events)) { |
|
803 | 803 | return; |
804 | 804 | } |
805 | 805 | |
@@ -845,7 +845,7 @@ discard block |
||
845 | 845 | */ |
846 | 846 | public function recordsHaveBeenModified($value = true) |
847 | 847 | { |
848 | - if (! $this->recordsModified) { |
|
848 | + if (!$this->recordsModified) { |
|
849 | 849 | $this->recordsModified = $value; |
850 | 850 | } |
851 | 851 | } |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | */ |
315 | 315 | public function select($query, $bindings = [], $useReadPdo = true) |
316 | 316 | { |
317 | - return $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo) { |
|
317 | + return $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo){ |
|
318 | 318 | if ($this->pretending()) { |
319 | 319 | return []; |
320 | 320 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | */ |
344 | 344 | public function cursor($query, $bindings = [], $useReadPdo = true) |
345 | 345 | { |
346 | - $statement = $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo) { |
|
346 | + $statement = $this->run($query, $bindings, function ($query, $bindings) use ($useReadPdo){ |
|
347 | 347 | if ($this->pretending()) { |
348 | 348 | return []; |
349 | 349 | } |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | */ |
445 | 445 | public function statement($query, $bindings = []) |
446 | 446 | { |
447 | - return $this->run($query, $bindings, function ($query, $bindings) { |
|
447 | + return $this->run($query, $bindings, function ($query, $bindings){ |
|
448 | 448 | if ($this->pretending()) { |
449 | 449 | return true; |
450 | 450 | } |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | */ |
469 | 469 | public function affectingStatement($query, $bindings = []) |
470 | 470 | { |
471 | - return $this->run($query, $bindings, function ($query, $bindings) { |
|
471 | + return $this->run($query, $bindings, function ($query, $bindings){ |
|
472 | 472 | if ($this->pretending()) { |
473 | 473 | return 0; |
474 | 474 | } |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | */ |
499 | 499 | public function unprepared($query) |
500 | 500 | { |
501 | - return $this->run($query, [], function ($query) { |
|
501 | + return $this->run($query, [], function ($query){ |
|
502 | 502 | if ($this->pretending()) { |
503 | 503 | return true; |
504 | 504 | } |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | */ |
520 | 520 | public function pretend(Closure $callback) |
521 | 521 | { |
522 | - return $this->withFreshQueryLog(function () use ($callback) { |
|
522 | + return $this->withFreshQueryLog(function () use ($callback){ |
|
523 | 523 | $this->pretending = true; |
524 | 524 | |
525 | 525 | // Basically to make the database connection "pretend", we will just return |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * Create a new connection factory instance. |
26 | 26 | * |
27 | 27 | * @param \Illuminate\Contracts\Container\Container $container |
28 | - * @return void |
|
28 | + * @return ConnectionFactory |
|
29 | 29 | */ |
30 | 30 | public function __construct(Container $container) |
31 | 31 | { |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * Create a new connection instance. |
256 | 256 | * |
257 | 257 | * @param string $driver |
258 | - * @param \PDO|\Closure $connection |
|
258 | + * @param \Closure $connection |
|
259 | 259 | * @param string $database |
260 | 260 | * @param string $prefix |
261 | 261 | * @param array $config |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database\Connectors; |
4 | 4 | |
5 | -use PDOException; |
|
6 | -use Illuminate\Support\Arr; |
|
7 | -use InvalidArgumentException; |
|
5 | +use Illuminate\Contracts\Container\Container; |
|
8 | 6 | use Illuminate\Database\Connection; |
9 | 7 | use Illuminate\Database\MySqlConnection; |
10 | -use Illuminate\Database\SQLiteConnection; |
|
11 | 8 | use Illuminate\Database\PostgresConnection; |
9 | +use Illuminate\Database\SQLiteConnection; |
|
12 | 10 | use Illuminate\Database\SqlServerConnection; |
13 | -use Illuminate\Contracts\Container\Container; |
|
11 | +use Illuminate\Support\Arr; |
|
12 | +use InvalidArgumentException; |
|
13 | +use PDOException; |
|
14 | 14 | |
15 | 15 | class ConnectionFactory |
16 | 16 | { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | */ |
175 | 175 | protected function createPdoResolverWithHosts(array $config) |
176 | 176 | { |
177 | - return function () use ($config) { |
|
177 | + return function() use ($config) { |
|
178 | 178 | foreach (Arr::shuffle($hosts = $this->parseHosts($config)) as $key => $host) { |
179 | 179 | $config['host'] = $host; |
180 | 180 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | */ |
215 | 215 | protected function createPdoResolverWithoutHosts(array $config) |
216 | 216 | { |
217 | - return function () use ($config) { |
|
217 | + return function() use ($config) { |
|
218 | 218 | return $this->createConnector($config)->connect($config); |
219 | 219 | }; |
220 | 220 | } |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | */ |
230 | 230 | public function createConnector(array $config) |
231 | 231 | { |
232 | - if (! isset($config['driver'])) { |
|
232 | + if (!isset($config['driver'])) { |
|
233 | 233 | throw new InvalidArgumentException('A driver must be specified.'); |
234 | 234 | } |
235 | 235 |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | */ |
175 | 175 | protected function createPdoResolverWithHosts(array $config) |
176 | 176 | { |
177 | - return function () use ($config) { |
|
177 | + return function () use ($config){ |
|
178 | 178 | foreach (Arr::shuffle($hosts = $this->parseHosts($config)) as $key => $host) { |
179 | 179 | $config['host'] = $host; |
180 | 180 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | */ |
215 | 215 | protected function createPdoResolverWithoutHosts(array $config) |
216 | 216 | { |
217 | - return function () use ($config) { |
|
217 | + return function () use ($config){ |
|
218 | 218 | return $this->createConnector($config)->connect($config); |
219 | 219 | }; |
220 | 220 | } |
@@ -44,7 +44,7 @@ |
||
44 | 44 | * |
45 | 45 | * @param \PDO $connection |
46 | 46 | * @param array $config |
47 | - * @return void |
|
47 | + * @return PDO|null |
|
48 | 48 | */ |
49 | 49 | protected function configureEncoding($connection, array $config) |
50 | 50 | { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | // connection's behavior, and some might be specified by the developers. |
24 | 24 | $connection = $this->createConnection($dsn, $config, $options); |
25 | 25 | |
26 | - if (! empty($config['database'])) { |
|
26 | + if (!empty($config['database'])) { |
|
27 | 27 | $connection->exec("use `{$config['database']}`;"); |
28 | 28 | } |
29 | 29 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | protected function configureEncoding($connection, array $config) |
50 | 50 | { |
51 | - if (! isset($config['charset'])) { |
|
51 | + if (!isset($config['charset'])) { |
|
52 | 52 | return $connection; |
53 | 53 | } |
54 | 54 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | protected function hasSocket(array $config) |
107 | 107 | { |
108 | - return isset($config['unix_socket']) && ! empty($config['unix_socket']); |
|
108 | + return isset($config['unix_socket']) && !empty($config['unix_socket']); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database\Connectors; |
4 | 4 | |
5 | -use PDO; |
|
6 | 5 | use Illuminate\Support\Arr; |
6 | +use PDO; |
|
7 | 7 | |
8 | 8 | class SqlServerConnector extends Connector implements ConnectorInterface |
9 | 9 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | */ |
151 | 151 | protected function buildConnectString($driver, array $arguments) |
152 | 152 | { |
153 | - return $driver.':'.implode(';', array_map(function ($key) use ($arguments) { |
|
153 | + return $driver.':'.implode(';', array_map(function($key) use ($arguments) { |
|
154 | 154 | return sprintf('%s=%s', $key, $arguments[$key]); |
155 | 155 | }, array_keys($arguments))); |
156 | 156 | } |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | protected function buildHostString(array $config, $separator) |
166 | 166 | { |
167 | - if (isset($config['port']) && ! empty($config['port'])) { |
|
167 | + if (isset($config['port']) && !empty($config['port'])) { |
|
168 | 168 | return $config['host'].$separator.$config['port']; |
169 | 169 | } else { |
170 | 170 | return $config['host']; |
@@ -150,7 +150,7 @@ |
||
150 | 150 | */ |
151 | 151 | protected function buildConnectString($driver, array $arguments) |
152 | 152 | { |
153 | - return $driver.':'.implode(';', array_map(function ($key) use ($arguments) { |
|
153 | + return $driver.':'.implode(';', array_map(function ($key) use ($arguments){ |
|
154 | 154 | return sprintf('%s=%s', $key, $arguments[$key]); |
155 | 155 | }, array_keys($arguments))); |
156 | 156 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Illuminate\Database\Console\Migrations; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Symfony\Component\Console\Input\InputOption; |
|
7 | 6 | use Illuminate\Database\Migrations\MigrationRepositoryInterface; |
7 | +use Symfony\Component\Console\Input\InputOption; |
|
8 | 8 | |
9 | 9 | class InstallCommand extends Command |
10 | 10 | { |