@@ -49,7 +49,7 @@ |
||
49 | 49 | * |
50 | 50 | * @param array $data |
51 | 51 | * |
52 | - * @return mixed |
|
52 | + * @return StreamedResponse |
|
53 | 53 | */ |
54 | 54 | protected function output(array $data) |
55 | 55 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Recca0120\Elfinder; |
4 | 4 | |
5 | -use elFinderConnector; |
|
6 | 5 | use Symfony\Component\HttpFoundation\StreamedResponse; |
6 | +use elFinderConnector; |
|
7 | 7 | |
8 | 8 | class Connector extends elFinderConnector |
9 | 9 | { |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Recca0120\Elfinder; |
4 | 4 | |
5 | -use elFinder; |
|
6 | -use Illuminate\Support\Arr; |
|
7 | 5 | use Illuminate\Routing\Router; |
6 | +use Illuminate\Support\Arr; |
|
8 | 7 | use Illuminate\Support\ServiceProvider; |
8 | +use elFinder; |
|
9 | 9 | |
10 | 10 | class ElfinderServiceProvider extends ServiceProvider |
11 | 11 | { |
@@ -46,7 +46,6 @@ |
||
46 | 46 | /** |
47 | 47 | * connector. |
48 | 48 | * |
49 | - * @param \Recca0120\Elfinder\Connector $elfinder |
|
50 | 49 | * @return mixed |
51 | 50 | */ |
52 | 51 | public function connector(Connector $connector) |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace Recca0120\Elfinder\Http\Controllers; |
4 | 4 | |
5 | +use Illuminate\Contracts\Routing\ResponseFactory; |
|
6 | +use Illuminate\Filesystem\Filesystem; |
|
5 | 7 | use Illuminate\Http\Request; |
6 | -use Recca0120\Elfinder\Connector; |
|
7 | 8 | use Illuminate\Routing\Controller; |
8 | -use Illuminate\Filesystem\Filesystem; |
|
9 | -use Illuminate\Contracts\Routing\ResponseFactory; |
|
9 | +use Recca0120\Elfinder\Connector; |
|
10 | 10 | |
11 | 11 | class ElfinderController extends Controller |
12 | 12 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Recca0120\Elfinder; |
4 | 4 | |
5 | -use Closure; |
|
6 | 5 | use ArrayObject; |
7 | -use Illuminate\Support\Arr; |
|
8 | -use Illuminate\Http\Request; |
|
9 | -use Illuminate\Filesystem\Filesystem; |
|
6 | +use Closure; |
|
10 | 7 | use Illuminate\Contracts\Routing\UrlGenerator; |
8 | +use Illuminate\Filesystem\Filesystem; |
|
9 | +use Illuminate\Http\Request; |
|
10 | +use Illuminate\Support\Arr; |
|
11 | 11 | |
12 | 12 | class Options extends ArrayObject |
13 | 13 | { |
@@ -172,6 +172,9 @@ |
||
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | |
175 | + /** |
|
176 | + * @param string $key |
|
177 | + */ |
|
175 | 178 | protected function &getSessionRef($key) |
176 | 179 | { |
177 | 180 | $session = null; |
@@ -284,7 +284,6 @@ discard block |
||
284 | 284 | * process of on netunmount |
285 | 285 | * Drop `box` & rm thumbs. |
286 | 286 | * |
287 | - * @param array $options |
|
288 | 287 | * |
289 | 288 | * @return bool |
290 | 289 | */ |
@@ -393,11 +392,9 @@ discard block |
||
393 | 392 | /** |
394 | 393 | * Obtains a new access token from OAuth. This token is valid for one hour. |
395 | 394 | * |
396 | - * @param string $clientSecret The Box client secret |
|
395 | + * @param string $client_secret The Box client secret |
|
397 | 396 | * @param string $code The code returned by Box after |
398 | 397 | * successful log in |
399 | - * @param string $redirectUri Must be the same as the redirect URI passed |
|
400 | - * to LoginUrl |
|
401 | 398 | * |
402 | 399 | * @throws \Exception Thrown if this Client instance's clientId is not set |
403 | 400 | * @throws \Exception Thrown if the redirect URI of this Client instance's |
@@ -449,7 +446,7 @@ discard block |
||
449 | 446 | /** |
450 | 447 | * Get token and auto refresh. |
451 | 448 | * |
452 | - * @return true|string error message |
|
449 | + * @return boolean error message |
|
453 | 450 | */ |
454 | 451 | protected function _bd_refreshToken() |
455 | 452 | { |
@@ -533,8 +530,8 @@ discard block |
||
533 | 530 | /** |
534 | 531 | * Creates a base cURL object which is compatible with the Box.com API. |
535 | 532 | * |
536 | - * @param string $path The path of the API call (eg. /folders/0) |
|
537 | 533 | * |
534 | + * @param string $url |
|
538 | 535 | * @return resource A compatible cURL object |
539 | 536 | */ |
540 | 537 | protected function _bd_fetch($url, $contents = false) |
@@ -582,7 +579,7 @@ discard block |
||
582 | 579 | * |
583 | 580 | * @param resource $curl |
584 | 581 | * @param bool|string $decodeOrParent |
585 | - * @param array $headers |
|
582 | + * @param string[] $headers |
|
586 | 583 | * |
587 | 584 | * @throws \Exception |
588 | 585 | * |
@@ -636,7 +633,6 @@ discard block |
||
636 | 633 | /** |
637 | 634 | * Drive query and fetchAll. |
638 | 635 | * |
639 | - * @param string $sql |
|
640 | 636 | * |
641 | 637 | * @return bool|array |
642 | 638 | */ |
@@ -740,7 +736,6 @@ discard block |
||
740 | 736 | * Get thumbnail from Box.com. |
741 | 737 | * |
742 | 738 | * @param string $path |
743 | - * @param string $size |
|
744 | 739 | * |
745 | 740 | * @return string | boolean |
746 | 741 | */ |
@@ -763,6 +758,7 @@ discard block |
||
763 | 758 | * Remove item. |
764 | 759 | * |
765 | 760 | * @param string $path file path |
761 | + * @param string $type |
|
766 | 762 | * |
767 | 763 | * @return bool |
768 | 764 | **/ |
@@ -979,7 +975,7 @@ discard block |
||
979 | 975 | * @param string $dst destination dir path |
980 | 976 | * @param string $name new file name (optionaly) |
981 | 977 | * |
982 | - * @return string|false |
|
978 | + * @return string|boolean |
|
983 | 979 | * |
984 | 980 | * @author Dmitry (dio) Levashov |
985 | 981 | * @author Naoki Sawada |
@@ -1038,7 +1034,6 @@ discard block |
||
1038 | 1034 | * Create thumnbnail and return it's URL on success. |
1039 | 1035 | * |
1040 | 1036 | * @param string $path file path |
1041 | - * @param string $mime file mime type |
|
1042 | 1037 | |
1043 | 1038 | * @return string|false |
1044 | 1039 | * |
@@ -1395,7 +1390,6 @@ discard block |
||
1395 | 1390 | * Open file and return file pointer. |
1396 | 1391 | * |
1397 | 1392 | * @param string $path file path |
1398 | - * @param bool $write open file for writing |
|
1399 | 1393 | * |
1400 | 1394 | * @return resource|false |
1401 | 1395 | * |
@@ -1421,7 +1415,7 @@ discard block |
||
1421 | 1415 | * |
1422 | 1416 | * @param resource $fp file pointer |
1423 | 1417 | * |
1424 | - * @return bool |
|
1418 | + * @return boolean|null |
|
1425 | 1419 | * |
1426 | 1420 | * @author Dmitry (dio) Levashov |
1427 | 1421 | **/ |
@@ -1505,7 +1499,7 @@ discard block |
||
1505 | 1499 | * @param string $targetDir target directory path |
1506 | 1500 | * @param string $name new file name |
1507 | 1501 | * |
1508 | - * @return string|false |
|
1502 | + * @return string|boolean |
|
1509 | 1503 | * |
1510 | 1504 | * @author Dmitry (dio) Levashov |
1511 | 1505 | **/ |
@@ -1552,7 +1546,7 @@ discard block |
||
1552 | 1546 | * Return new file path or false. |
1553 | 1547 | * |
1554 | 1548 | * @param string $source source file path |
1555 | - * @param string $target target dir path |
|
1549 | + * @param string $targetDir target dir path |
|
1556 | 1550 | * @param string $name file name |
1557 | 1551 | * |
1558 | 1552 | * @return string|bool |
@@ -1630,7 +1624,6 @@ discard block |
||
1630 | 1624 | * Return new file path or false on error. |
1631 | 1625 | * |
1632 | 1626 | * @param resource $fp file pointer |
1633 | - * @param string $dir target dir path |
|
1634 | 1627 | * @param string $name file name |
1635 | 1628 | * @param array $stat file stat (required by some virtual fs) |
1636 | 1629 | * |
@@ -1729,7 +1722,7 @@ discard block |
||
1729 | 1722 | * @param string $path file path |
1730 | 1723 | * @param string $content new file content |
1731 | 1724 | * |
1732 | - * @return bool |
|
1725 | + * @return string|boolean |
|
1733 | 1726 | * |
1734 | 1727 | * @author Dmitry (dio) Levashov |
1735 | 1728 | **/ |
@@ -1791,7 +1784,7 @@ discard block |
||
1791 | 1784 | * |
1792 | 1785 | * @param string $path file/dir path |
1793 | 1786 | * |
1794 | - * @return bool |
|
1787 | + * @return boolean|null |
|
1795 | 1788 | * |
1796 | 1789 | * @author Dmitry (dio) Levashov |
1797 | 1790 | **/ |
@@ -1831,7 +1831,6 @@ discard block |
||
1831 | 1831 | * |
1832 | 1832 | * @param string $hash directory hash |
1833 | 1833 | * @param bool|null $lineal only lineal parents |
1834 | - * @param string $until hash that is enough to that extent >= 2.1.24 |
|
1835 | 1834 | * @return array |
1836 | 1835 | * @author Dmitry (dio) Levashov |
1837 | 1836 | **/ |
@@ -2446,7 +2445,7 @@ discard block |
||
2446 | 2445 | * Return file contents. |
2447 | 2446 | * |
2448 | 2447 | * @param string $hash file hash |
2449 | - * @return string|false |
|
2448 | + * @return boolean|string |
|
2450 | 2449 | * @author Dmitry (dio) Levashov |
2451 | 2450 | **/ |
2452 | 2451 | public function getContents($hash) |
@@ -2764,7 +2763,7 @@ discard block |
||
2764 | 2763 | * |
2765 | 2764 | * @param string $q search string |
2766 | 2765 | * @param array $mimes |
2767 | - * @param null $hash |
|
2766 | + * @param string|null $hash |
|
2768 | 2767 | * @return array |
2769 | 2768 | * @author Dmitry (dio) Levashov |
2770 | 2769 | */ |
@@ -3592,7 +3591,8 @@ discard block |
||
3592 | 3591 | * Not implemented. |
3593 | 3592 | * |
3594 | 3593 | * @param string path |
3595 | - * @return mixed |
|
3594 | + * @param string $path |
|
3595 | + * @return string |
|
3596 | 3596 | * @author Dmitry (dio) Levashov |
3597 | 3597 | **/ |
3598 | 3598 | protected function crypt($path) |
@@ -3605,7 +3605,8 @@ discard block |
||
3605 | 3605 | * Not implemented. |
3606 | 3606 | * |
3607 | 3607 | * @param mixed hash |
3608 | - * @return mixed |
|
3608 | + * @param string $hash |
|
3609 | + * @return string |
|
3609 | 3610 | * @author Dmitry (dio) Levashov |
3610 | 3611 | **/ |
3611 | 3612 | protected function uncrypt($hash) |
@@ -3657,7 +3658,7 @@ discard block |
||
3657 | 3658 | * @param string $from from character encoding |
3658 | 3659 | * @param string $to to character encoding |
3659 | 3660 | * @param string $locale local locale |
3660 | - * @param $restoreLocale |
|
3661 | + * @param boolean $restoreLocale |
|
3661 | 3662 | * @param string $unknown replaces character for unknown |
3662 | 3663 | * @return mixed |
3663 | 3664 | */ |
@@ -3910,7 +3911,7 @@ discard block |
||
3910 | 3911 | * |
3911 | 3912 | * @param string $dir parent dir path |
3912 | 3913 | * @param string $name new file name |
3913 | - * @param null $isDir |
|
3914 | + * @param boolean $isDir |
|
3914 | 3915 | * @return bool |
3915 | 3916 | * @author Dmitry (dio) Levashov |
3916 | 3917 | */ |
@@ -4634,7 +4635,7 @@ discard block |
||
4634 | 4635 | * @param string $src source path |
4635 | 4636 | * @param string $dst destination dir path |
4636 | 4637 | * @param string $name new file name (optionaly) |
4637 | - * @return string|false |
|
4638 | + * @return string |
|
4638 | 4639 | * @author Dmitry (dio) Levashov |
4639 | 4640 | **/ |
4640 | 4641 | protected function copy($src, $dst, $name) |
@@ -4710,7 +4711,7 @@ discard block |
||
4710 | 4711 | * @param string $src source path |
4711 | 4712 | * @param string $dst destination dir path |
4712 | 4713 | * @param string $name new file name |
4713 | - * @return string|false |
|
4714 | + * @return string|boolean |
|
4714 | 4715 | * @author Dmitry (dio) Levashov |
4715 | 4716 | **/ |
4716 | 4717 | protected function move($src, $dst, $name) |
@@ -4740,7 +4741,7 @@ discard block |
||
4740 | 4741 | * @param string $src source file hash |
4741 | 4742 | * @param string $destination destination dir path |
4742 | 4743 | * @param string $name file name |
4743 | - * @return string|false |
|
4744 | + * @return string |
|
4744 | 4745 | * @author Dmitry (dio) Levashov |
4745 | 4746 | **/ |
4746 | 4747 | protected function copyFrom($volume, $src, $destination, $name) |
@@ -5371,8 +5372,8 @@ discard block |
||
5371 | 5372 | * @param string $path image file |
5372 | 5373 | * @param int $width square width |
5373 | 5374 | * @param int $height square height |
5374 | - * @param int|string $align reserved |
|
5375 | - * @param int|string $valign reserved |
|
5375 | + * @param string $align reserved |
|
5376 | + * @param string $valign reserved |
|
5376 | 5377 | * @param string $bgcolor square background color in #rrggbb format |
5377 | 5378 | * @param string $destformat image destination format |
5378 | 5379 | * @param int $jpgQuality JEPG quality (1-100) |
@@ -5642,7 +5643,7 @@ discard block |
||
5642 | 5643 | * |
5643 | 5644 | * @param string $command command line |
5644 | 5645 | * @param array $output stdout strings |
5645 | - * @param array|int $return_var process exit code |
|
5646 | + * @param integer $return_var process exit code |
|
5646 | 5647 | * @param array $error_output stderr strings |
5647 | 5648 | * @return int exit code |
5648 | 5649 | * @author Alexey Sukhotin |
@@ -6146,7 +6147,7 @@ discard block |
||
6146 | 6147 | * @param array $files files names list |
6147 | 6148 | * @param string $name archive name |
6148 | 6149 | * @param array $arc archiver options |
6149 | - * @return string|bool |
|
6150 | + * @return false|string |
|
6150 | 6151 | * @author Dmitry (dio) Levashov, |
6151 | 6152 | * @author Alexey Sukhotin |
6152 | 6153 | * @author Naoki Sawada |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | * @param string $src source path |
726 | 726 | * @param string $dst destination dir path |
727 | 727 | * @param string $name new file name (optionaly) |
728 | - * @return string|false |
|
728 | + * @return string|boolean |
|
729 | 729 | * @author Dmitry (dio) Levashov |
730 | 730 | * @author Naoki Sawada |
731 | 731 | **/ |
@@ -1119,7 +1119,7 @@ discard block |
||
1119 | 1119 | * |
1120 | 1120 | * @param resource $fp file pointer |
1121 | 1121 | * @param string $path |
1122 | - * @return bool |
|
1122 | + * @return boolean|null |
|
1123 | 1123 | * @author Dmitry (dio) Levashov |
1124 | 1124 | */ |
1125 | 1125 | protected function _fclose($fp, $path = '') |
@@ -1324,7 +1324,7 @@ discard block |
||
1324 | 1324 | * |
1325 | 1325 | * @param string $path file path |
1326 | 1326 | * @param string $content new file content |
1327 | - * @return bool |
|
1327 | + * @return boolean|string |
|
1328 | 1328 | * @author Dmitry (dio) Levashov |
1329 | 1329 | **/ |
1330 | 1330 | protected function _filePutContents($path, $content) |
@@ -1386,7 +1386,7 @@ discard block |
||
1386 | 1386 | * Recursive symlinks search. |
1387 | 1387 | * |
1388 | 1388 | * @param string $path file/dir path |
1389 | - * @return bool |
|
1389 | + * @return boolean|null |
|
1390 | 1390 | * @author Dmitry (dio) Levashov |
1391 | 1391 | **/ |
1392 | 1392 | protected function _findSymlinks($path) |
@@ -295,7 +295,6 @@ discard block |
||
295 | 295 | * process of on netunmount |
296 | 296 | * Drop `Dropbox` & rm thumbs. |
297 | 297 | * |
298 | - * @param array $options |
|
299 | 298 | * |
300 | 299 | * @return bool |
301 | 300 | */ |
@@ -402,7 +401,7 @@ discard block |
||
402 | 401 | * |
403 | 402 | * @param string $path |
404 | 403 | * |
405 | - * @return array |
|
404 | + * @return string[] |
|
406 | 405 | */ |
407 | 406 | protected function _db_splitPath($path) |
408 | 407 | { |
@@ -489,7 +488,6 @@ discard block |
||
489 | 488 | * Get thumbnail from Dropbox. |
490 | 489 | * |
491 | 490 | * @param string $path |
492 | - * @param string $size |
|
493 | 491 | * |
494 | 492 | * @return string | boolean |
495 | 493 | */ |
@@ -506,7 +504,7 @@ discard block |
||
506 | 504 | * Join dir name and file name(display name) and retur full path. |
507 | 505 | * |
508 | 506 | * @param unknown $dir |
509 | - * @param unknown $displayName |
|
507 | + * @param string $displayName |
|
510 | 508 | * |
511 | 509 | * @return string |
512 | 510 | */ |
@@ -785,7 +783,6 @@ discard block |
||
785 | 783 | * Create thumnbnail and return it's URL on success. |
786 | 784 | * |
787 | 785 | * @param string $path file path |
788 | - * @param string $mime file mime type |
|
789 | 786 | * |
790 | 787 | * @return string|false |
791 | 788 | * |
@@ -1112,7 +1109,6 @@ discard block |
||
1112 | 1109 | * Open file and return file pointer. |
1113 | 1110 | * |
1114 | 1111 | * @param string $path file path |
1115 | - * @param bool $write open file for writing |
|
1116 | 1112 | * |
1117 | 1113 | * @return resource|false |
1118 | 1114 | * |
@@ -1142,7 +1138,7 @@ discard block |
||
1142 | 1138 | * |
1143 | 1139 | * @param resource $fp file pointer |
1144 | 1140 | * |
1145 | - * @return bool |
|
1141 | + * @return boolean|null |
|
1146 | 1142 | * |
1147 | 1143 | * @author Naoki Sawada |
1148 | 1144 | **/ |
@@ -1229,7 +1225,7 @@ discard block |
||
1229 | 1225 | * Return new file path or false. |
1230 | 1226 | * |
1231 | 1227 | * @param string $source source file path |
1232 | - * @param string $target target dir path |
|
1228 | + * @param string $targetDir target dir path |
|
1233 | 1229 | * @param string $name file name |
1234 | 1230 | * |
1235 | 1231 | * @return string|bool |
@@ -1286,7 +1282,6 @@ discard block |
||
1286 | 1282 | * Return new file path or false on error. |
1287 | 1283 | * |
1288 | 1284 | * @param resource $fp file pointer |
1289 | - * @param string $dir target dir path |
|
1290 | 1285 | * @param string $name file name |
1291 | 1286 | * @param array $stat file stat (required by some virtual fs) |
1292 | 1287 | * |
@@ -1352,7 +1347,7 @@ discard block |
||
1352 | 1347 | * @param string $path file path |
1353 | 1348 | * @param string $content new file content |
1354 | 1349 | * |
1355 | - * @return bool |
|
1350 | + * @return boolean|string |
|
1356 | 1351 | * |
1357 | 1352 | * @author Naoki Sawada |
1358 | 1353 | **/ |
@@ -1414,7 +1409,7 @@ discard block |
||
1414 | 1409 | * |
1415 | 1410 | * @param string $path file/dir path |
1416 | 1411 | * |
1417 | - * @return bool |
|
1412 | + * @return boolean|null |
|
1418 | 1413 | * |
1419 | 1414 | * @author Dmitry (dio) Levashov |
1420 | 1415 | **/ |
@@ -1462,7 +1457,7 @@ discard block |
||
1462 | 1457 | * |
1463 | 1458 | * @param string $path |
1464 | 1459 | * |
1465 | - * @return object Dropbox metadata |
|
1460 | + * @return string Dropbox metadata |
|
1466 | 1461 | */ |
1467 | 1462 | private function _db_getFile($path, $fields = '') |
1468 | 1463 | { |