@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace SilverStripe\ORM\Queries; |
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\Injector\Injector; |
| 6 | -use SilverStripe\Dev\Deprecation; |
|
| 7 | 6 | use SilverStripe\ORM\DB; |
| 8 | 7 | use InvalidArgumentException; |
| 9 | 8 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | /** |
| 67 | 67 | * Construct a new SQLSelect. |
| 68 | 68 | * |
| 69 | - * @param array|string $select An array of SELECT fields. |
|
| 69 | + * @param string $select An array of SELECT fields. |
|
| 70 | 70 | * @param array|string $from An array of FROM clauses. The first one should be just the table name. |
| 71 | 71 | * Each should be ANSI quoted. |
| 72 | 72 | * @param array $where An array of WHERE clauses. |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | * |
| 379 | 379 | * @param string $value |
| 380 | 380 | * @param string $defaultDirection |
| 381 | - * @return array A two element array: array($column, $direction) |
|
| 381 | + * @return string[] A two element array: array($column, $direction) |
|
| 382 | 382 | */ |
| 383 | 383 | private function getDirectionFromString($value, $defaultDirection = null) |
| 384 | 384 | { |
@@ -480,7 +480,6 @@ discard block |
||
| 480 | 480 | * @see SQLSelect::addWhere() for syntax examples |
| 481 | 481 | * |
| 482 | 482 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 483 | - * @param mixed $having,... Unlimited additional predicates |
|
| 484 | 483 | * @return $this Self reference |
| 485 | 484 | */ |
| 486 | 485 | public function setHaving($having) |
@@ -496,7 +495,6 @@ discard block |
||
| 496 | 495 | * @see SQLSelect::addWhere() for syntax examples |
| 497 | 496 | * |
| 498 | 497 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
| 499 | - * @param mixed $having,... Unlimited additional predicates |
|
| 500 | 498 | * @return $this Self reference |
| 501 | 499 | */ |
| 502 | 500 | public function addHaving($having) |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | * Check if this file can be modified |
| 424 | 424 | * |
| 425 | 425 | * @param Member $member |
| 426 | - * @return boolean |
|
| 426 | + * @return boolean|string |
|
| 427 | 427 | */ |
| 428 | 428 | public function canEdit($member = null) |
| 429 | 429 | { |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | * |
| 445 | 445 | * @param Member $member |
| 446 | 446 | * @param array $context |
| 447 | - * @return boolean |
|
| 447 | + * @return boolean|string |
|
| 448 | 448 | */ |
| 449 | 449 | public function canCreate($member = null, $context = array()) |
| 450 | 450 | { |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | * Check if this file can be deleted |
| 465 | 465 | * |
| 466 | 466 | * @param Member $member |
| 467 | - * @return boolean |
|
| 467 | + * @return boolean|string |
|
| 468 | 468 | */ |
| 469 | 469 | public function canDelete($member = null) |
| 470 | 470 | { |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | * |
| 698 | 698 | * @param string $condition The PHP condition to be evaluated. The page will be called $item |
| 699 | 699 | * @param array $collator An array, passed by reference, to collect all of the matching descendants. |
| 700 | - * @return true|null |
|
| 700 | + * @return boolean|null |
|
| 701 | 701 | */ |
| 702 | 702 | public function collateDescendants($condition, &$collator) |
| 703 | 703 | { |
@@ -1089,6 +1089,7 @@ discard block |
||
| 1089 | 1089 | * |
| 1090 | 1090 | * @param String File extension, without dot prefix. Use an asterisk ('*') |
| 1091 | 1091 | * to specify a generic fallback if no mapping is found for an extension. |
| 1092 | + * @param string $ext |
|
| 1092 | 1093 | * @return String Classname for a subclass of {@link File} |
| 1093 | 1094 | */ |
| 1094 | 1095 | public static function get_class_for_file_extension($ext) |
@@ -1248,7 +1249,6 @@ discard block |
||
| 1248 | 1249 | * Note that the result will not have a leading slash, and should not be used |
| 1249 | 1250 | * with local file paths. |
| 1250 | 1251 | * |
| 1251 | - * @param string $part,... Parts |
|
| 1252 | 1252 | * @return string |
| 1253 | 1253 | */ |
| 1254 | 1254 | public static function join_paths($part = null) |
@@ -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) |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Control; |
| 4 | 4 | |
| 5 | -use SilverStripe\Core\ClassInfo; |
|
| 6 | 5 | use SilverStripe\Core\Object; |
| 7 | 6 | use SilverStripe\Core\Injector\Injector; |
| 8 | 7 | use SilverStripe\Dev\Debug; |
@@ -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 |