@@ -50,14 +50,7 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * Gets a field from this object. |
| 52 | 52 | * |
| 53 | - * @param string $field |
|
| 54 | - * |
|
| 55 | - * If the value is an object but not an instance of |
|
| 56 | - * ViewableData, it will be converted recursively to an |
|
| 57 | - * ArrayData. |
|
| 58 | - * |
|
| 59 | - * If the value is an associative array, it will likewise be |
|
| 60 | - * converted recursively to an ArrayData. |
|
| 53 | + * @param string $f |
|
| 61 | 54 | */ |
| 62 | 55 | public function getField($f) { |
| 63 | 56 | $value = $this->array[$f]; |
@@ -83,6 +76,7 @@ discard block |
||
| 83 | 76 | * Check array to see if field isset |
| 84 | 77 | * |
| 85 | 78 | * @param string Field Key |
| 79 | + * @param string $f |
|
| 86 | 80 | * @return bool |
| 87 | 81 | */ |
| 88 | 82 | public function hasField($f) { |
@@ -27,6 +27,9 @@ |
||
| 27 | 27 | return $this->can(__FUNCTION__, $member, $context); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | + /** |
|
| 31 | + * @param string $perm |
|
| 32 | + */ |
|
| 30 | 33 | public function can($perm, $member = null, $context = array()) { |
| 31 | 34 | $perms = [ |
| 32 | 35 | "PERM_{$perm}", |
@@ -83,7 +83,6 @@ discard block |
||
| 83 | 83 | /** |
| 84 | 84 | * Adds a file to the concatenation/compression process. |
| 85 | 85 | * |
| 86 | - * @param String $path Path to the file to include in the compressed package/output. |
|
| 87 | 86 | */ |
| 88 | 87 | public function &addFile($file) { |
| 89 | 88 | $this->files .= ($this->files ? "," : "") . $file; |
@@ -256,7 +255,7 @@ discard block |
||
| 256 | 255 | /** |
| 257 | 256 | * Renders a script tag that loads the TinyMCE script. |
| 258 | 257 | * |
| 259 | - * @param Array $settings Name/value array with settings for the script tag. |
|
| 258 | + * @param Array $tagSettings Name/value array with settings for the script tag. |
|
| 260 | 259 | * @param Bool $return The script tag is return instead of being output if true |
| 261 | 260 | * @return String the tag is returned if $return is true |
| 262 | 261 | */ |
@@ -139,6 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * Set the manifest to be used to look up test classes by helper functions |
| 142 | + * @param SS_ClassManifest $manifest |
|
| 142 | 143 | */ |
| 143 | 144 | public static function set_test_class_manifest($manifest) { |
| 144 | 145 | self::$test_class_manifest = $manifest; |
@@ -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); |
@@ -582,10 +583,10 @@ discard block |
||
| 582 | 583 | /** |
| 583 | 584 | * Assert that the matching email was sent since the last call to clearEmails() |
| 584 | 585 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
| 585 | - * @param $to |
|
| 586 | + * @param string $to |
|
| 586 | 587 | * @param $from |
| 587 | - * @param $subject |
|
| 588 | - * @param $content |
|
| 588 | + * @param string $subject |
|
| 589 | + * @param string $content |
|
| 589 | 590 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
| 590 | 591 | * 'customHeaders', 'htmlContent', inlineImages' |
| 591 | 592 | */ |
@@ -753,7 +754,7 @@ discard block |
||
| 753 | 754 | * @param string $expectedSQL |
| 754 | 755 | * @param string $actualSQL |
| 755 | 756 | * @param string $message |
| 756 | - * @param float $delta |
|
| 757 | + * @param integer $delta |
|
| 757 | 758 | * @param integer $maxDepth |
| 758 | 759 | * @param boolean $canonicalize |
| 759 | 760 | * @param boolean $ignoreCase |
@@ -1039,9 +1040,9 @@ discard block |
||
| 1039 | 1040 | /** |
| 1040 | 1041 | * Test against a theme. |
| 1041 | 1042 | * |
| 1042 | - * @param $themeBaseDir string - themes directory |
|
| 1043 | - * @param $theme string - theme name |
|
| 1044 | - * @param $callback Closure |
|
| 1043 | + * @param string $themeBaseDir string - themes directory |
|
| 1044 | + * @param string $theme string - theme name |
|
| 1045 | + * @param Closure $callback Closure |
|
| 1045 | 1046 | */ |
| 1046 | 1047 | protected function useTestTheme($themeBaseDir, $theme, $callback) { |
| 1047 | 1048 | Config::nest(); |
@@ -23,8 +23,6 @@ |
||
| 23 | 23 | * $list = DataList::create('SiteTree'); |
| 24 | 24 | * $list = SiteTree::get(); |
| 25 | 25 | * |
| 26 | - * @param string $class the class name |
|
| 27 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
| 28 | 26 | * @return static |
| 29 | 27 | */ |
| 30 | 28 | public static function create() { |
@@ -65,6 +65,7 @@ discard block |
||
| 65 | 65 | * while automatically busting this cache every time the file is changed. |
| 66 | 66 | * |
| 67 | 67 | * @param bool |
| 68 | + * @param boolean $var |
|
| 68 | 69 | */ |
| 69 | 70 | public static function set_suffix_requirements($var) { |
| 70 | 71 | self::backend()->setSuffixRequirements($var); |
@@ -336,7 +337,7 @@ discard block |
||
| 336 | 337 | * </code> |
| 337 | 338 | * |
| 338 | 339 | * @param string $combinedFileName Filename of the combined file relative to docroot |
| 339 | - * @param array $files Array of filenames relative to docroot |
|
| 340 | + * @param string[] $files Array of filenames relative to docroot |
|
| 340 | 341 | * @param string $media |
| 341 | 342 | * |
| 342 | 343 | * @return bool|void |
@@ -761,6 +762,7 @@ discard block |
||
| 761 | 762 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
| 762 | 763 | * |
| 763 | 764 | * @param bool |
| 765 | + * @param boolean $var |
|
| 764 | 766 | * @return $this |
| 765 | 767 | */ |
| 766 | 768 | public function setForceJSToBottom($var) { |
@@ -117,6 +117,9 @@ |
||
| 117 | 117 | Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ModelAdmin.js'); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | + /** |
|
| 121 | + * @param string $action |
|
| 122 | + */ |
|
| 120 | 123 | public function Link($action = null) { |
| 121 | 124 | if(!$action) $action = $this->sanitiseClassName($this->modelClass); |
| 122 | 125 | return parent::Link($action); |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | * Get the current value of an option |
| 139 | 139 | * |
| 140 | 140 | * @param string $key The key of the option to get |
| 141 | - * @return mixed The value of the specified option |
|
| 141 | + * @return string The value of the specified option |
|
| 142 | 142 | */ |
| 143 | 143 | abstract public function getOption($key); |
| 144 | 144 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * Given a TinyMCE pattern (close to unix glob style), create a regex that does the match |
| 41 | 41 | * |
| 42 | - * @param $str - The TinyMCE pattern |
|
| 42 | + * @param string|null $str - The TinyMCE pattern |
|
| 43 | 43 | * @return string - The equivalent regex |
| 44 | 44 | */ |
| 45 | 45 | protected function patternToRegex($str) { |
@@ -180,6 +180,7 @@ discard block |
||
| 180 | 180 | /** |
| 181 | 181 | * Given an attribute name, return the rule structure for that attribute |
| 182 | 182 | * @param string $name - The attribute name |
| 183 | + * @param stdClass $elementRule |
|
| 183 | 184 | * @return stdClass - The attribute rule |
| 184 | 185 | */ |
| 185 | 186 | protected function getRuleForAttribute($elementRule, $name) { |