@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Get a configuration accessor for this class. Short hand for Config::inst()->get($this->class, .....). |
58 | - * @return Config_ForClass|null |
|
58 | + * @return Config_ForClass |
|
59 | 59 | */ |
60 | 60 | static public function config() { |
61 | 61 | return Config::inst()->forClass(get_called_class()); |
@@ -125,8 +125,6 @@ discard block |
||
125 | 125 | * $list = DataList::create('SiteTree'); |
126 | 126 | * $list = SiteTree::get(); |
127 | 127 | * |
128 | - * @param string $class the class name |
|
129 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
130 | 128 | * @return static |
131 | 129 | */ |
132 | 130 | public static function create() { |
@@ -149,7 +147,6 @@ discard block |
||
149 | 147 | * way to access instance methods which don't rely on instance |
150 | 148 | * data (e.g. the custom SilverStripe static handling). |
151 | 149 | * |
152 | - * @param string $className Optional classname (if called on Object directly) |
|
153 | 150 | * @return static The singleton instance |
154 | 151 | */ |
155 | 152 | public static function singleton() { |
@@ -297,8 +294,6 @@ discard block |
||
297 | 294 | * Similar to {@link Object::create()}, except that classes are only overloaded if you set the $strong parameter to |
298 | 295 | * TRUE when using {@link Object::useCustomClass()} |
299 | 296 | * |
300 | - * @param string $class the class name |
|
301 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
302 | 297 | * @return static |
303 | 298 | */ |
304 | 299 | public static function strong_create() { |
@@ -350,8 +345,8 @@ discard block |
||
350 | 345 | * without any inheritance, merging or parent lookup if it doesn't exist on the given class. |
351 | 346 | * |
352 | 347 | * @static |
353 | - * @param $class - The class to get the static from |
|
354 | - * @param $name - The property to get from the class |
|
348 | + * @param string $class - The class to get the static from |
|
349 | + * @param string $name - The property to get from the class |
|
355 | 350 | * @param null $default - The value to return if property doesn't exist on class |
356 | 351 | * @return any - The value of the static property $name on class $class, or $default if that property is not |
357 | 352 | * defined |
@@ -823,6 +818,7 @@ discard block |
||
823 | 818 | |
824 | 819 | /** |
825 | 820 | * @see Object::get_static() |
821 | + * @param string $name |
|
826 | 822 | */ |
827 | 823 | public function stat($name, $uncached = false) { |
828 | 824 | return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::FIRST_SET); |
@@ -830,6 +826,8 @@ discard block |
||
830 | 826 | |
831 | 827 | /** |
832 | 828 | * @see Object::set_static() |
829 | + * @param string $name |
|
830 | + * @param string $value |
|
833 | 831 | */ |
834 | 832 | public function set_stat($name, $value) { |
835 | 833 | Config::inst()->update(($this->class ? $this->class : get_class($this)), $name, $value); |
@@ -837,6 +835,7 @@ discard block |
||
837 | 835 | |
838 | 836 | /** |
839 | 837 | * @see Object::uninherited_static() |
838 | + * @param string $name |
|
840 | 839 | */ |
841 | 840 | public function uninherited($name) { |
842 | 841 | return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::UNINHERITED); |
@@ -887,7 +886,7 @@ discard block |
||
887 | 886 | * all results into an array |
888 | 887 | * |
889 | 888 | * @param string $method the method name to call |
890 | - * @param mixed $argument a single argument to pass |
|
889 | + * @param string $argument a single argument to pass |
|
891 | 890 | * @return mixed |
892 | 891 | * @todo integrate inheritance rules |
893 | 892 | */ |
@@ -910,7 +909,6 @@ discard block |
||
910 | 909 | * The extension methods are defined during {@link __construct()} in {@link defineMethods()}. |
911 | 910 | * |
912 | 911 | * @param string $method the name of the method to call on each extension |
913 | - * @param mixed $a1,... up to 7 arguments to be passed to the method |
|
914 | 912 | * @return array |
915 | 913 | */ |
916 | 914 | public function extend($method, &$a1=null, &$a2=null, &$a3=null, &$a4=null, &$a5=null, &$a6=null, &$a7=null) { |
@@ -67,6 +67,9 @@ discard block |
||
67 | 67 | $this->error = (bool)$error; |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @param boolean $suppression |
|
72 | + */ |
|
70 | 73 | public function setSuppression($suppression) { |
71 | 74 | $this->suppression = (bool)$suppression; |
72 | 75 | if ($this->handleFatalErrors) ini_set('display_errors', !$suppression); |
@@ -76,7 +79,7 @@ discard block |
||
76 | 79 | * Add this callback to the chain of callbacks to call along with the state |
77 | 80 | * that $error must be in this point in the chain for the callback to be called |
78 | 81 | * |
79 | - * @param $callback - The callback to call |
|
82 | + * @param callable $callback - The callback to call |
|
80 | 83 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
81 | 84 | * @return $this |
82 | 85 | */ |
@@ -36,6 +36,9 @@ discard block |
||
36 | 36 | */ |
37 | 37 | protected $token = null; |
38 | 38 | |
39 | + /** |
|
40 | + * @param string $token |
|
41 | + */ |
|
39 | 42 | protected function pathForToken($token) { |
40 | 43 | return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token); |
41 | 44 | } |
@@ -235,7 +238,7 @@ discard block |
||
235 | 238 | * Given a list of token names, suppress all tokens that have not been validated, and |
236 | 239 | * return the non-validated token with the highest priority |
237 | 240 | * |
238 | - * @param array $keys List of token keys in ascending priority (low to high) |
|
241 | + * @param string[] $keys List of token keys in ascending priority (low to high) |
|
239 | 242 | * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority |
240 | 243 | */ |
241 | 244 | public static function prepare_tokens($keys) { |
@@ -5,7 +5,7 @@ |
||
5 | 5 | * @package framework |
6 | 6 | * @subpackage core |
7 | 7 | * |
8 | - * @param $base The base path to use for determining the temporary path |
|
8 | + * @param string $base The base path to use for determining the temporary path |
|
9 | 9 | * @return string Path to temp |
10 | 10 | */ |
11 | 11 | function getTempFolder($base = null) { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * |
115 | 115 | * @param unknown_type $returnVal |
116 | 116 | * @param unknown_type $ignoreAjax |
117 | - * @return unknown |
|
117 | + * @return string|null |
|
118 | 118 | */ |
119 | 119 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) { |
120 | 120 | $plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * shown |
132 | 132 | * |
133 | 133 | * @param Object $item |
134 | - * @param boolean $showArg |
|
134 | + * @param boolean $showArgs |
|
135 | 135 | * @param Int $argCharLimit |
136 | 136 | * @return String |
137 | 137 | */ |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | * |
212 | 212 | * @todo Mix in custom column mappings |
213 | 213 | * |
214 | - * @return array |
|
214 | + * @return string |
|
215 | 215 | **/ |
216 | 216 | public function getImportSpec() { |
217 | 217 | $spec = array(); |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * so this is mainly a customization method. |
238 | 238 | * |
239 | 239 | * @param mixed $val |
240 | - * @param string $field Name of the field as specified in the array-values for {@link self::$columnMap}. |
|
240 | + * @param string $fieldName Name of the field as specified in the array-values for {@link self::$columnMap}. |
|
241 | 241 | * @return boolean |
242 | 242 | */ |
243 | 243 | protected function isNullValue($val, $fieldName = null) { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | |
358 | 358 | /** |
359 | 359 | * @param $obj DataObject |
360 | - * @param $message string |
|
360 | + * @param string $message string |
|
361 | 361 | */ |
362 | 362 | public function addCreated($obj, $message = null) { |
363 | 363 | $this->created[] = $this->lastChange = array( |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | |
371 | 371 | /** |
372 | 372 | * @param $obj DataObject |
373 | - * @param $message string |
|
373 | + * @param string $message string |
|
374 | 374 | */ |
375 | 375 | public function addUpdated($obj, $message = null) { |
376 | 376 | $this->updated[] = $this->lastChange = array( |
@@ -93,7 +93,7 @@ |
||
93 | 93 | * @param string $path Path to large file to split |
94 | 94 | * @param int $lines Number of lines per file |
95 | 95 | * |
96 | - * @return array List of file paths |
|
96 | + * @return string[] List of file paths |
|
97 | 97 | */ |
98 | 98 | protected function splitFile($path, $lines = null) { |
99 | 99 | $previous = ini_get('auto_detect_line_endings'); |
@@ -101,7 +101,7 @@ |
||
101 | 101 | * |
102 | 102 | * You can use the object returned in a foreach loop to extract the data. |
103 | 103 | * |
104 | - * @param $filename The name of the file. If relative, it will be relative to the site's base dir |
|
104 | + * @param string $filename The name of the file. If relative, it will be relative to the site's base dir |
|
105 | 105 | * @param $delimiter The character for seperating columns |
106 | 106 | * @param $enclosure The character for quoting or enclosing columns |
107 | 107 | */ |
@@ -142,6 +142,8 @@ |
||
142 | 142 | |
143 | 143 | /** |
144 | 144 | * @deprecated 4.0.0:5.0.0 Use renderInfo() instead |
145 | + * @param string $title |
|
146 | + * @param string|false $subtitle |
|
145 | 147 | */ |
146 | 148 | public function writeInfo($title, $subtitle, $description=false) { |
147 | 149 | Deprecation::notice('4.0', 'Use renderInfo() instead'); |