@@ -42,6 +42,9 @@ discard block |
||
42 | 42 | ); |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param string $action |
|
47 | + */ |
|
45 | 48 | public function Link($action = null) { |
46 | 49 | $link = Controller::join_links(Director::baseURL(), "CMSSecurity", $action); |
47 | 50 | // Give extensions the chance to modify by reference |
@@ -60,6 +63,9 @@ discard block |
||
60 | 63 | } |
61 | 64 | } |
62 | 65 | |
66 | + /** |
|
67 | + * @param string $title |
|
68 | + */ |
|
63 | 69 | public function getResponseController($title) { |
64 | 70 | // Use $this to prevent use of Page to render underlying templates |
65 | 71 | return $this; |
@@ -175,6 +181,9 @@ discard block |
||
175 | 181 | user_error('Passed invalid authentication method', E_USER_ERROR); |
176 | 182 | } |
177 | 183 | |
184 | + /** |
|
185 | + * @param string $action |
|
186 | + */ |
|
178 | 187 | public function getTemplatesFor($action) { |
179 | 188 | return array("CMSSecurity_{$action}", "CMSSecurity") |
180 | 189 | + parent::getTemplatesFor($action); |
@@ -129,6 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | /** |
131 | 131 | * Set the DataModel for this request. |
132 | + * @param DataModel $model |
|
132 | 133 | */ |
133 | 134 | public function setDataModel($model) { |
134 | 135 | $this->model = $model; |
@@ -246,6 +247,9 @@ discard block |
||
246 | 247 | return $this; |
247 | 248 | } |
248 | 249 | |
250 | + /** |
|
251 | + * @param SS_HTTPRequest $request |
|
252 | + */ |
|
249 | 253 | protected function findAction($request) { |
250 | 254 | $handlerClass = ($this->class) ? $this->class : get_class($this); |
251 | 255 | |
@@ -392,6 +396,7 @@ discard block |
||
392 | 396 | |
393 | 397 | /** |
394 | 398 | * Return the class that defines the given action, so that we know where to check allowed_actions. |
399 | + * @return string|null |
|
395 | 400 | */ |
396 | 401 | protected function definingClassForAction($actionOrigCasing) { |
397 | 402 | $action = strtolower($actionOrigCasing); |
@@ -500,6 +505,7 @@ discard block |
||
500 | 505 | * or {@link handleRequest()}, but in some based we want to set it manually. |
501 | 506 | * |
502 | 507 | * @param SS_HTTPRequest |
508 | + * @param SS_HTTPRequest $request |
|
503 | 509 | */ |
504 | 510 | public function setRequest($request) { |
505 | 511 | $this->request = $request; |
@@ -508,7 +514,6 @@ discard block |
||
508 | 514 | /** |
509 | 515 | * Returns a link to this controller. Overload with your own Link rules if they exist. |
510 | 516 | * |
511 | - * @param string $action Optional action (soft-supported via func_get_args) |
|
512 | 517 | * @return string |
513 | 518 | */ |
514 | 519 | public function Link() { |
@@ -142,6 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | /** |
144 | 144 | * Set the manifest to be used to look up test classes by helper functions |
145 | + * @param SS_ClassManifest $manifest |
|
145 | 146 | */ |
146 | 147 | public static function set_test_class_manifest($manifest) { |
147 | 148 | self::$test_class_manifest = $manifest; |
@@ -399,7 +400,7 @@ discard block |
||
399 | 400 | /** |
400 | 401 | * Get the ID of an object from the fixture. |
401 | 402 | * |
402 | - * @param $className The data class, as specified in your fixture file. Parent classes won't work |
|
403 | + * @param string $className The data class, as specified in your fixture file. Parent classes won't work |
|
403 | 404 | * @param $identifier The identifier string, as provided in your fixture file |
404 | 405 | * @return int |
405 | 406 | */ |
@@ -422,7 +423,7 @@ discard block |
||
422 | 423 | * Will collate all IDs form all fixtures if multiple fixtures are provided. |
423 | 424 | * |
424 | 425 | * @param string $className |
425 | - * @return array A map of fixture-identifier => object-id |
|
426 | + * @return A A map of fixture-identifier => object-id |
|
426 | 427 | */ |
427 | 428 | protected function allFixtureIDs($className) { |
428 | 429 | return $this->getFixtureFactory()->getIds($className); |
@@ -580,10 +581,10 @@ discard block |
||
580 | 581 | /** |
581 | 582 | * Assert that the matching email was sent since the last call to clearEmails() |
582 | 583 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
583 | - * @param $to |
|
584 | + * @param string $to |
|
584 | 585 | * @param $from |
585 | - * @param $subject |
|
586 | - * @param $content |
|
586 | + * @param string $subject |
|
587 | + * @param string $content |
|
587 | 588 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
588 | 589 | * 'customHeaders', 'htmlContent', inlineImages' |
589 | 590 | */ |
@@ -744,7 +745,7 @@ discard block |
||
744 | 745 | * @param string $expectedSQL |
745 | 746 | * @param string $actualSQL |
746 | 747 | * @param string $message |
747 | - * @param float $delta |
|
748 | + * @param integer $delta |
|
748 | 749 | * @param integer $maxDepth |
749 | 750 | * @param boolean $canonicalize |
750 | 751 | * @param boolean $ignoreCase |
@@ -982,9 +983,9 @@ discard block |
||
982 | 983 | /** |
983 | 984 | * Test against a theme. |
984 | 985 | * |
985 | - * @param $themeBaseDir string - themes directory |
|
986 | - * @param $theme string - theme name |
|
987 | - * @param $callback Closure |
|
986 | + * @param string $themeBaseDir string - themes directory |
|
987 | + * @param string $theme string - theme name |
|
988 | + * @param Closure $callback Closure |
|
988 | 989 | */ |
989 | 990 | protected function useTestTheme($themeBaseDir, $theme, $callback) { |
990 | 991 | Config::nest(); |
@@ -2173,6 +2173,7 @@ discard block |
||
2173 | 2173 | |
2174 | 2174 | /** |
2175 | 2175 | * @param String |
2176 | + * @param string $name |
|
2176 | 2177 | * @return Zend_Translate |
2177 | 2178 | */ |
2178 | 2179 | public static function get_translator($name) { |
@@ -2186,6 +2187,7 @@ discard block |
||
2186 | 2187 | * @param Zend_Translate Needs to implement {@link i18nTranslateAdapterInterface} |
2187 | 2188 | * @param String If left blank will override the default translator. |
2188 | 2189 | * @param Int |
2190 | + * @param string $name |
|
2189 | 2191 | */ |
2190 | 2192 | public static function register_translator($translator, $name, $priority = 10) { |
2191 | 2193 | if (!is_int($priority)) throw new InvalidArgumentException("register_translator expects an int priority"); |
@@ -2315,7 +2317,7 @@ discard block |
||
2315 | 2317 | * |
2316 | 2318 | * @see get_locale_name() |
2317 | 2319 | * |
2318 | - * @param mixed $code Language code |
|
2320 | + * @param string $code Language code |
|
2319 | 2321 | * @param boolean $native If true, the native name will be returned |
2320 | 2322 | * @return Name of the language |
2321 | 2323 | */ |
@@ -2472,6 +2474,7 @@ discard block |
||
2472 | 2474 | * |
2473 | 2475 | * Note: Does not check for {@link $allowed_locales}. |
2474 | 2476 | * |
2477 | + * @param string $locale |
|
2475 | 2478 | * @return boolean |
2476 | 2479 | */ |
2477 | 2480 | public static function validate_locale($locale) { |
@@ -282,6 +282,9 @@ discard block |
||
282 | 282 | return count($result) ? $result : null; |
283 | 283 | } |
284 | 284 | |
285 | + /** |
|
286 | + * @param string $content |
|
287 | + */ |
|
285 | 288 | public static function getLinksIn($content) { |
286 | 289 | return self::findByTagAndAttribute($content, array("a" => "href")); |
287 | 290 | } |
@@ -338,11 +341,17 @@ discard block |
||
338 | 341 | self::$modification_date = $timestamp; |
339 | 342 | } |
340 | 343 | |
344 | + /** |
|
345 | + * @param integer $timestamp |
|
346 | + */ |
|
341 | 347 | public static function register_modification_timestamp($timestamp) { |
342 | 348 | if($timestamp > self::$modification_date) |
343 | 349 | self::$modification_date = $timestamp; |
344 | 350 | } |
345 | 351 | |
352 | + /** |
|
353 | + * @param string $etag |
|
354 | + */ |
|
346 | 355 | public static function register_etag($etag) { |
347 | 356 | if (0 !== strpos($etag, '"')) { |
348 | 357 | $etag = sprintf('"%s"', $etag); |
@@ -501,7 +510,7 @@ discard block |
||
501 | 510 | } |
502 | 511 | |
503 | 512 | /** |
504 | - * @param SS_HTTPResponse|string $response |
|
513 | + * @param SS_HTTPResponse|null $response |
|
505 | 514 | * |
506 | 515 | * @return string|false |
507 | 516 | */ |
@@ -543,7 +552,6 @@ discard block |
||
543 | 552 | /** |
544 | 553 | * Combine vary strings |
545 | 554 | * |
546 | - * @param string $vary,... Each vary as a separate arg |
|
547 | 555 | * @return string |
548 | 556 | */ |
549 | 557 | protected static function combineVary($vary) |