@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * Constructor. |
33 | 33 | * |
34 | - * @param $elFinder |
|
34 | + * @param elFinder $elFinder |
|
35 | 35 | * @param bool $debug |
36 | 36 | * |
37 | 37 | * @author Dmitry (dio) Levashov |
@@ -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; |
@@ -3249,8 +3249,9 @@ discard block |
||
3249 | 3249 | * Not implemented. |
3250 | 3250 | * |
3251 | 3251 | * @param string path |
3252 | + * @param string $path |
|
3252 | 3253 | * |
3253 | - * @return mixed |
|
3254 | + * @return string |
|
3254 | 3255 | * |
3255 | 3256 | * @author Dmitry (dio) Levashov |
3256 | 3257 | **/ |
@@ -3264,8 +3265,9 @@ discard block |
||
3264 | 3265 | * Not implemented. |
3265 | 3266 | * |
3266 | 3267 | * @param mixed hash |
3268 | + * @param string $hash |
|
3267 | 3269 | * |
3268 | - * @return mixed |
|
3270 | + * @return string |
|
3269 | 3271 | * |
3270 | 3272 | * @author Dmitry (dio) Levashov |
3271 | 3273 | **/ |
@@ -3388,7 +3390,7 @@ discard block |
||
3388 | 3390 | * @param string $from from character encoding |
3389 | 3391 | * @param string $to to character encoding |
3390 | 3392 | * @param string $locale local locale |
3391 | - * @param $restoreLocale |
|
3393 | + * @param boolean $restoreLocale |
|
3392 | 3394 | * @param string $unknown replaces character for unknown |
3393 | 3395 | * |
3394 | 3396 | * @return mixed |
@@ -3669,7 +3671,7 @@ discard block |
||
3669 | 3671 | * |
3670 | 3672 | * @param string $dir parent dir path |
3671 | 3673 | * @param string $name new file name |
3672 | - * @param null $isDir |
|
3674 | + * @param boolean $isDir |
|
3673 | 3675 | * |
3674 | 3676 | * @return bool |
3675 | 3677 | * |
@@ -4338,7 +4340,7 @@ discard block |
||
4338 | 4340 | * @param string $dst destination dir path |
4339 | 4341 | * @param string $name new file name (optionaly) |
4340 | 4342 | * |
4341 | - * @return string|false |
|
4343 | + * @return string |
|
4342 | 4344 | * |
4343 | 4345 | * @author Dmitry (dio) Levashov |
4344 | 4346 | **/ |
@@ -4415,7 +4417,7 @@ discard block |
||
4415 | 4417 | * @param string $dst destination dir path |
4416 | 4418 | * @param string $name new file name |
4417 | 4419 | * |
4418 | - * @return string|false |
|
4420 | + * @return string|boolean |
|
4419 | 4421 | * |
4420 | 4422 | * @author Dmitry (dio) Levashov |
4421 | 4423 | **/ |
@@ -4444,7 +4446,7 @@ discard block |
||
4444 | 4446 | * @param string $destination destination dir path |
4445 | 4447 | * @param string $name file name |
4446 | 4448 | * |
4447 | - * @return string|false |
|
4449 | + * @return string |
|
4448 | 4450 | * |
4449 | 4451 | * @author Dmitry (dio) Levashov |
4450 | 4452 | **/ |
@@ -5093,8 +5095,8 @@ discard block |
||
5093 | 5095 | * @param string $path image file |
5094 | 5096 | * @param int $width square width |
5095 | 5097 | * @param int $height square height |
5096 | - * @param int|string $align reserved |
|
5097 | - * @param int|string $valign reserved |
|
5098 | + * @param string $align reserved |
|
5099 | + * @param string $valign reserved |
|
5098 | 5100 | * @param string $bgcolor square background color in #rrggbb format |
5099 | 5101 | * @param string $destformat image destination format |
5100 | 5102 | * @param int $jpgQuality JEPG quality (1-100) |
@@ -5365,7 +5367,7 @@ discard block |
||
5365 | 5367 | * |
5366 | 5368 | * @param string $command command line |
5367 | 5369 | * @param array $output stdout strings |
5368 | - * @param array|int $return_var process exit code |
|
5370 | + * @param integer $return_var process exit code |
|
5369 | 5371 | * @param array $error_output stderr strings |
5370 | 5372 | * |
5371 | 5373 | * @return int exit code |
@@ -5907,7 +5909,7 @@ discard block |
||
5907 | 5909 | * @param string $name archive name |
5908 | 5910 | * @param array $arc archiver options |
5909 | 5911 | * |
5910 | - * @return string|bool |
|
5912 | + * @return string|false |
|
5911 | 5913 | * |
5912 | 5914 | * @author Dmitry (dio) Levashov, |
5913 | 5915 | * @author Alexey Sukhotin |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | * @param string $dst destination dir path |
787 | 787 | * @param string $name new file name (optionaly) |
788 | 788 | * |
789 | - * @return string|false |
|
789 | + * @return string|boolean |
|
790 | 790 | * |
791 | 791 | * @author Dmitry (dio) Levashov |
792 | 792 | * @author Naoki Sawada |
@@ -1315,7 +1315,7 @@ discard block |
||
1315 | 1315 | * @param resource $fp file pointer |
1316 | 1316 | * @param string $path |
1317 | 1317 | * |
1318 | - * @return bool |
|
1318 | + * @return boolean|null |
|
1319 | 1319 | * |
1320 | 1320 | * @author Dmitry (dio) Levashov |
1321 | 1321 | */ |
@@ -1542,7 +1542,7 @@ discard block |
||
1542 | 1542 | * @param string $path file path |
1543 | 1543 | * @param string $content new file content |
1544 | 1544 | * |
1545 | - * @return bool |
|
1545 | + * @return boolean|string |
|
1546 | 1546 | * |
1547 | 1547 | * @author Dmitry (dio) Levashov |
1548 | 1548 | **/ |
@@ -1609,7 +1609,7 @@ discard block |
||
1609 | 1609 | * |
1610 | 1610 | * @param string $path file/dir path |
1611 | 1611 | * |
1612 | - * @return bool |
|
1612 | + * @return boolean|null |
|
1613 | 1613 | * |
1614 | 1614 | * @author Dmitry (dio) Levashov |
1615 | 1615 | **/ |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | * |
541 | 541 | * @param string $path file path |
542 | 542 | * |
543 | - * @return string |
|
543 | + * @return integer |
|
544 | 544 | * |
545 | 545 | * @author Dmitry (dio) Levashov |
546 | 546 | **/ |
@@ -1011,7 +1011,7 @@ discard block |
||
1011 | 1011 | * @param resource $fp file pointer |
1012 | 1012 | * @param string $path |
1013 | 1013 | * |
1014 | - * @return bool |
|
1014 | + * @return boolean|null |
|
1015 | 1015 | * |
1016 | 1016 | * @author Dmitry (dio) Levashov |
1017 | 1017 | */ |
@@ -1031,7 +1031,7 @@ discard block |
||
1031 | 1031 | * @param string $path parent dir path |
1032 | 1032 | * @param string $name new directory name |
1033 | 1033 | * |
1034 | - * @return string|bool |
|
1034 | + * @return false|string |
|
1035 | 1035 | * |
1036 | 1036 | * @author Dmitry (dio) Levashov |
1037 | 1037 | **/ |
@@ -1053,7 +1053,7 @@ discard block |
||
1053 | 1053 | * @param string $path parent dir path |
1054 | 1054 | * @param string $name new file name |
1055 | 1055 | * |
1056 | - * @return string|bool |
|
1056 | + * @return string|false |
|
1057 | 1057 | * |
1058 | 1058 | * @author Dmitry (dio) Levashov |
1059 | 1059 | **/ |
@@ -1094,7 +1094,7 @@ discard block |
||
1094 | 1094 | * @param string $targetDir target directory path |
1095 | 1095 | * @param string $name new file name |
1096 | 1096 | * |
1097 | - * @return bool |
|
1097 | + * @return string|false |
|
1098 | 1098 | * |
1099 | 1099 | * @author Dmitry (dio) Levashov |
1100 | 1100 | **/ |
@@ -1124,7 +1124,7 @@ discard block |
||
1124 | 1124 | * @param $targetDir |
1125 | 1125 | * @param string $name file name |
1126 | 1126 | * |
1127 | - * @return bool|string |
|
1127 | + * @return string|false |
|
1128 | 1128 | * |
1129 | 1129 | * @internal param string $target target dir path |
1130 | 1130 | * |
@@ -1174,7 +1174,7 @@ discard block |
||
1174 | 1174 | * @param string $name file name |
1175 | 1175 | * @param array $stat file stat (required by some virtual fs) |
1176 | 1176 | * |
1177 | - * @return bool|string |
|
1177 | + * @return string|false |
|
1178 | 1178 | * |
1179 | 1179 | * @author Dmitry (dio) Levashov |
1180 | 1180 | **/ |
@@ -1256,7 +1256,7 @@ discard block |
||
1256 | 1256 | * @param string $path |
1257 | 1257 | * @param string $mode |
1258 | 1258 | * |
1259 | - * @return bool |
|
1259 | + * @return integer |
|
1260 | 1260 | */ |
1261 | 1261 | protected function _chmod($path, $mode) |
1262 | 1262 | { |
@@ -1436,7 +1436,7 @@ discard block |
||
1436 | 1436 | * @param string $name archive name |
1437 | 1437 | * @param array $arc archiver options |
1438 | 1438 | * |
1439 | - * @return string|bool |
|
1439 | + * @return false|string |
|
1440 | 1440 | * |
1441 | 1441 | * @author Dmitry (dio) Levashov, |
1442 | 1442 | * @author Alexey Sukhotin |
@@ -1564,9 +1564,9 @@ discard block |
||
1564 | 1564 | * Downloads specified files from remote directory |
1565 | 1565 | * if there is a directory among files it is downloaded recursively (omitting symbolic links). |
1566 | 1566 | * |
1567 | - * @param $remote_directory string remote FTP path to a source directory to download from. |
|
1567 | + * @param string $remote_directory string remote FTP path to a source directory to download from. |
|
1568 | 1568 | * @param array $files list of files to download from remote directory. |
1569 | - * @param $dest_local_directory string destination folder to store downloaded files. |
|
1569 | + * @param string $dest_local_directory string destination folder to store downloaded files. |
|
1570 | 1570 | * |
1571 | 1571 | * @return bool true on success and false on failure. |
1572 | 1572 | */ |
@@ -1645,7 +1645,7 @@ discard block |
||
1645 | 1645 | * Returns array of strings containing all files and folders in the specified local directory. |
1646 | 1646 | * |
1647 | 1647 | * @param $dir |
1648 | - * @param $omitSymlinks |
|
1648 | + * @param boolean $omitSymlinks |
|
1649 | 1649 | * @param string $prefix |
1650 | 1650 | * |
1651 | 1651 | * @throws Exception |
@@ -832,7 +832,7 @@ discard block |
||
832 | 832 | * @param string $path parent dir path |
833 | 833 | * @param string $name new directory name |
834 | 834 | * |
835 | - * @return string|bool |
|
835 | + * @return string|false |
|
836 | 836 | * |
837 | 837 | * @author Dmitry (dio) Levashov |
838 | 838 | **/ |
@@ -856,7 +856,7 @@ discard block |
||
856 | 856 | * @param string $path parent dir path |
857 | 857 | * @param string $name new file name |
858 | 858 | * |
859 | - * @return string|bool |
|
859 | + * @return string|false |
|
860 | 860 | * |
861 | 861 | * @author Dmitry (dio) Levashov |
862 | 862 | **/ |
@@ -922,7 +922,7 @@ discard block |
||
922 | 922 | * @param $targetDir |
923 | 923 | * @param string $name file name |
924 | 924 | * |
925 | - * @return bool|string |
|
925 | + * @return string|false |
|
926 | 926 | * |
927 | 927 | * @internal param string $target target dir path |
928 | 928 | * |
@@ -1249,7 +1249,7 @@ discard block |
||
1249 | 1249 | * @param string $name archive name |
1250 | 1250 | * @param array $arc archiver options |
1251 | 1251 | * |
1252 | - * @return string|bool |
|
1252 | + * @return string|false |
|
1253 | 1253 | * |
1254 | 1254 | * @author Dmitry (dio) Levashov, |
1255 | 1255 | * @author Alexey Sukhotin |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | * @param resource $fp file pointer |
692 | 692 | * @param string $path |
693 | 693 | * |
694 | - * @return bool |
|
694 | + * @return boolean|null |
|
695 | 695 | * |
696 | 696 | * @author Dmitry (dio) Levashov |
697 | 697 | */ |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | * @param string $path parent dir path |
712 | 712 | * @param string $name new directory name |
713 | 713 | * |
714 | - * @return string|bool |
|
714 | + * @return string|false |
|
715 | 715 | * |
716 | 716 | * @author Dmitry (dio) Levashov |
717 | 717 | **/ |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | * @param string $path parent dir path |
727 | 727 | * @param string $name new file name |
728 | 728 | * |
729 | - * @return string|bool |
|
729 | + * @return string|false |
|
730 | 730 | * |
731 | 731 | * @author Dmitry (dio) Levashov |
732 | 732 | **/ |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | * @param $targetDir |
783 | 783 | * @param string $name file name |
784 | 784 | * |
785 | - * @return bool|string |
|
785 | + * @return string|false |
|
786 | 786 | * |
787 | 787 | * @internal param string $target target dir path |
788 | 788 | * |
@@ -995,7 +995,7 @@ discard block |
||
995 | 995 | * @param string $path archive path |
996 | 996 | * @param array $arc archiver command and arguments (same as in $this->archivers) |
997 | 997 | * |
998 | - * @return true |
|
998 | + * @return boolean |
|
999 | 999 | * |
1000 | 1000 | * @author Dmitry (dio) Levashov, |
1001 | 1001 | * @author Alexey Sukhotin |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * 以下のものは非対応 |
63 | 63 | * BITMAPV4HEADER と BITMAPV5HEADER に含まれる色空間に関する様々な機能 |
64 | 64 | * |
65 | - * @param $filename_or_stream_or_binary |
|
65 | + * @param string $filename_or_stream_or_binary |
|
66 | 66 | * |
67 | 67 | * @return bool|resource |
68 | 68 | */ |
@@ -101,6 +101,9 @@ discard block |
||
101 | 101 | return $bmp; |
102 | 102 | } |
103 | 103 | |
104 | + /** |
|
105 | + * @param string $str |
|
106 | + */ |
|
104 | 107 | public static function loadFromString($str) |
105 | 108 | { |
106 | 109 | //data scheme より古いバージョンから対応しているようなので php://memory を使う |
@@ -128,6 +131,9 @@ discard block |
||
128 | 131 | return $bmp; |
129 | 132 | } |
130 | 133 | |
134 | + /** |
|
135 | + * @param resource $stream |
|
136 | + */ |
|
131 | 137 | public static function loadFromStream($stream) |
132 | 138 | { |
133 | 139 | $buf = fread($stream, 14); //2+4+2+2+4 |
@@ -3,11 +3,11 @@ |
||
3 | 3 | namespace Recca0120\Elfinder; |
4 | 4 | |
5 | 5 | use Closure; |
6 | -use Illuminate\Support\Arr; |
|
6 | +use Illuminate\Contracts\Routing\UrlGenerator; |
|
7 | +use Illuminate\Filesystem\Filesystem; |
|
7 | 8 | use Illuminate\Http\Request; |
9 | +use Illuminate\Support\Arr; |
|
8 | 10 | use elFinder as BaseElfinder; |
9 | -use Illuminate\Filesystem\Filesystem; |
|
10 | -use Illuminate\Contracts\Routing\UrlGenerator; |
|
11 | 11 | |
12 | 12 | class Elfinder |
13 | 13 | { |