@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use DOMAttr; |
6 | 6 | use DOMElement; |
7 | -use DOMNode; |
|
8 | 7 | use SilverStripe\Core\Injector\Injectable; |
9 | 8 | use SilverStripe\View\Parsers\HTMLValue; |
10 | 9 | use stdClass; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | /** |
53 | 53 | * Given a TinyMCE pattern (close to unix glob style), create a regex that does the match |
54 | 54 | * |
55 | - * @param $str - The TinyMCE pattern |
|
55 | + * @param string|null $str - The TinyMCE pattern |
|
56 | 56 | * @return string - The equivalent regex |
57 | 57 | */ |
58 | 58 | protected function patternToRegex($str) |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\Config\Config; |
6 | 6 | use SilverStripe\Core\Convert; |
7 | -use SilverStripe\Core\Injector\Injector; |
|
8 | 7 | use SilverStripe\Forms\TextareaField; |
9 | 8 | use SilverStripe\Forms\NullableField; |
10 | 9 | use SilverStripe\Forms\TextField; |
@@ -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 |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | * |
381 | 381 | * @param string $value |
382 | 382 | * @param string $defaultDirection |
383 | - * @return array A two element array: array($column, $direction) |
|
383 | + * @return string[] A two element array: array($column, $direction) |
|
384 | 384 | */ |
385 | 385 | private function getDirectionFromString($value, $defaultDirection = null) |
386 | 386 | { |
@@ -482,7 +482,6 @@ discard block |
||
482 | 482 | * @see SQLSelect::addWhere() for syntax examples |
483 | 483 | * |
484 | 484 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
485 | - * @param mixed $having,... Unlimited additional predicates |
|
486 | 485 | * @return $this Self reference |
487 | 486 | */ |
488 | 487 | public function setHaving($having) |
@@ -498,7 +497,6 @@ discard block |
||
498 | 497 | * @see SQLSelect::addWhere() for syntax examples |
499 | 498 | * |
500 | 499 | * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries |
501 | - * @param mixed $having,... Unlimited additional predicates |
|
502 | 500 | * @return $this Self reference |
503 | 501 | */ |
504 | 502 | public function addHaving($having) |
@@ -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) |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use SilverStripe\Dev\Debug; |
7 | 7 | use SilverStripe\ORM\FieldType\DBHTMLText; |
8 | 8 | use SilverStripe\Security\BasicAuth; |
9 | -use SilverStripe\Security\Member; |
|
10 | 9 | use SilverStripe\Security\Security; |
11 | 10 | use SilverStripe\View\SSViewer; |
12 | 11 | use SilverStripe\View\TemplateGlobalProvider; |
@@ -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 |
@@ -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) |
@@ -296,7 +296,7 @@ |
||
296 | 296 | * |
297 | 297 | * Must not raise HTTPResponse_Exceptions - instead it should return |
298 | 298 | * |
299 | - * @param $request |
|
299 | + * @param HTTPRequest $request |
|
300 | 300 | * @param $action |
301 | 301 | * @return HTTPResponse |
302 | 302 | */ |
@@ -248,6 +248,7 @@ |
||
248 | 248 | * via the standard template inclusion process. |
249 | 249 | * |
250 | 250 | * @param string |
251 | + * @param string|null $template |
|
251 | 252 | */ |
252 | 253 | public function setTemplate($template) |
253 | 254 | { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | /** |
107 | 107 | * Get value of display_errors ini value |
108 | 108 | * |
109 | - * @return mixed |
|
109 | + * @return string |
|
110 | 110 | */ |
111 | 111 | protected function getDisplayErrors() |
112 | 112 | { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * Add this callback to the chain of callbacks to call along with the state |
118 | 118 | * that $error must be in this point in the chain for the callback to be called |
119 | 119 | * |
120 | - * @param $callback - The callback to call |
|
120 | + * @param callable $callback - The callback to call |
|
121 | 121 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
122 | 122 | * @return $this |
123 | 123 | */ |