@@ -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 | **/ |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * |
62 | 62 | * 以下のものは非対応 |
63 | 63 | * BITMAPV4HEADER と BITMAPV5HEADER に含まれる色空間に関する様々な機能 |
64 | - * @param $filename_or_stream_or_binary |
|
64 | + * @param string $filename_or_stream_or_binary |
|
65 | 65 | * @return bool|resource |
66 | 66 | */ |
67 | 67 | function imagecreatefrombmp($filename_or_stream_or_binary) |
@@ -99,6 +99,9 @@ discard block |
||
99 | 99 | return $bmp; |
100 | 100 | } |
101 | 101 | |
102 | + /** |
|
103 | + * @param string $str |
|
104 | + */ |
|
102 | 105 | public static function loadFromString($str) |
103 | 106 | { |
104 | 107 | //data scheme より古いバージョンから対応しているようなので php://memory を使う |
@@ -126,6 +129,9 @@ discard block |
||
126 | 129 | return $bmp; |
127 | 130 | } |
128 | 131 | |
132 | + /** |
|
133 | + * @param resource $stream |
|
134 | + */ |
|
129 | 135 | public static function loadFromStream($stream) |
130 | 136 | { |
131 | 137 | $buf = fread($stream, 14); //2+4+2+2+4 |