@@ -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 | { |
@@ -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 | { |
@@ -3,9 +3,9 @@ |
||
3 | 3 | use Kunnu\Dropbox\Dropbox; |
4 | 4 | use Kunnu\Dropbox\DropboxApp; |
5 | 5 | use Kunnu\Dropbox\DropboxFile; |
6 | +use Kunnu\Dropbox\Exceptions\DropboxClientException; |
|
6 | 7 | use Kunnu\Dropbox\Models\FileMetadata; |
7 | 8 | use Kunnu\Dropbox\Models\FolderMetadata; |
8 | -use Kunnu\Dropbox\Exceptions\DropboxClientException; |
|
9 | 9 | |
10 | 10 | elFinder::$netDrivers['dropbox2'] = 'Dropbox2'; |
11 | 11 |
@@ -327,7 +327,6 @@ discard block |
||
327 | 327 | * process of on netunmount |
328 | 328 | * Drop `googledrive` & rm thumbs. |
329 | 329 | * |
330 | - * @param array $options |
|
331 | 330 | * |
332 | 331 | * @return bool |
333 | 332 | */ |
@@ -582,7 +581,6 @@ discard block |
||
582 | 581 | /** |
583 | 582 | * Get ID based path from item ID. |
584 | 583 | * |
585 | - * @param string $path |
|
586 | 584 | */ |
587 | 585 | protected function _gd_getMountPaths($id) |
588 | 586 | { |
@@ -686,7 +684,6 @@ discard block |
||
686 | 684 | * Get thumbnail from GoogleDrive.com. |
687 | 685 | * |
688 | 686 | * @param string $path |
689 | - * @param string $size |
|
690 | 687 | * |
691 | 688 | * @return string | boolean |
692 | 689 | */ |
@@ -1204,7 +1201,6 @@ discard block |
||
1204 | 1201 | * Create thumnbnail and return it's URL on success. |
1205 | 1202 | * |
1206 | 1203 | * @param string $path file path |
1207 | - * @param string $mime file mime type |
|
1208 | 1204 | * |
1209 | 1205 | * @return string|false |
1210 | 1206 | * |
@@ -1518,7 +1514,6 @@ discard block |
||
1518 | 1514 | * Open file and return file pointer. |
1519 | 1515 | * |
1520 | 1516 | * @param string $path file path |
1521 | - * @param bool $write open file for writing |
|
1522 | 1517 | * |
1523 | 1518 | * @return resource|false |
1524 | 1519 | * |
@@ -1562,7 +1557,7 @@ discard block |
||
1562 | 1557 | * |
1563 | 1558 | * @param resource $fp file pointer |
1564 | 1559 | * |
1565 | - * @return bool |
|
1560 | + * @return boolean|null |
|
1566 | 1561 | * |
1567 | 1562 | * @author Dmitry (dio) Levashov |
1568 | 1563 | **/ |
@@ -1685,7 +1680,7 @@ discard block |
||
1685 | 1680 | * Return new file path or false. |
1686 | 1681 | * |
1687 | 1682 | * @param string $source source file path |
1688 | - * @param string $target target dir path |
|
1683 | + * @param string $targetDir target dir path |
|
1689 | 1684 | * @param string $name file name |
1690 | 1685 | * |
1691 | 1686 | * @return string|bool |
@@ -1764,7 +1759,6 @@ discard block |
||
1764 | 1759 | * Return new file path or false on error. |
1765 | 1760 | * |
1766 | 1761 | * @param resource $fp file pointer |
1767 | - * @param string $dir target dir path |
|
1768 | 1762 | * @param string $name file name |
1769 | 1763 | * @param array $stat file stat (required by some virtual fs) |
1770 | 1764 | * |
@@ -1897,7 +1891,7 @@ discard block |
||
1897 | 1891 | * |
1898 | 1892 | * @param string $path file path |
1899 | 1893 | * |
1900 | - * @return string|false |
|
1894 | + * @return boolean|string |
|
1901 | 1895 | * |
1902 | 1896 | * @author Dmitry (dio) Levashov |
1903 | 1897 | **/ |
@@ -1925,7 +1919,7 @@ discard block |
||
1925 | 1919 | * @param string $path file path |
1926 | 1920 | * @param string $content new file content |
1927 | 1921 | * |
1928 | - * @return bool |
|
1922 | + * @return string|boolean |
|
1929 | 1923 | * |
1930 | 1924 | * @author Dmitry (dio) Levashov |
1931 | 1925 | **/ |
@@ -1987,7 +1981,7 @@ discard block |
||
1987 | 1981 | * |
1988 | 1982 | * @param string $path file/dir path |
1989 | 1983 | * |
1990 | - * @return bool |
|
1984 | + * @return boolean|null |
|
1991 | 1985 | * |
1992 | 1986 | * @author Dmitry (dio) Levashov |
1993 | 1987 | **/ |
@@ -2033,7 +2027,6 @@ discard block |
||
2033 | 2027 | /** |
2034 | 2028 | * Drive query and fetchAll. |
2035 | 2029 | * |
2036 | - * @param string $sql |
|
2037 | 2030 | * |
2038 | 2031 | * @return bool|array |
2039 | 2032 | */ |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | /** |
596 | 596 | * Return elFinder session wrapper instance. |
597 | 597 | * |
598 | - * @return object elFinderSessionInterface |
|
598 | + * @return elFinderSessionInterface elFinderSessionInterface |
|
599 | 599 | **/ |
600 | 600 | public function getSession() |
601 | 601 | { |
@@ -1195,7 +1195,7 @@ discard block |
||
1195 | 1195 | /** |
1196 | 1196 | * Return elFinder static variable. |
1197 | 1197 | * |
1198 | - * @param $key |
|
1198 | + * @param string $key |
|
1199 | 1199 | * @return mixed|null |
1200 | 1200 | */ |
1201 | 1201 | public static function getStaticVar($key) |
@@ -1275,8 +1275,8 @@ discard block |
||
1275 | 1275 | * Get stream resource pointer by URL. |
1276 | 1276 | * |
1277 | 1277 | * @param array $data array('target'=>'URL', 'headers' => array()) |
1278 | - * @param number $redirectLimit |
|
1279 | - * @return resource|bool |
|
1278 | + * @param integer $redirectLimit |
|
1279 | + * @return resource |
|
1280 | 1280 | * |
1281 | 1281 | * @author Naoki Sawada |
1282 | 1282 | */ |
@@ -1376,7 +1376,7 @@ discard block |
||
1376 | 1376 | * |
1377 | 1377 | * @throws \Exception |
1378 | 1378 | * |
1379 | - * @return mixed |
|
1379 | + * @return string |
|
1380 | 1380 | * |
1381 | 1381 | * @author Naoki Sawada |
1382 | 1382 | */ |
@@ -2428,7 +2428,7 @@ discard block |
||
2428 | 2428 | * @param string $str |
2429 | 2429 | * @param array $extTable |
2430 | 2430 | * @param array $args |
2431 | - * @return array |
|
2431 | + * @return string[] |
|
2432 | 2432 | * @author Naoki Sawada |
2433 | 2433 | */ |
2434 | 2434 | protected function parse_data_scheme($str, $extTable, $args = null) |
@@ -3570,7 +3570,7 @@ discard block |
||
3570 | 3570 | * |
3571 | 3571 | * @param array|string $hashes |
3572 | 3572 | * @param bool $autoUnlock |
3573 | - * @return bool |
|
3573 | + * @return false|null |
|
3574 | 3574 | */ |
3575 | 3575 | protected function itemLock($hashes, $autoUnlock = true) |
3576 | 3576 | { |
@@ -3599,7 +3599,7 @@ discard block |
||
3599 | 3599 | * Do unlock target item. |
3600 | 3600 | * |
3601 | 3601 | * @param string $hash |
3602 | - * @return bool |
|
3602 | + * @return boolean|null |
|
3603 | 3603 | */ |
3604 | 3604 | protected function itemUnlock($hash) |
3605 | 3605 | { |
@@ -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; |
@@ -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 |