@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use League\Flysystem\Filesystem; |
|
4 | -use League\Flysystem\Adapter\Local; |
|
3 | +use Hypweb\Flysystem\Cached\Extra\DisableEnsureParentDirectories; |
|
5 | 4 | use Hypweb\Flysystem\Cached\Extra\Hasdir; |
6 | -use League\Flysystem\Cached\CachedAdapter; |
|
7 | 5 | use Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter; |
6 | +use League\Flysystem\Adapter\Local; |
|
7 | +use League\Flysystem\Cached\CachedAdapter; |
|
8 | 8 | use League\Flysystem\Cached\Storage\Adapter as ACache; |
9 | -use Hypweb\Flysystem\Cached\Extra\DisableEnsureParentDirectories; |
|
9 | +use League\Flysystem\Filesystem; |
|
10 | 10 | |
11 | 11 | elFinder::$netDrivers['googledrive'] = 'FlysystemGoogleDriveNetmount'; |
12 | 12 |
@@ -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 | **/ |
@@ -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 |
@@ -294,7 +294,6 @@ discard block |
||
294 | 294 | * process of on netunmount |
295 | 295 | * Drop `onedrive` & rm thumbs. |
296 | 296 | * |
297 | - * @param array $options |
|
298 | 297 | * |
299 | 298 | * @return bool |
300 | 299 | */ |
@@ -382,11 +381,9 @@ discard block |
||
382 | 381 | /** |
383 | 382 | * Obtains a new access token from OAuth. This token is valid for one hour. |
384 | 383 | * |
385 | - * @param string $clientSecret The OneDrive client secret |
|
384 | + * @param string $client_secret The OneDrive client secret |
|
386 | 385 | * @param string $code The code returned by OneDrive after |
387 | 386 | * successful log in |
388 | - * @param string $redirectUri Must be the same as the redirect URI passed |
|
389 | - * to LoginUrl |
|
390 | 387 | * |
391 | 388 | * @throws \Exception Thrown if this Client instance's clientId is not set |
392 | 389 | * @throws \Exception Thrown if the redirect URI of this Client instance's |
@@ -456,7 +453,7 @@ discard block |
||
456 | 453 | /** |
457 | 454 | * Get token and auto refresh. |
458 | 455 | * |
459 | - * @return true|Exception |
|
456 | + * @return boolean |
|
460 | 457 | */ |
461 | 458 | protected function _od_refreshToken() |
462 | 459 | { |
@@ -563,6 +560,7 @@ discard block |
||
563 | 560 | /** |
564 | 561 | * Creates a base cURL object which is compatible with the OneDrive API. |
565 | 562 | * |
563 | + * @param string $url |
|
566 | 564 | * @return resource A compatible cURL object |
567 | 565 | */ |
568 | 566 | protected function _od_prepareCurl($url = null) |
@@ -621,7 +619,6 @@ discard block |
||
621 | 619 | /** |
622 | 620 | * Drive query and fetchAll. |
623 | 621 | * |
624 | - * @param string $sql |
|
625 | 622 | * |
626 | 623 | * @return object|array |
627 | 624 | */ |
@@ -716,7 +713,7 @@ discard block |
||
716 | 713 | * |
717 | 714 | * @param string $path |
718 | 715 | * |
719 | - * @return array|object onedrive metadata |
|
716 | + * @return string onedrive metadata |
|
720 | 717 | */ |
721 | 718 | protected function _od_getFileRaw($path) |
722 | 719 | { |
@@ -734,7 +731,6 @@ discard block |
||
734 | 731 | * Get thumbnail from OneDrive.com. |
735 | 732 | * |
736 | 733 | * @param string $path |
737 | - * @param string $size |
|
738 | 734 | * |
739 | 735 | * @return string | boolean |
740 | 736 | */ |
@@ -854,6 +850,9 @@ discard block |
||
854 | 850 | $this->disabled[] = 'extract'; |
855 | 851 | } |
856 | 852 | |
853 | + /** |
|
854 | + * @param string $path |
|
855 | + */ |
|
857 | 856 | protected function isNameExists($path) |
858 | 857 | { |
859 | 858 | list($pid, $name) = $this->_od_splitPath($path); |
@@ -907,7 +906,7 @@ discard block |
||
907 | 906 | * @param string $dst destination dir path |
908 | 907 | * @param string $name new file name (optionaly) |
909 | 908 | * |
910 | - * @return string|false |
|
909 | + * @return boolean |
|
911 | 910 | * |
912 | 911 | * @author Dmitry (dio) Levashov |
913 | 912 | * @author Naoki Sawada |
@@ -974,7 +973,6 @@ discard block |
||
974 | 973 | * Create thumnbnail and return it's URL on success. |
975 | 974 | * |
976 | 975 | * @param string $path file path |
977 | - * @param string $mime file mime type |
|
978 | 976 | * |
979 | 977 | * @return string|false |
980 | 978 | * |
@@ -1296,7 +1294,6 @@ discard block |
||
1296 | 1294 | * Open file and return file pointer. |
1297 | 1295 | * |
1298 | 1296 | * @param string $path file path |
1299 | - * @param bool $write open file for writing |
|
1300 | 1297 | * |
1301 | 1298 | * @return resource|false |
1302 | 1299 | * |
@@ -1322,7 +1319,7 @@ discard block |
||
1322 | 1319 | * |
1323 | 1320 | * @param resource $fp file pointer |
1324 | 1321 | * |
1325 | - * @return bool |
|
1322 | + * @return boolean|null |
|
1326 | 1323 | * |
1327 | 1324 | * @author Dmitry (dio) Levashov |
1328 | 1325 | **/ |
@@ -1494,7 +1491,7 @@ discard block |
||
1494 | 1491 | * Return new file path or false. |
1495 | 1492 | * |
1496 | 1493 | * @param string $source source file path |
1497 | - * @param string $target target dir path |
|
1494 | + * @param string $targetDir target dir path |
|
1498 | 1495 | * @param string $name file name |
1499 | 1496 | * |
1500 | 1497 | * @return string|bool |
@@ -1589,7 +1586,6 @@ discard block |
||
1589 | 1586 | * Return new file path or false on error. |
1590 | 1587 | * |
1591 | 1588 | * @param resource $fp file pointer |
1592 | - * @param string $dir target dir path |
|
1593 | 1589 | * @param string $name file name |
1594 | 1590 | * @param array $stat file stat (required by some virtual fs) |
1595 | 1591 | * |
@@ -1680,7 +1676,7 @@ discard block |
||
1680 | 1676 | * @param string $path file path |
1681 | 1677 | * @param string $content new file content |
1682 | 1678 | * |
1683 | - * @return bool |
|
1679 | + * @return string|boolean |
|
1684 | 1680 | * |
1685 | 1681 | * @author Dmitry (dio) Levashov |
1686 | 1682 | **/ |
@@ -1742,7 +1738,7 @@ discard block |
||
1742 | 1738 | * |
1743 | 1739 | * @param string $path file/dir path |
1744 | 1740 | * |
1745 | - * @return bool |
|
1741 | + * @return boolean|null |
|
1746 | 1742 | * |
1747 | 1743 | * @author Dmitry (dio) Levashov |
1748 | 1744 | **/ |
@@ -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 | * @return bool|resource |
67 | 67 | */ |
68 | 68 | function imagecreatefrombmp($filename_or_stream_or_binary) |
@@ -100,6 +100,9 @@ discard block |
||
100 | 100 | return $bmp; |
101 | 101 | } |
102 | 102 | |
103 | + /** |
|
104 | + * @param string $str |
|
105 | + */ |
|
103 | 106 | public static function loadFromString($str) |
104 | 107 | { |
105 | 108 | //data scheme ããå¤ããã¼ã¸ã§ã³ãã対å¿ãã¦ãããããªã®ã§ php://memory ã使ã |
@@ -127,6 +130,9 @@ discard block |
||
127 | 130 | return $bmp; |
128 | 131 | } |
129 | 132 | |
133 | + /** |
|
134 | + * @param resource $stream |
|
135 | + */ |
|
130 | 136 | public static function loadFromStream($stream) |
131 | 137 | { |
132 | 138 | $buf = fread($stream, 14); //2+4+2+2+4 |