@@ -41,6 +41,9 @@ |
||
| 41 | 41 | ] |
| 42 | 42 | ); |
| 43 | 43 | |
| 44 | + /** |
|
| 45 | + * @param string $root |
|
| 46 | + */ |
|
| 44 | 47 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) |
| 45 | 48 | { |
| 46 | 49 | // Get root path |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * Find the given folder or create it as a database record |
| 63 | 63 | * |
| 64 | 64 | * @param string $folderPath Directory path relative to assets root |
| 65 | - * @return Folder|null |
|
| 65 | + * @return null|\SilverStripe\ORM\DataObject |
|
| 66 | 66 | */ |
| 67 | 67 | public static function find_or_make($folderPath) |
| 68 | 68 | { |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | * Check if this image has previously crashed GD when attempting to open it - if it's opened |
| 199 | 199 | * successfully, the manipulation's cache key is removed. |
| 200 | 200 | * |
| 201 | - * @param string $arg,... Any number of args that identify this image |
|
| 201 | + * @param string $arg |
|
| 202 | 202 | * @return bool True if failed |
| 203 | 203 | */ |
| 204 | 204 | public function failedResample($arg = null) |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | /** |
| 211 | 211 | * Mark a file as failed |
| 212 | 212 | * |
| 213 | - * @param string $arg,... Any number of args that identify this image |
|
| 213 | + * @param string $arg |
|
| 214 | 214 | */ |
| 215 | 215 | protected function markFailed($arg = null) |
| 216 | 216 | { |
@@ -221,7 +221,6 @@ discard block |
||
| 221 | 221 | /** |
| 222 | 222 | * Mark a file as succeeded |
| 223 | 223 | * |
| 224 | - * @param string $arg,... Any number of args that identify this image |
|
| 225 | 224 | */ |
| 226 | 225 | protected function markSucceeded($arg = null) |
| 227 | 226 | { |
@@ -378,7 +377,7 @@ discard block |
||
| 378 | 377 | * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu) |
| 379 | 378 | * |
| 380 | 379 | * @param float $angle Angle in degrees |
| 381 | - * @return static |
|
| 380 | + * @return null|resource |
|
| 382 | 381 | */ |
| 383 | 382 | public function rotatePixelByPixel($angle) |
| 384 | 383 | { |
@@ -804,7 +804,6 @@ |
||
| 804 | 804 | * Name a variant based on a format with arbitrary parameters |
| 805 | 805 | * |
| 806 | 806 | * @param string $format The format name. |
| 807 | - * @param mixed $arg,... Additional arguments |
|
| 808 | 807 | * @return string |
| 809 | 808 | * @throws InvalidArgumentException |
| 810 | 809 | */ |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * Set a different instance than {@link Upload_Validator} |
| 129 | 129 | * for this upload session. |
| 130 | 130 | * |
| 131 | - * @param object $validator |
|
| 131 | + * @param Upload_Validator $validator |
|
| 132 | 132 | */ |
| 133 | 133 | public function setValidator($validator) |
| 134 | 134 | { |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | /** |
| 394 | 394 | * Determines wether previous operations caused an error. |
| 395 | 395 | * |
| 396 | - * @return boolean |
|
| 396 | + * @return integer |
|
| 397 | 397 | */ |
| 398 | 398 | public function isError() |
| 399 | 399 | { |
@@ -147,6 +147,7 @@ discard block |
||
| 147 | 147 | * {@inheritdoc} |
| 148 | 148 | * |
| 149 | 149 | * Also set the URLParams |
| 150 | + * @param HTTPRequest $request |
|
| 150 | 151 | */ |
| 151 | 152 | public function setRequest($request) |
| 152 | 153 | { |
@@ -523,7 +524,7 @@ discard block |
||
| 523 | 524 | * |
| 524 | 525 | * @param array $params |
| 525 | 526 | * |
| 526 | - * @return string |
|
| 527 | + * @return DBHTMLText |
|
| 527 | 528 | */ |
| 528 | 529 | public function render($params = null) |
| 529 | 530 | { |
@@ -702,7 +703,7 @@ discard block |
||
| 702 | 703 | * Tests whether a redirection has been requested. If redirect() has been called, it will return |
| 703 | 704 | * the URL redirected to. Otherwise, it will return null. |
| 704 | 705 | * |
| 705 | - * @return null|string |
|
| 706 | + * @return boolean |
|
| 706 | 707 | */ |
| 707 | 708 | public function redirectedTo() |
| 708 | 709 | { |
@@ -736,7 +737,6 @@ discard block |
||
| 736 | 737 | * |
| 737 | 738 | * Caution: All parameters are expected to be URI-encoded already. |
| 738 | 739 | * |
| 739 | - * @param string|array $arg,.. One or more link segments, or list of link segments as an array |
|
| 740 | 740 | * @return string |
| 741 | 741 | */ |
| 742 | 742 | public static function join_links($arg = null) |
@@ -151,7 +151,7 @@ |
||
| 151 | 151 | * @see http://uk3.php.net/manual/en/function.setcookie.php |
| 152 | 152 | * |
| 153 | 153 | * @param string $name The name of the cookie |
| 154 | - * @param string|array $value The value for the cookie to hold |
|
| 154 | + * @param false|string $value The value for the cookie to hold |
|
| 155 | 155 | * @param int $expiry The number of days until expiry |
| 156 | 156 | * @param string $path The path to save the cookie on (falls back to site base) |
| 157 | 157 | * @param string $domain The domain to make the cookie available on |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment |
| 556 | 556 | * variable isn't set. |
| 557 | 557 | * |
| 558 | - * @return bool|string |
|
| 558 | + * @return string|false |
|
| 559 | 559 | */ |
| 560 | 560 | public static function protocolAndHost() |
| 561 | 561 | { |
@@ -912,7 +912,7 @@ discard block |
||
| 912 | 912 | /** |
| 913 | 913 | * Returns true if the given file exists. Filename should be relative to the site root. |
| 914 | 914 | * |
| 915 | - * @param $file |
|
| 915 | + * @param string $file |
|
| 916 | 916 | * |
| 917 | 917 | * @return bool |
| 918 | 918 | */ |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
| 1146 | 1146 | * {@link Director::isLive()}. |
| 1147 | 1147 | * |
| 1148 | - * @return bool|string |
|
| 1148 | + * @return string|false |
|
| 1149 | 1149 | */ |
| 1150 | 1150 | public static function get_environment_type() |
| 1151 | 1151 | { |
@@ -458,9 +458,9 @@ |
||
| 458 | 458 | * it's only advisable to send small files through this method. |
| 459 | 459 | * |
| 460 | 460 | * @static |
| 461 | - * @param $fileData |
|
| 461 | + * @param string $fileData |
|
| 462 | 462 | * @param $fileName |
| 463 | - * @param null $mimeType |
|
| 463 | + * @param string $mimeType |
|
| 464 | 464 | * @return HTTPResponse |
| 465 | 465 | */ |
| 466 | 466 | public static function send_file($fileData, $fileName, $mimeType = null) |