@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database\Schema\Grammars; |
4 | 4 | |
5 | -use Illuminate\Support\Fluent; |
|
6 | 5 | use Illuminate\Database\Schema\Blueprint; |
6 | +use Illuminate\Support\Fluent; |
|
7 | 7 | |
8 | 8 | class SqlServerGrammar extends Grammar |
9 | 9 | { |
@@ -742,7 +742,7 @@ discard block |
||
742 | 742 | */ |
743 | 743 | protected function modifyCollate(Blueprint $blueprint, Fluent $column) |
744 | 744 | { |
745 | - if (! is_null($column->collation)) { |
|
745 | + if (!is_null($column->collation)) { |
|
746 | 746 | return ' collate '.$column->collation; |
747 | 747 | } |
748 | 748 | } |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | */ |
769 | 769 | protected function modifyDefault(Blueprint $blueprint, Fluent $column) |
770 | 770 | { |
771 | - if (! is_null($column->default)) { |
|
771 | + if (!is_null($column->default)) { |
|
772 | 772 | return ' default '.$this->getDefaultValue($column->default); |
773 | 773 | } |
774 | 774 | } |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Database; |
4 | 4 | |
5 | -use Illuminate\Support\Arr; |
|
6 | -use InvalidArgumentException; |
|
7 | 5 | use Illuminate\Console\Command; |
8 | 6 | use Illuminate\Container\Container; |
7 | +use Illuminate\Support\Arr; |
|
8 | +use InvalidArgumentException; |
|
9 | 9 | |
10 | 10 | abstract class Seeder |
11 | 11 | { |
@@ -114,7 +114,7 @@ |
||
114 | 114 | */ |
115 | 115 | public function __invoke() |
116 | 116 | { |
117 | - if (! method_exists($this, 'run')) { |
|
117 | + if (!method_exists($this, 'run')) { |
|
118 | 118 | throw new InvalidArgumentException('Method [run] missing from '.get_class($this)); |
119 | 119 | } |
120 | 120 |
@@ -3,13 +3,13 @@ |
||
3 | 3 | namespace Illuminate\Database; |
4 | 4 | |
5 | 5 | use Closure; |
6 | -use Exception; |
|
7 | -use Throwable; |
|
8 | -use Illuminate\Database\Schema\SqlServerBuilder; |
|
9 | 6 | use Doctrine\DBAL\Driver\PDOSqlsrv\Driver as DoctrineDriver; |
10 | -use Illuminate\Database\Query\Processors\SqlServerProcessor; |
|
7 | +use Exception; |
|
11 | 8 | use Illuminate\Database\Query\Grammars\SqlServerGrammar as QueryGrammar; |
9 | +use Illuminate\Database\Query\Processors\SqlServerProcessor; |
|
12 | 10 | use Illuminate\Database\Schema\Grammars\SqlServerGrammar as SchemaGrammar; |
11 | +use Illuminate\Database\Schema\SqlServerBuilder; |
|
12 | +use Throwable; |
|
13 | 13 | |
14 | 14 | class SqlServerConnection extends Connection |
15 | 15 | { |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Container\Container; |
6 | 6 | use Illuminate\Contracts\Queue\Job; |
7 | -use Illuminate\Queue\InteractsWithQueue; |
|
8 | 7 | use Illuminate\Contracts\Queue\ShouldQueue; |
8 | +use Illuminate\Queue\InteractsWithQueue; |
|
9 | 9 | |
10 | 10 | class CallQueuedListener implements ShouldQueue |
11 | 11 | { |
@@ -153,7 +153,7 @@ |
||
153 | 153 | */ |
154 | 154 | public function __clone() |
155 | 155 | { |
156 | - $this->data = array_map(function ($data) { |
|
156 | + $this->data = array_map(function($data){ |
|
157 | 157 | return is_object($data) ? clone $data : $data; |
158 | 158 | }, $this->data); |
159 | 159 | } |
@@ -153,7 +153,7 @@ |
||
153 | 153 | */ |
154 | 154 | public function __clone() |
155 | 155 | { |
156 | - $this->data = array_map(function ($data) { |
|
156 | + $this->data = array_map(function ($data){ |
|
157 | 157 | return is_object($data) ? clone $data : $data; |
158 | 158 | }, $this->data); |
159 | 159 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * Create a new event dispatcher instance. |
55 | 55 | * |
56 | 56 | * @param \Illuminate\Contracts\Container\Container|null $container |
57 | - * @return void |
|
57 | + * @return DispatcherContract |
|
58 | 58 | */ |
59 | 59 | public function __construct(ContainerContract $container = null) |
60 | 60 | { |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | /** |
65 | 65 | * Register an event listener with the dispatcher. |
66 | 66 | * |
67 | - * @param string|array $events |
|
68 | - * @param mixed $listener |
|
67 | + * @param string $events |
|
68 | + * @param \Closure $listener |
|
69 | 69 | * @return void |
70 | 70 | */ |
71 | 71 | public function listen($events, $listener) |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | /** |
261 | 261 | * Check if event should be broadcasted by condition. |
262 | 262 | * |
263 | - * @param mixed $event |
|
263 | + * @param ShouldBroadcast $event |
|
264 | 264 | * @return bool |
265 | 265 | */ |
266 | 266 | protected function broadcastWhen($event) |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | * Propagate listener options to the job. |
507 | 507 | * |
508 | 508 | * @param mixed $listener |
509 | - * @param mixed $job |
|
509 | + * @param CallQueuedListener $job |
|
510 | 510 | * @return mixed |
511 | 511 | */ |
512 | 512 | protected function propagateListenerOptions($listener, $job) |
@@ -3,15 +3,15 @@ |
||
3 | 3 | namespace Illuminate\Events; |
4 | 4 | |
5 | 5 | use Exception; |
6 | -use ReflectionClass; |
|
7 | -use Illuminate\Support\Arr; |
|
8 | -use Illuminate\Support\Str; |
|
9 | 6 | use Illuminate\Container\Container; |
10 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
11 | -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; |
|
12 | -use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; |
|
13 | 7 | use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory; |
8 | +use Illuminate\Contracts\Broadcasting\ShouldBroadcast; |
|
14 | 9 | use Illuminate\Contracts\Container\Container as ContainerContract; |
10 | +use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; |
|
11 | +use Illuminate\Contracts\Queue\ShouldQueue; |
|
12 | +use Illuminate\Support\Arr; |
|
13 | +use Illuminate\Support\Str; |
|
14 | +use ReflectionClass; |
|
15 | 15 | |
16 | 16 | class Dispatcher implements DispatcherContract |
17 | 17 | { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function push($event, $payload = []) |
115 | 115 | { |
116 | - $this->listen($event.'_pushed', function () use ($event, $payload) { |
|
116 | + $this->listen($event.'_pushed', function() use ($event, $payload) { |
|
117 | 117 | $this->dispatch($event, $payload); |
118 | 118 | }); |
119 | 119 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | // If a response is returned from the listener and event halting is enabled |
212 | 212 | // we will just return this response, and not call the rest of the event |
213 | 213 | // listeners. Otherwise we will add the response on the response list. |
214 | - if ($halt && ! is_null($response)) { |
|
214 | + if ($halt && !is_null($response)) { |
|
215 | 215 | return $response; |
216 | 216 | } |
217 | 217 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | return $this->createClassListener($listener, $wildcard); |
353 | 353 | } |
354 | 354 | |
355 | - return function ($event, $payload) use ($listener, $wildcard) { |
|
355 | + return function($event, $payload) use ($listener, $wildcard) { |
|
356 | 356 | if ($wildcard) { |
357 | 357 | return $listener($event, $payload); |
358 | 358 | } |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function createClassListener($listener, $wildcard = false) |
372 | 372 | { |
373 | - return function ($event, $payload) use ($listener, $wildcard) { |
|
373 | + return function($event, $payload) use ($listener, $wildcard) { |
|
374 | 374 | if ($wildcard) { |
375 | 375 | return call_user_func($this->createClassCallable($listener), $event, $payload); |
376 | 376 | } |
@@ -435,8 +435,8 @@ discard block |
||
435 | 435 | */ |
436 | 436 | protected function createQueuedHandlerCallable($class, $method) |
437 | 437 | { |
438 | - return function () use ($class, $method) { |
|
439 | - $arguments = array_map(function ($a) { |
|
438 | + return function() use ($class, $method) { |
|
439 | + $arguments = array_map(function($a){ |
|
440 | 440 | return is_object($a) ? clone $a : $a; |
441 | 441 | }, func_get_args()); |
442 | 442 | |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | */ |
512 | 512 | protected function propagateListenerOptions($listener, $job) |
513 | 513 | { |
514 | - return tap($job, function ($job) use ($listener) { |
|
514 | + return tap($job, function($job) use ($listener) { |
|
515 | 515 | $job->tries = $listener->tries ?? null; |
516 | 516 | $job->timeout = $listener->timeout ?? null; |
517 | 517 | $job->timeoutAt = method_exists($listener, 'retryUntil') |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function push($event, $payload = []) |
115 | 115 | { |
116 | - $this->listen($event.'_pushed', function () use ($event, $payload) { |
|
116 | + $this->listen($event.'_pushed', function () use ($event, $payload){ |
|
117 | 117 | $this->dispatch($event, $payload); |
118 | 118 | }); |
119 | 119 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | return $this->createClassListener($listener, $wildcard); |
353 | 353 | } |
354 | 354 | |
355 | - return function ($event, $payload) use ($listener, $wildcard) { |
|
355 | + return function ($event, $payload) use ($listener, $wildcard){ |
|
356 | 356 | if ($wildcard) { |
357 | 357 | return $listener($event, $payload); |
358 | 358 | } |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function createClassListener($listener, $wildcard = false) |
372 | 372 | { |
373 | - return function ($event, $payload) use ($listener, $wildcard) { |
|
373 | + return function ($event, $payload) use ($listener, $wildcard){ |
|
374 | 374 | if ($wildcard) { |
375 | 375 | return call_user_func($this->createClassCallable($listener), $event, $payload); |
376 | 376 | } |
@@ -435,8 +435,8 @@ discard block |
||
435 | 435 | */ |
436 | 436 | protected function createQueuedHandlerCallable($class, $method) |
437 | 437 | { |
438 | - return function () use ($class, $method) { |
|
439 | - $arguments = array_map(function ($a) { |
|
438 | + return function () use ($class, $method){ |
|
439 | + $arguments = array_map(function ($a){ |
|
440 | 440 | return is_object($a) ? clone $a : $a; |
441 | 441 | }, func_get_args()); |
442 | 442 | |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | */ |
512 | 512 | protected function propagateListenerOptions($listener, $job) |
513 | 513 | { |
514 | - return tap($job, function ($job) use ($listener) { |
|
514 | + return tap($job, function ($job) use ($listener){ |
|
515 | 515 | $job->tries = $listener->tries ?? null; |
516 | 516 | $job->timeout = $listener->timeout ?? null; |
517 | 517 | $job->timeoutAt = method_exists($listener, 'retryUntil') |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | * |
156 | 156 | * @param string $path |
157 | 157 | * @param int $mode |
158 | - * @return mixed |
|
158 | + * @return boolean|string |
|
159 | 159 | */ |
160 | 160 | public function chmod($path, $mode = null) |
161 | 161 | { |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | * |
221 | 221 | * @param string $target |
222 | 222 | * @param string $link |
223 | - * @return void |
|
223 | + * @return boolean|null |
|
224 | 224 | */ |
225 | 225 | public function link($target, $link) |
226 | 226 | { |
@@ -4,9 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use ErrorException; |
6 | 6 | use FilesystemIterator; |
7 | -use Symfony\Component\Finder\Finder; |
|
8 | -use Illuminate\Support\Traits\Macroable; |
|
9 | 7 | use Illuminate\Contracts\Filesystem\FileNotFoundException; |
8 | +use Illuminate\Support\Traits\Macroable; |
|
9 | +use Symfony\Component\Finder\Finder; |
|
10 | 10 | |
11 | 11 | class Filesystem |
12 | 12 | { |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | |
181 | 181 | foreach ($paths as $path) { |
182 | 182 | try { |
183 | - if (! @unlink($path)) { |
|
183 | + if (!@unlink($path)) { |
|
184 | 184 | $success = false; |
185 | 185 | } |
186 | 186 | } catch (ErrorException $e) { |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | */ |
225 | 225 | public function link($target, $link) |
226 | 226 | { |
227 | - if (! windows_os()) { |
|
227 | + if (!windows_os()) { |
|
228 | 228 | return symlink($target, $link); |
229 | 229 | } |
230 | 230 | |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | public function files($directory, $hidden = false) |
388 | 388 | { |
389 | 389 | return iterator_to_array( |
390 | - Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(), |
|
390 | + Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->depth(0)->sortByName(), |
|
391 | 391 | false |
392 | 392 | ); |
393 | 393 | } |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | public function allFiles($directory, $hidden = false) |
403 | 403 | { |
404 | 404 | return iterator_to_array( |
405 | - Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(), |
|
405 | + Finder::create()->files()->ignoreDotFiles(!$hidden)->in($directory)->sortByName(), |
|
406 | 406 | false |
407 | 407 | ); |
408 | 408 | } |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | */ |
453 | 453 | public function moveDirectory($from, $to, $overwrite = false) |
454 | 454 | { |
455 | - if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) { |
|
455 | + if ($overwrite && $this->isDirectory($to) && !$this->deleteDirectory($to)) { |
|
456 | 456 | return false; |
457 | 457 | } |
458 | 458 | |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | */ |
470 | 470 | public function copyDirectory($directory, $destination, $options = null) |
471 | 471 | { |
472 | - if (! $this->isDirectory($directory)) { |
|
472 | + if (!$this->isDirectory($directory)) { |
|
473 | 473 | return false; |
474 | 474 | } |
475 | 475 | |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | // If the destination directory does not actually exist, we will go ahead and |
479 | 479 | // create it recursively, which just gets the destination prepared to copy |
480 | 480 | // the files over. Once we make the directory we'll proceed the copying. |
481 | - if (! $this->isDirectory($destination)) { |
|
481 | + if (!$this->isDirectory($destination)) { |
|
482 | 482 | $this->makeDirectory($destination, 0777, true); |
483 | 483 | } |
484 | 484 | |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | if ($item->isDir()) { |
494 | 494 | $path = $item->getPathname(); |
495 | 495 | |
496 | - if (! $this->copyDirectory($path, $target, $options)) { |
|
496 | + if (!$this->copyDirectory($path, $target, $options)) { |
|
497 | 497 | return false; |
498 | 498 | } |
499 | 499 | } |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | // location and keep looping. If for some reason the copy fails we'll bail out |
503 | 503 | // and return false, so the developer is aware that the copy process failed. |
504 | 504 | else { |
505 | - if (! $this->copy($item->getPathname(), $target)) { |
|
505 | + if (!$this->copy($item->getPathname(), $target)) { |
|
506 | 506 | return false; |
507 | 507 | } |
508 | 508 | } |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | */ |
523 | 523 | public function deleteDirectory($directory, $preserve = false) |
524 | 524 | { |
525 | - if (! $this->isDirectory($directory)) { |
|
525 | + if (!$this->isDirectory($directory)) { |
|
526 | 526 | return false; |
527 | 527 | } |
528 | 528 | |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | // If the item is a directory, we can just recurse into the function and |
533 | 533 | // delete that sub-directory otherwise we'll just delete the file and |
534 | 534 | // keep iterating through each file until the directory is cleaned. |
535 | - if ($item->isDir() && ! $item->isLink()) { |
|
535 | + if ($item->isDir() && !$item->isLink()) { |
|
536 | 536 | $this->deleteDirectory($item->getPathname()); |
537 | 537 | } |
538 | 538 | |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | } |
545 | 545 | } |
546 | 546 | |
547 | - if (! $preserve) { |
|
547 | + if (!$preserve) { |
|
548 | 548 | @rmdir($directory); |
549 | 549 | } |
550 | 550 | |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | { |
562 | 562 | $allDirectories = $this->directories($directory); |
563 | 563 | |
564 | - if (! empty($allDirectories)) { |
|
564 | + if (!empty($allDirectories)) { |
|
565 | 565 | foreach ($allDirectories as $directoryName) { |
566 | 566 | $this->deleteDirectory($directoryName); |
567 | 567 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @param string $path |
160 | 160 | * @param string|resource $contents |
161 | 161 | * @param mixed $options |
162 | - * @return bool |
|
162 | + * @return string|boolean |
|
163 | 163 | */ |
164 | 164 | public function put($path, $contents, $options = []) |
165 | 165 | { |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * |
241 | 241 | * @param string $path |
242 | 242 | * @param string $visibility |
243 | - * @return void |
|
243 | + * @return boolean |
|
244 | 244 | */ |
245 | 245 | public function setVisibility($path, $visibility) |
246 | 246 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * @param string $path |
254 | 254 | * @param string $data |
255 | 255 | * @param string $separator |
256 | - * @return int |
|
256 | + * @return string|boolean |
|
257 | 257 | */ |
258 | 258 | public function prepend($path, $data, $separator = PHP_EOL) |
259 | 259 | { |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | * @param string $path |
271 | 271 | * @param string $data |
272 | 272 | * @param string $separator |
273 | - * @return int |
|
273 | + * @return string|boolean |
|
274 | 274 | */ |
275 | 275 | public function append($path, $data, $separator = PHP_EOL) |
276 | 276 | { |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | * Get the file's last modification time. |
357 | 357 | * |
358 | 358 | * @param string $path |
359 | - * @return int |
|
359 | + * @return string|false |
|
360 | 360 | */ |
361 | 361 | public function lastModified($path) |
362 | 362 | { |
@@ -2,25 +2,25 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Filesystem; |
4 | 4 | |
5 | -use RuntimeException; |
|
5 | +use Illuminate\Contracts\Filesystem\Cloud as CloudFilesystemContract; |
|
6 | +use Illuminate\Contracts\Filesystem\FileNotFoundException as ContractFileNotFoundException; |
|
7 | +use Illuminate\Contracts\Filesystem\Filesystem as FilesystemContract; |
|
6 | 8 | use Illuminate\Http\File; |
7 | -use Illuminate\Support\Str; |
|
8 | -use InvalidArgumentException; |
|
9 | -use Illuminate\Support\Carbon; |
|
10 | 9 | use Illuminate\Http\UploadedFile; |
10 | +use Illuminate\Support\Carbon; |
|
11 | 11 | use Illuminate\Support\Collection; |
12 | +use Illuminate\Support\Str; |
|
13 | +use InvalidArgumentException; |
|
12 | 14 | use League\Flysystem\AdapterInterface; |
13 | -use PHPUnit\Framework\Assert as PHPUnit; |
|
14 | -use League\Flysystem\FilesystemInterface; |
|
15 | +use League\Flysystem\Adapter\Local as LocalAdapter; |
|
15 | 16 | use League\Flysystem\AwsS3v3\AwsS3Adapter; |
16 | 17 | use League\Flysystem\Cached\CachedAdapter; |
17 | 18 | use League\Flysystem\FileNotFoundException; |
19 | +use League\Flysystem\FilesystemInterface; |
|
18 | 20 | use League\Flysystem\Rackspace\RackspaceAdapter; |
19 | -use League\Flysystem\Adapter\Local as LocalAdapter; |
|
21 | +use PHPUnit\Framework\Assert as PHPUnit; |
|
22 | +use RuntimeException; |
|
20 | 23 | use Symfony\Component\HttpFoundation\StreamedResponse; |
21 | -use Illuminate\Contracts\Filesystem\Cloud as CloudFilesystemContract; |
|
22 | -use Illuminate\Contracts\Filesystem\Filesystem as FilesystemContract; |
|
23 | -use Illuminate\Contracts\Filesystem\FileNotFoundException as ContractFileNotFoundException; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @mixin \League\Flysystem\FilesystemInterface |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | 'Content-Disposition' => $disposition, |
132 | 132 | ]); |
133 | 133 | |
134 | - $response->setCallback(function () use ($path) { |
|
134 | + $response->setCallback(function() use ($path) { |
|
135 | 135 | $stream = $this->driver->readStream($path); |
136 | 136 | fpassthru($stream); |
137 | 137 | fclose($stream); |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | |
296 | 296 | foreach ($paths as $path) { |
297 | 297 | try { |
298 | - if (! $this->driver->delete($path)) { |
|
298 | + if (!$this->driver->delete($path)) { |
|
299 | 299 | $success = false; |
300 | 300 | } |
301 | 301 | } catch (FileNotFoundException $e) { |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | // If an explicit base URL has been set on the disk configuration then we will use |
405 | 405 | // it as the base URL instead of the default path. This allows the developer to |
406 | 406 | // have full control over the base path for this filesystem's generated URLs. |
407 | - if (! is_null($url = $this->driver->getConfig()->get('url'))) { |
|
407 | + if (!is_null($url = $this->driver->getConfig()->get('url'))) { |
|
408 | 408 | return $this->concatPathToUrl($url, $adapter->getPathPrefix().$path); |
409 | 409 | } |
410 | 410 |
@@ -131,7 +131,7 @@ |
||
131 | 131 | 'Content-Disposition' => $disposition, |
132 | 132 | ]); |
133 | 133 | |
134 | - $response->setCallback(function () use ($path) { |
|
134 | + $response->setCallback(function () use ($path){ |
|
135 | 135 | $stream = $this->driver->readStream($path); |
136 | 136 | fpassthru($stream); |
137 | 137 | fclose($stream); |
@@ -2,22 +2,22 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\Filesystem; |
4 | 4 | |
5 | -use Closure; |
|
6 | 5 | use Aws\S3\S3Client; |
7 | -use OpenCloud\Rackspace; |
|
6 | +use Closure; |
|
7 | +use Illuminate\Contracts\Filesystem\Factory as FactoryContract; |
|
8 | 8 | use Illuminate\Support\Arr; |
9 | 9 | use InvalidArgumentException; |
10 | 10 | use League\Flysystem\AdapterInterface; |
11 | -use League\Flysystem\Sftp\SftpAdapter; |
|
12 | -use League\Flysystem\FilesystemInterface; |
|
13 | -use League\Flysystem\Cached\CachedAdapter; |
|
14 | -use League\Flysystem\Filesystem as Flysystem; |
|
15 | 11 | use League\Flysystem\Adapter\Ftp as FtpAdapter; |
16 | -use League\Flysystem\Rackspace\RackspaceAdapter; |
|
17 | 12 | use League\Flysystem\Adapter\Local as LocalAdapter; |
18 | 13 | use League\Flysystem\AwsS3v3\AwsS3Adapter as S3Adapter; |
14 | +use League\Flysystem\Cached\CachedAdapter; |
|
19 | 15 | use League\Flysystem\Cached\Storage\Memory as MemoryStore; |
20 | -use Illuminate\Contracts\Filesystem\Factory as FactoryContract; |
|
16 | +use League\Flysystem\Filesystem as Flysystem; |
|
17 | +use League\Flysystem\FilesystemInterface; |
|
18 | +use League\Flysystem\Rackspace\RackspaceAdapter; |
|
19 | +use League\Flysystem\Sftp\SftpAdapter; |
|
20 | +use OpenCloud\Rackspace; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @mixin \Illuminate\Contracts\Filesystem\Filesystem |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * |
32 | 32 | * @param \Psr\Log\LoggerInterface $logger |
33 | 33 | * @param \Illuminate\Contracts\Events\Dispatcher|null $dispatcher |
34 | - * @return void |
|
34 | + * @return Logger |
|
35 | 35 | */ |
36 | 36 | public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = null) |
37 | 37 | { |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | /** |
215 | 215 | * Format the parameters for the logger. |
216 | 216 | * |
217 | - * @param mixed $message |
|
217 | + * @param string $message |
|
218 | 218 | * @return mixed |
219 | 219 | */ |
220 | 220 | protected function formatMessage($message) |
@@ -3,12 +3,12 @@ |
||
3 | 3 | namespace Illuminate\Log; |
4 | 4 | |
5 | 5 | use Closure; |
6 | -use RuntimeException; |
|
7 | -use Psr\Log\LoggerInterface; |
|
8 | -use Illuminate\Log\Events\MessageLogged; |
|
9 | -use Illuminate\Contracts\Support\Jsonable; |
|
10 | 6 | use Illuminate\Contracts\Events\Dispatcher; |
11 | 7 | use Illuminate\Contracts\Support\Arrayable; |
8 | +use Illuminate\Contracts\Support\Jsonable; |
|
9 | +use Illuminate\Log\Events\MessageLogged; |
|
10 | +use Psr\Log\LoggerInterface; |
|
11 | +use RuntimeException; |
|
12 | 12 | |
13 | 13 | class Logger implements LoggerInterface |
14 | 14 | { |
@@ -186,7 +186,7 @@ |
||
186 | 186 | */ |
187 | 187 | public function listen(Closure $callback) |
188 | 188 | { |
189 | - if (! isset($this->dispatcher)) { |
|
189 | + if (!isset($this->dispatcher)) { |
|
190 | 190 | throw new RuntimeException('Events dispatcher has not been set.'); |
191 | 191 | } |
192 | 192 |