@@ -304,7 +304,7 @@ |
||
304 | 304 | /** |
305 | 305 | * Add a piece of shared data to the environment. |
306 | 306 | * |
307 | - * @param array|string $key |
|
307 | + * @param string $key |
|
308 | 308 | * @param mixed $value |
309 | 309 | * @return mixed |
310 | 310 | */ |
@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\View; |
4 | 4 | |
5 | -use Illuminate\Support\Arr; |
|
6 | -use Illuminate\Support\Str; |
|
7 | -use InvalidArgumentException; |
|
5 | +use Illuminate\Contracts\Container\Container; |
|
8 | 6 | use Illuminate\Contracts\Events\Dispatcher; |
9 | 7 | use Illuminate\Contracts\Support\Arrayable; |
10 | -use Illuminate\View\Engines\EngineResolver; |
|
11 | -use Illuminate\Contracts\Container\Container; |
|
12 | 8 | use Illuminate\Contracts\View\Factory as FactoryContract; |
9 | +use Illuminate\Support\Arr; |
|
10 | +use Illuminate\Support\Str; |
|
11 | +use Illuminate\View\Engines\EngineResolver; |
|
12 | +use InvalidArgumentException; |
|
13 | 13 | |
14 | 14 | class Factory implements FactoryContract |
15 | 15 | { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | { |
110 | 110 | $data = array_merge($mergeData, $this->parseData($data)); |
111 | 111 | |
112 | - return tap($this->viewInstance($path, $path, $data), function ($view) { |
|
112 | + return tap($this->viewInstance($path, $path, $data), function($view){ |
|
113 | 113 | $this->callCreator($view); |
114 | 114 | }); |
115 | 115 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | // the caller for rendering or performing other view manipulations on this. |
134 | 134 | $data = array_merge($mergeData, $this->parseData($data)); |
135 | 135 | |
136 | - return tap($this->viewInstance($view, $path, $data), function ($view) { |
|
136 | + return tap($this->viewInstance($view, $path, $data), function($view){ |
|
137 | 137 | $this->callCreator($view); |
138 | 138 | }); |
139 | 139 | } |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | */ |
151 | 151 | public function first(array $views, $data = [], $mergeData = []) |
152 | 152 | { |
153 | - $view = Arr::first($views, function ($view) { |
|
153 | + $view = Arr::first($views, function($view){ |
|
154 | 154 | return $this->exists($view); |
155 | 155 | }); |
156 | 156 | |
157 | - if (! $view) { |
|
157 | + if (!$view) { |
|
158 | 158 | throw new InvalidArgumentException('None of the views in the given array exist.'); |
159 | 159 | } |
160 | 160 | |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | */ |
173 | 173 | public function renderWhen($condition, $view, $data = [], $mergeData = []) |
174 | 174 | { |
175 | - if (! $condition) { |
|
175 | + if (!$condition) { |
|
176 | 176 | return ''; |
177 | 177 | } |
178 | 178 | |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public function getEngineFromPath($path) |
279 | 279 | { |
280 | - if (! $extension = $this->getExtension($path)) { |
|
280 | + if (!$extension = $this->getExtension($path)) { |
|
281 | 281 | throw new InvalidArgumentException("Unrecognized extension in file: {$path}"); |
282 | 282 | } |
283 | 283 | |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | { |
297 | 297 | $extensions = array_keys($this->extensions); |
298 | 298 | |
299 | - return Arr::first($extensions, function ($value) use ($path) { |
|
299 | + return Arr::first($extensions, function($value) use ($path) { |
|
300 | 300 | return Str::endsWith($path, '.'.$value); |
301 | 301 | }); |
302 | 302 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | { |
110 | 110 | $data = array_merge($mergeData, $this->parseData($data)); |
111 | 111 | |
112 | - return tap($this->viewInstance($path, $path, $data), function ($view) { |
|
112 | + return tap($this->viewInstance($path, $path, $data), function ($view){ |
|
113 | 113 | $this->callCreator($view); |
114 | 114 | }); |
115 | 115 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | // the caller for rendering or performing other view manipulations on this. |
134 | 134 | $data = array_merge($mergeData, $this->parseData($data)); |
135 | 135 | |
136 | - return tap($this->viewInstance($view, $path, $data), function ($view) { |
|
136 | + return tap($this->viewInstance($view, $path, $data), function ($view){ |
|
137 | 137 | $this->callCreator($view); |
138 | 138 | }); |
139 | 139 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | */ |
151 | 151 | public function first(array $views, $data = [], $mergeData = []) |
152 | 152 | { |
153 | - $view = Arr::first($views, function ($view) { |
|
153 | + $view = Arr::first($views, function ($view){ |
|
154 | 154 | return $this->exists($view); |
155 | 155 | }); |
156 | 156 | |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | { |
297 | 297 | $extensions = array_keys($this->extensions); |
298 | 298 | |
299 | - return Arr::first($extensions, function ($value) use ($path) { |
|
299 | + return Arr::first($extensions, function ($value) use ($path){ |
|
300 | 300 | return Str::endsWith($path, '.'.$value); |
301 | 301 | }); |
302 | 302 | } |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\View; |
4 | 4 | |
5 | -use InvalidArgumentException; |
|
6 | 5 | use Illuminate\Filesystem\Filesystem; |
6 | +use InvalidArgumentException; |
|
7 | 7 | |
8 | 8 | class FileViewFinder implements ViewFinderInterface |
9 | 9 | { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | throw new InvalidArgumentException("View [{$name}] has an invalid name."); |
109 | 109 | } |
110 | 110 | |
111 | - if (! isset($this->hints[$segments[0]])) { |
|
111 | + if (!isset($this->hints[$segments[0]])) { |
|
112 | 112 | throw new InvalidArgumentException("No hint path defined for [{$segments[0]}]."); |
113 | 113 | } |
114 | 114 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | */ |
146 | 146 | protected function getPossibleViewFiles($name) |
147 | 147 | { |
148 | - return array_map(function ($extension) use ($name) { |
|
148 | + return array_map(function($extension) use ($name) { |
|
149 | 149 | return str_replace('.', '/', $name).'.'.$extension; |
150 | 150 | }, $this->extensions); |
151 | 151 | } |
@@ -145,7 +145,7 @@ |
||
145 | 145 | */ |
146 | 146 | protected function getPossibleViewFiles($name) |
147 | 147 | { |
148 | - return array_map(function ($extension) use ($name) { |
|
148 | + return array_map(function ($extension) use ($name){ |
|
149 | 149 | return str_replace('.', '/', $name).'.'.$extension; |
150 | 150 | }, $this->extensions); |
151 | 151 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Illuminate\View\Middleware; |
4 | 4 | |
5 | 5 | use Closure; |
6 | -use Illuminate\Support\ViewErrorBag; |
|
7 | 6 | use Illuminate\Contracts\View\Factory as ViewFactory; |
7 | +use Illuminate\Support\ViewErrorBag; |
|
8 | 8 | |
9 | 9 | class ShareErrorsFromSession |
10 | 10 | { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | /** |
176 | 176 | * Add a piece of data to the view. |
177 | 177 | * |
178 | - * @param string|array $key |
|
178 | + * @param string $key |
|
179 | 179 | * @param mixed $value |
180 | 180 | * @return $this |
181 | 181 | */ |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | * Remove a piece of bound data from the view. |
383 | 383 | * |
384 | 384 | * @param string $key |
385 | - * @return bool |
|
385 | + * @return boolean|null |
|
386 | 386 | */ |
387 | 387 | public function __unset($key) |
388 | 388 | { |
@@ -2,18 +2,18 @@ |
||
2 | 2 | |
3 | 3 | namespace Illuminate\View; |
4 | 4 | |
5 | -use Exception; |
|
6 | -use Throwable; |
|
7 | 5 | use ArrayAccess; |
8 | 6 | use BadMethodCallException; |
9 | -use Illuminate\Support\Str; |
|
10 | -use Illuminate\Support\MessageBag; |
|
11 | -use Illuminate\Contracts\View\Engine; |
|
12 | -use Illuminate\Support\Traits\Macroable; |
|
7 | +use Exception; |
|
13 | 8 | use Illuminate\Contracts\Support\Arrayable; |
14 | -use Illuminate\Contracts\Support\Renderable; |
|
15 | 9 | use Illuminate\Contracts\Support\MessageProvider; |
10 | +use Illuminate\Contracts\Support\Renderable; |
|
11 | +use Illuminate\Contracts\View\Engine; |
|
16 | 12 | use Illuminate\Contracts\View\View as ViewContract; |
13 | +use Illuminate\Support\MessageBag; |
|
14 | +use Illuminate\Support\Str; |
|
15 | +use Illuminate\Support\Traits\Macroable; |
|
16 | +use Throwable; |
|
17 | 17 | |
18 | 18 | class View implements ArrayAccess, ViewContract |
19 | 19 | { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | // another view gets rendered in the future by the application developer. |
97 | 97 | $this->factory->flushStateIfDoneRendering(); |
98 | 98 | |
99 | - return ! is_null($response) ? $response : $contents; |
|
99 | + return !is_null($response) ? $response : $contents; |
|
100 | 100 | } catch (Exception $e) { |
101 | 101 | $this->factory->flushState(); |
102 | 102 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function renderSections() |
169 | 169 | { |
170 | - return $this->render(function () { |
|
170 | + return $this->render(function(){ |
|
171 | 171 | return $this->factory->getSections(); |
172 | 172 | }); |
173 | 173 | } |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | return $this->macroCall($method, $parameters); |
405 | 405 | } |
406 | 406 | |
407 | - if (! Str::startsWith($method, 'with')) { |
|
407 | + if (!Str::startsWith($method, 'with')) { |
|
408 | 408 | throw new BadMethodCallException(sprintf( |
409 | 409 | 'Method %s::%s does not exist.', static::class, $method |
410 | 410 | )); |
@@ -167,7 +167,7 @@ |
||
167 | 167 | */ |
168 | 168 | public function renderSections() |
169 | 169 | { |
170 | - return $this->render(function () { |
|
170 | + return $this->render(function (){ |
|
171 | 171 | return $this->factory->getSections(); |
172 | 172 | }); |
173 | 173 | } |
@@ -317,6 +317,9 @@ |
||
317 | 317 | return $this->listDirectoryContents($directory, $recursive); |
318 | 318 | } |
319 | 319 | |
320 | + /** |
|
321 | + * @param string $directory |
|
322 | + */ |
|
320 | 323 | abstract protected function listDirectoryContents($directory, $recursive = false); |
321 | 324 | |
322 | 325 | /** |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | public function setConfig(array $config) |
98 | 98 | { |
99 | 99 | foreach ($this->configurable as $setting) { |
100 | - if ( ! isset($config[$setting])) { |
|
100 | + if (!isset($config[$setting])) { |
|
101 | 101 | continue; |
102 | 102 | } |
103 | 103 | |
104 | - $method = 'set' . ucfirst($setting); |
|
104 | + $method = 'set'.ucfirst($setting); |
|
105 | 105 | |
106 | 106 | if (method_exists($this, $method)) { |
107 | 107 | $this->$method($config[$setting]); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function setRoot($root) |
208 | 208 | { |
209 | - $this->root = rtrim($root, '\\/') . $this->separator; |
|
209 | + $this->root = rtrim($root, '\\/').$this->separator; |
|
210 | 210 | |
211 | 211 | return $this; |
212 | 212 | } |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | protected function sortListing(array $result) |
356 | 356 | { |
357 | - $compare = function ($one, $two) { |
|
357 | + $compare = function($one, $two){ |
|
358 | 358 | return strnatcmp($one['path'], $two['path']); |
359 | 359 | }; |
360 | 360 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | |
405 | 405 | list($permissions, /* $number */, /* $owner */, /* $group */, $size, /* $month */, /* $day */, /* $time*/, $name) = explode(' ', $item, 9); |
406 | 406 | $type = $this->detectType($permissions); |
407 | - $path = $base === '' ? $name : $base . $this->separator . $name; |
|
407 | + $path = $base === '' ? $name : $base.$this->separator.$name; |
|
408 | 408 | |
409 | 409 | if ($type === 'dir') { |
410 | 410 | return compact('type', 'path'); |
@@ -434,11 +434,11 @@ discard block |
||
434 | 434 | } |
435 | 435 | |
436 | 436 | list($date, $time, $size, $name) = explode(' ', $item, 4); |
437 | - $path = $base === '' ? $name : $base . $this->separator . $name; |
|
437 | + $path = $base === '' ? $name : $base.$this->separator.$name; |
|
438 | 438 | |
439 | 439 | // Check for the correct date/time format |
440 | 440 | $format = strlen($date) === 8 ? 'm-d-yH:iA' : 'Y-m-dH:i'; |
441 | - $dt = DateTime::createFromFormat($format, $date . $time); |
|
441 | + $dt = DateTime::createFromFormat($format, $date.$time); |
|
442 | 442 | $timestamp = $dt ? $dt->getTimestamp() : (int) strtotime("$date $time"); |
443 | 443 | |
444 | 444 | if ($size === '<DIR>') { |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | $parts = str_split($permissions, 3); |
499 | 499 | |
500 | 500 | // convert the groups |
501 | - $mapper = function ($part) { |
|
501 | + $mapper = function($part){ |
|
502 | 502 | return array_sum(str_split($part)); |
503 | 503 | }; |
504 | 504 | |
@@ -515,8 +515,8 @@ discard block |
||
515 | 515 | */ |
516 | 516 | public function removeDotDirectories(array $list) |
517 | 517 | { |
518 | - $filter = function ($line) { |
|
519 | - return $line !== '' && ! preg_match('#.* \.(\.)?$|^total#', $line); |
|
518 | + $filter = function($line){ |
|
519 | + return $line !== '' && !preg_match('#.* \.(\.)?$|^total#', $line); |
|
520 | 520 | }; |
521 | 521 | |
522 | 522 | return array_filter($list, $filter); |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | { |
556 | 556 | $dirname = (string) $dirname; |
557 | 557 | |
558 | - if ($dirname !== '' && ! $this->has($dirname)) { |
|
558 | + if ($dirname !== '' && !$this->has($dirname)) { |
|
559 | 559 | $this->createDir($dirname, new Config()); |
560 | 560 | } |
561 | 561 | } |
@@ -567,7 +567,7 @@ discard block |
||
567 | 567 | { |
568 | 568 | $tries = 0; |
569 | 569 | |
570 | - while ( ! $this->isConnected() && $tries < 3) { |
|
570 | + while (!$this->isConnected() && $tries < 3) { |
|
571 | 571 | $tries++; |
572 | 572 | $this->disconnect(); |
573 | 573 | $this->connect(); |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | protected function sortListing(array $result) |
356 | 356 | { |
357 | - $compare = function ($one, $two) { |
|
357 | + $compare = function ($one, $two){ |
|
358 | 358 | return strnatcmp($one['path'], $two['path']); |
359 | 359 | }; |
360 | 360 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | $parts = str_split($permissions, 3); |
499 | 499 | |
500 | 500 | // convert the groups |
501 | - $mapper = function ($part) { |
|
501 | + $mapper = function ($part){ |
|
502 | 502 | return array_sum(str_split($part)); |
503 | 503 | }; |
504 | 504 | |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | */ |
516 | 516 | public function removeDotDirectories(array $list) |
517 | 517 | { |
518 | - $filter = function ($line) { |
|
518 | + $filter = function ($line){ |
|
519 | 519 | return $line !== '' && ! preg_match('#.* \.(\.)?$|^total#', $line); |
520 | 520 | }; |
521 | 521 |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace League\Flysystem\Adapter; |
4 | 4 | |
5 | 5 | use ErrorException; |
6 | -use League\Flysystem\Adapter\Polyfill\StreamedCopyTrait; |
|
7 | 6 | use League\Flysystem\AdapterInterface; |
7 | +use League\Flysystem\Adapter\Polyfill\StreamedCopyTrait; |
|
8 | 8 | use League\Flysystem\Config; |
9 | 9 | use League\Flysystem\Util; |
10 | 10 | use League\Flysystem\Util\MimeType; |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | $this->connection = ftp_connect($this->getHost(), $this->getPort(), $this->getTimeout()); |
134 | 134 | } |
135 | 135 | |
136 | - if ( ! $this->connection) { |
|
137 | - throw new RuntimeException('Could not connect to host: ' . $this->getHost() . ', port:' . $this->getPort()); |
|
136 | + if (!$this->connection) { |
|
137 | + throw new RuntimeException('Could not connect to host: '.$this->getHost().', port:'.$this->getPort()); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | $this->login(); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $response = ftp_raw($this->connection, "OPTS UTF8 ON"); |
154 | 154 | if (substr($response[0], 0, 3) !== '200') { |
155 | 155 | throw new RuntimeException( |
156 | - 'Could not set UTF-8 mode for connection: ' . $this->getHost() . '::' . $this->getPort() |
|
156 | + 'Could not set UTF-8 mode for connection: '.$this->getHost().'::'.$this->getPort() |
|
157 | 157 | ); |
158 | 158 | } |
159 | 159 | } |
@@ -167,12 +167,12 @@ discard block |
||
167 | 167 | protected function setConnectionPassiveMode() |
168 | 168 | { |
169 | 169 | if (is_bool($this->ignorePassiveAddress) && defined('FTP_USEPASVADDRESS')) { |
170 | - ftp_set_option($this->connection, FTP_USEPASVADDRESS, ! $this->ignorePassiveAddress); |
|
170 | + ftp_set_option($this->connection, FTP_USEPASVADDRESS, !$this->ignorePassiveAddress); |
|
171 | 171 | } |
172 | 172 | |
173 | - if ( ! ftp_pasv($this->connection, $this->passive)) { |
|
173 | + if (!ftp_pasv($this->connection, $this->passive)) { |
|
174 | 174 | throw new RuntimeException( |
175 | - 'Could not set passive mode for connection: ' . $this->getHost() . '::' . $this->getPort() |
|
175 | + 'Could not set passive mode for connection: '.$this->getHost().'::'.$this->getPort() |
|
176 | 176 | ); |
177 | 177 | } |
178 | 178 | } |
@@ -185,8 +185,8 @@ discard block |
||
185 | 185 | $root = $this->getRoot(); |
186 | 186 | $connection = $this->connection; |
187 | 187 | |
188 | - if ($root && ! ftp_chdir($connection, $root)) { |
|
189 | - throw new RuntimeException('Root is invalid or does not exist: ' . $this->getRoot()); |
|
188 | + if ($root && !ftp_chdir($connection, $root)) { |
|
189 | + throw new RuntimeException('Root is invalid or does not exist: '.$this->getRoot()); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | // Store absolute path for further reference. |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | protected function login() |
205 | 205 | { |
206 | - set_error_handler(function () {}); |
|
206 | + set_error_handler(function(){}); |
|
207 | 207 | $isLoggedIn = ftp_login( |
208 | 208 | $this->connection, |
209 | 209 | $this->getUsername(), |
@@ -211,11 +211,11 @@ discard block |
||
211 | 211 | ); |
212 | 212 | restore_error_handler(); |
213 | 213 | |
214 | - if ( ! $isLoggedIn) { |
|
214 | + if (!$isLoggedIn) { |
|
215 | 215 | $this->disconnect(); |
216 | 216 | throw new RuntimeException( |
217 | - 'Could not login with connection: ' . $this->getHost() . '::' . $this->getPort( |
|
218 | - ) . ', username: ' . $this->getUsername() |
|
217 | + 'Could not login with connection: '.$this->getHost().'::'.$this->getPort( |
|
218 | + ).', username: '.$this->getUsername() |
|
219 | 219 | ); |
220 | 220 | } |
221 | 221 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | { |
261 | 261 | $this->ensureDirectory(Util::dirname($path)); |
262 | 262 | |
263 | - if ( ! ftp_fput($this->getConnection(), $path, $resource, $this->transferMode)) { |
|
263 | + if (!ftp_fput($this->getConnection(), $path, $resource, $this->transferMode)) { |
|
264 | 264 | return false; |
265 | 265 | } |
266 | 266 | |
@@ -315,10 +315,10 @@ discard block |
||
315 | 315 | |
316 | 316 | foreach ($contents as $object) { |
317 | 317 | if ($object['type'] === 'file') { |
318 | - if ( ! ftp_delete($connection, $object['path'])) { |
|
318 | + if (!ftp_delete($connection, $object['path'])) { |
|
319 | 319 | return false; |
320 | 320 | } |
321 | - } elseif ( ! $this->deleteDir($object['path'])) { |
|
321 | + } elseif (!$this->deleteDir($object['path'])) { |
|
322 | 322 | return false; |
323 | 323 | } |
324 | 324 | } |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | */ |
415 | 415 | public function getMimetype($path) |
416 | 416 | { |
417 | - if ( ! $metadata = $this->getMetadata($path)) { |
|
417 | + if (!$metadata = $this->getMetadata($path)) { |
|
418 | 418 | return false; |
419 | 419 | } |
420 | 420 | |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | */ |
439 | 439 | public function read($path) |
440 | 440 | { |
441 | - if ( ! $object = $this->readStream($path)) { |
|
441 | + if (!$object = $this->readStream($path)) { |
|
442 | 442 | return false; |
443 | 443 | } |
444 | 444 | |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | $result = ftp_fget($this->getConnection(), $stream, $path, $this->transferMode); |
459 | 459 | rewind($stream); |
460 | 460 | |
461 | - if ( ! $result) { |
|
461 | + if (!$result) { |
|
462 | 462 | fclose($stream); |
463 | 463 | |
464 | 464 | return false; |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | { |
475 | 475 | $mode = $visibility === AdapterInterface::VISIBILITY_PUBLIC ? $this->getPermPublic() : $this->getPermPrivate(); |
476 | 476 | |
477 | - if ( ! ftp_chmod($this->getConnection(), $mode, $path)) { |
|
477 | + if (!ftp_chmod($this->getConnection(), $mode, $path)) { |
|
478 | 478 | return false; |
479 | 479 | } |
480 | 480 | |
@@ -563,6 +563,6 @@ discard block |
||
563 | 563 | if ($this->isPureFtpd) { |
564 | 564 | $path = str_replace(' ', '\ ', $path); |
565 | 565 | } |
566 | - return ftp_rawlist($connection, $options . ' ' . $path); |
|
566 | + return ftp_rawlist($connection, $options.' '.$path); |
|
567 | 567 | } |
568 | 568 | } |
@@ -512,7 +512,9 @@ |
||
512 | 512 | |
513 | 513 | foreach ($listing as $item) { |
514 | 514 | $output[] = $item; |
515 | - if ($item['type'] !== 'dir') continue; |
|
515 | + if ($item['type'] !== 'dir') { |
|
516 | + continue; |
|
517 | + } |
|
516 | 518 | $output = array_merge($output, $this->listDirectoryContentsRecursive($item['path'])); |
517 | 519 | } |
518 | 520 |
@@ -4,7 +4,6 @@ discard block |
||
4 | 4 | |
5 | 5 | use DirectoryIterator; |
6 | 6 | use FilesystemIterator; |
7 | -use finfo as Finfo; |
|
8 | 7 | use League\Flysystem\AdapterInterface; |
9 | 8 | use League\Flysystem\Config; |
10 | 9 | use League\Flysystem\Exception; |
@@ -15,6 +14,7 @@ discard block |
||
15 | 14 | use RecursiveDirectoryIterator; |
16 | 15 | use RecursiveIteratorIterator; |
17 | 16 | use SplFileInfo; |
17 | +use finfo as Finfo; |
|
18 | 18 | |
19 | 19 | class Local extends AbstractAdapter |
20 | 20 | { |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | $this->permissionMap = array_replace_recursive(static::$permissions, $permissions); |
78 | 78 | $this->ensureDirectory($root); |
79 | 79 | |
80 | - if ( ! is_dir($root) || ! is_readable($root)) { |
|
81 | - throw new LogicException('The root path ' . $root . ' is not readable.'); |
|
80 | + if (!is_dir($root) || !is_readable($root)) { |
|
81 | + throw new LogicException('The root path '.$root.' is not readable.'); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | $this->setPathPrefix($root); |
@@ -97,12 +97,12 @@ discard block |
||
97 | 97 | */ |
98 | 98 | protected function ensureDirectory($root) |
99 | 99 | { |
100 | - if ( ! is_dir($root)) { |
|
100 | + if (!is_dir($root)) { |
|
101 | 101 | $umask = umask(0); |
102 | 102 | @mkdir($root, $this->permissionMap['dir']['public'], true); |
103 | 103 | umask($umask); |
104 | 104 | |
105 | - if ( ! is_dir($root)) { |
|
105 | + if (!is_dir($root)) { |
|
106 | 106 | throw new Exception(sprintf('Impossible to create the root directory "%s".', $root)); |
107 | 107 | } |
108 | 108 | } |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $this->ensureDirectory(dirname($location)); |
151 | 151 | $stream = fopen($location, 'w+b'); |
152 | 152 | |
153 | - if ( ! $stream || stream_copy_to_stream($resource, $stream) === false || ! fclose($stream)) { |
|
153 | + if (!$stream || stream_copy_to_stream($resource, $stream) === false || !fclose($stream)) { |
|
154 | 154 | return false; |
155 | 155 | } |
156 | 156 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $result = []; |
266 | 266 | $location = $this->applyPathPrefix($directory); |
267 | 267 | |
268 | - if ( ! is_dir($location)) { |
|
268 | + if (!is_dir($location)) { |
|
269 | 269 | return []; |
270 | 270 | } |
271 | 271 | |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | $umask = umask(0); |
366 | 366 | $visibility = $config->get('visibility', 'public'); |
367 | 367 | |
368 | - if ( ! is_dir($location) && ! mkdir($location, $this->permissionMap['dir'][$visibility], true)) { |
|
368 | + if (!is_dir($location) && !mkdir($location, $this->permissionMap['dir'][$visibility], true)) { |
|
369 | 369 | $return = false; |
370 | 370 | } else { |
371 | 371 | $return = ['path' => $dirname, 'type' => 'dir']; |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | { |
384 | 384 | $location = $this->applyPathPrefix($dirname); |
385 | 385 | |
386 | - if ( ! is_dir($location)) { |
|
386 | + if (!is_dir($location)) { |
|
387 | 387 | return false; |
388 | 388 | } |
389 | 389 | |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | */ |
427 | 427 | protected function normalizeFileInfo(SplFileInfo $file) |
428 | 428 | { |
429 | - if ( ! $file->isLink()) { |
|
429 | + if (!$file->isLink()) { |
|
430 | 430 | return $this->mapFileInfo($file); |
431 | 431 | } |
432 | 432 | |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | */ |
505 | 505 | protected function guardAgainstUnreadableFileInfo(SplFileInfo $file) |
506 | 506 | { |
507 | - if ( ! $file->isReadable()) { |
|
507 | + if (!$file->isReadable()) { |
|
508 | 508 | throw UnreadableFileException::forFileInfo($file); |
509 | 509 | } |
510 | 510 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | * |
37 | 37 | * @param string $path |
38 | 38 | * |
39 | - * @return array|false |
|
39 | + * @return resource |
|
40 | 40 | * |
41 | 41 | * @see League\Flysystem\ReadInterface::read() |
42 | 42 | */ |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | public function readStream($path) |
20 | 20 | { |
21 | - if ( ! $data = $this->read($path)) { |
|
21 | + if (!$data = $this->read($path)) { |
|
22 | 22 | return false; |
23 | 23 | } |
24 | 24 |
@@ -15,6 +15,7 @@ |
||
15 | 15 | * Set the Filesystem object. |
16 | 16 | * |
17 | 17 | * @param FilesystemInterface $filesystem |
18 | + * @return void |
|
18 | 19 | */ |
19 | 20 | public function setFilesystem(FilesystemInterface $filesystem); |
20 | 21 | } |