@@ -111,6 +111,8 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | 113 | * Override the function that constructs the result arrays to also prepare a 'php' item in the array |
| 114 | + * @param string $matchrule |
|
| 115 | + * @param string $name |
|
| 114 | 116 | */ |
| 115 | 117 | function construct($matchrule, $name, $arguments = null) { |
| 116 | 118 | $res = parent::construct($matchrule, $name, $arguments); |
@@ -172,9 +174,9 @@ discard block |
||
| 172 | 174 | |
| 173 | 175 | /** |
| 174 | 176 | * Ensures that the arguments to addOpenBlock and addClosedBlock are valid |
| 175 | - * @param $name |
|
| 176 | - * @param $callable |
|
| 177 | - * @param $type |
|
| 177 | + * @param string $name |
|
| 178 | + * @param callable $callable |
|
| 179 | + * @param string $type |
|
| 178 | 180 | * @throws InvalidArgumentException |
| 179 | 181 | */ |
| 180 | 182 | protected function validateExtensionBlock($name, $callable, $type) { |
@@ -737,6 +739,7 @@ discard block |
||
| 737 | 739 | * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to |
| 738 | 740 | * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj) |
| 739 | 741 | * depending on the context the lookup is used in. |
| 742 | + * @param string $method |
|
| 740 | 743 | */ |
| 741 | 744 | function Lookup_AddLookupStep(&$res, $sub, $method) { |
| 742 | 745 | $res['LookupSteps'][] = $sub; |
@@ -4691,8 +4694,8 @@ discard block |
||
| 4691 | 4694 | * Compiles some passed template source code into the php code that will execute as per the template source. |
| 4692 | 4695 | * |
| 4693 | 4696 | * @throws SSTemplateParseException |
| 4694 | - * @param $string The source of the template |
|
| 4695 | - * @param string $templateName The name of the template, normally the filename the template source was loaded from |
|
| 4697 | + * @param string $string The source of the template |
|
| 4698 | + * @param string string The name of the template, normally the filename the template source was loaded from |
|
| 4696 | 4699 | * @param bool $includeDebuggingComments True is debugging comments should be included in the output |
| 4697 | 4700 | * @param bool $topTemplate True if this is a top template, false if it's just a template |
| 4698 | 4701 | * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source |
@@ -4732,6 +4735,7 @@ discard block |
||
| 4732 | 4735 | |
| 4733 | 4736 | /** |
| 4734 | 4737 | * @param string $code |
| 4738 | + * @param string $templateName |
|
| 4735 | 4739 | * @return string $code |
| 4736 | 4740 | */ |
| 4737 | 4741 | protected function includeDebuggingComments($code, $templateName) { |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /** |
| 101 | 101 | * Get value of display_errors ini value |
| 102 | 102 | * |
| 103 | - * @return mixed |
|
| 103 | + * @return string |
|
| 104 | 104 | */ |
| 105 | 105 | protected function getDisplayErrors() { |
| 106 | 106 | return ini_get('display_errors'); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * Add this callback to the chain of callbacks to call along with the state |
| 111 | 111 | * that $error must be in this point in the chain for the callback to be called |
| 112 | 112 | * |
| 113 | - * @param $callback - The callback to call |
|
| 113 | + * @param callable $callback - The callback to call |
|
| 114 | 114 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
| 115 | 115 | * @return $this |
| 116 | 116 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | /** |
| 25 | 25 | * Modify method visibility to public for testing |
| 26 | 26 | * |
| 27 | - * @param mixed $errors |
|
| 27 | + * @param string $errors |
|
| 28 | 28 | */ |
| 29 | 29 | public function setDisplayErrors($errors) |
| 30 | 30 | { |
@@ -33,6 +33,10 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // Change function visibility to be testable directly |
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * @param string $memstring |
|
| 39 | + */ |
|
| 36 | 40 | public function translateMemstring($memstring) { |
| 37 | 41 | return parent::translateMemstring($memstring); |
| 38 | 42 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | * |
| 192 | 192 | * TODO: Pass $response object to ->outputToBrowser() to loosen dependence on global state for easier testing/prototyping so dev can inject custom SS_HTTPResponse instance. |
| 193 | 193 | * |
| 194 | - * @return HTMLText |
|
| 194 | + * @return DBField |
|
| 195 | 195 | */ |
| 196 | 196 | public function outputToBrowser() { |
| 197 | 197 | $prevState = Config::inst()->get('SSViewer', 'source_file_comments'); |
@@ -222,6 +222,7 @@ discard block |
||
| 222 | 222 | * via the standard template inclusion process. |
| 223 | 223 | * |
| 224 | 224 | * @param string |
| 225 | + * @param string $template |
|
| 225 | 226 | */ |
| 226 | 227 | public function setTemplate($template) { |
| 227 | 228 | $this->template = $template; |
@@ -318,6 +319,7 @@ discard block |
||
| 318 | 319 | /** |
| 319 | 320 | * Return the named field as an obj() call from $this->failover. |
| 320 | 321 | * Default to the given class if there's no casting information. |
| 322 | + * @param string $fieldName |
|
| 321 | 323 | */ |
| 322 | 324 | public function rssField($fieldName, $defaultClass = 'Varchar') { |
| 323 | 325 | if($fieldName) { |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | /** |
| 23 | 23 | * Gets the list of shortcodes provided by this handler |
| 24 | 24 | * |
| 25 | - * @return mixed |
|
| 25 | + * @return string[] |
|
| 26 | 26 | */ |
| 27 | 27 | public static function get_shortcodes() |
| 28 | 28 | { |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | * |
| 357 | 357 | * @param string $property |
| 358 | 358 | * the name of the property |
| 359 | - * @param object $object |
|
| 359 | + * @param string $object |
|
| 360 | 360 | * the object to be set |
| 361 | 361 | */ |
| 362 | 362 | public function addAutoProperty($property, $object) { |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | * The name of the service to update the definition for |
| 451 | 451 | * @param string $property |
| 452 | 452 | * The name of the property to update. |
| 453 | - * @param mixed $value |
|
| 453 | + * @param string $value |
|
| 454 | 454 | * The value to set |
| 455 | 455 | * @param boolean $append |
| 456 | 456 | * Whether to append (the default) when the property is an array |
@@ -755,6 +755,7 @@ discard block |
||
| 755 | 755 | * |
| 756 | 756 | * Will recursively call hasService for each depth of dotting |
| 757 | 757 | * |
| 758 | + * @param string $name |
|
| 758 | 759 | * @return string |
| 759 | 760 | * The name of the service (as it might be different from the one passed in) |
| 760 | 761 | */ |
@@ -918,7 +919,6 @@ discard block |
||
| 918 | 919 | * Additional parameters are passed through as |
| 919 | 920 | * |
| 920 | 921 | * @param string $name |
| 921 | - * @param mixed $arguments,... arguments to pass to the constructor |
|
| 922 | 922 | * @return mixed A new instance of the specified object |
| 923 | 923 | */ |
| 924 | 924 | public function create($name) { |
@@ -932,8 +932,6 @@ discard block |
||
| 932 | 932 | * |
| 933 | 933 | * @param string $name |
| 934 | 934 | * Name of the class to create an object of |
| 935 | - * @param array $args |
|
| 936 | - * Arguments to pass to the constructor |
|
| 937 | 935 | * @return mixed |
| 938 | 936 | */ |
| 939 | 937 | public function createWithArgs($name, $constructorArgs) { |
@@ -43,6 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @todo Move this to SS_Database or DB |
| 46 | + * @param string $class |
|
| 46 | 47 | */ |
| 47 | 48 | public static function hasTable($class) { |
| 48 | 49 | // Cache the list of all table names to reduce on DB traffic |
@@ -80,7 +81,7 @@ discard block |
||
| 80 | 81 | * |
| 81 | 82 | * @todo Move this into {@see DataObjectSchema} |
| 82 | 83 | * |
| 83 | - * @param string|object $class |
|
| 84 | + * @param string $class |
|
| 84 | 85 | * @return array |
| 85 | 86 | */ |
| 86 | 87 | public static function dataClassesFor($class) { |
@@ -205,6 +206,7 @@ discard block |
||
| 205 | 206 | |
| 206 | 207 | /** |
| 207 | 208 | * Returns true if the given class implements the given interface |
| 209 | + * @param string $interfaceName |
|
| 208 | 210 | */ |
| 209 | 211 | public static function classImplements($className, $interfaceName) { |
| 210 | 212 | return in_array($className, self::implementorsOf($interfaceName)); |
@@ -255,6 +257,9 @@ discard block |
||
| 255 | 257 | |
| 256 | 258 | private static $method_from_cache = array(); |
| 257 | 259 | |
| 260 | + /** |
|
| 261 | + * @param string $method |
|
| 262 | + */ |
|
| 258 | 263 | public static function has_method_from($class, $method, $compclass) { |
| 259 | 264 | $lClass = strtolower($class); |
| 260 | 265 | $lMethod = strtolower($method); |
@@ -260,6 +260,9 @@ discard block |
||
| 260 | 260 | return $this; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | + /** |
|
| 264 | + * @param string $type |
|
| 265 | + */ |
|
| 263 | 266 | protected function invokeCallbacks($type, $args = array()) { |
| 264 | 267 | foreach($this->callbacks[$type] as $callback) { |
| 265 | 268 | call_user_func_array($callback, $args); |
@@ -299,6 +302,9 @@ discard block |
||
| 299 | 302 | $obj->$name = $this->parseValue($value, $fixtures); |
| 300 | 303 | } |
| 301 | 304 | |
| 305 | + /** |
|
| 306 | + * @param string $fieldName |
|
| 307 | + */ |
|
| 302 | 308 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
| 303 | 309 | $class = get_class($obj); |
| 304 | 310 | $table = DataObject::getSchema()->tableForField($class, $fieldName); |
@@ -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) { |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | |
| 362 | 362 | /** |
| 363 | 363 | * @param $obj DataObject |
| 364 | - * @param $message string |
|
| 364 | + * @param string $message string |
|
| 365 | 365 | */ |
| 366 | 366 | public function addCreated($obj, $message = null) { |
| 367 | 367 | $this->created[] = $this->lastChange = array( |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | |
| 375 | 375 | /** |
| 376 | 376 | * @param $obj DataObject |
| 377 | - * @param $message string |
|
| 377 | + * @param string $message string |
|
| 378 | 378 | */ |
| 379 | 379 | public function addUpdated($obj, $message = null) { |
| 380 | 380 | $this->updated[] = $this->lastChange = array( |
@@ -386,8 +386,8 @@ discard block |
||
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
| 389 | - * @param $obj DataObject |
|
| 390 | - * @param $message string |
|
| 389 | + * @param DataObject|null $obj DataObject |
|
| 390 | + * @param string $message string |
|
| 391 | 391 | */ |
| 392 | 392 | public function addDeleted($obj, $message = null) { |
| 393 | 393 | $data = $obj->toMap(); |