@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param string $locale Locale/Language to add data for, identical with locale identifier, |
55 | 55 | * see Zend_Locale for more information |
56 | 56 | * @param string $filename XLIFF file to add, full path must be given for access |
57 | - * @param array $option OPTIONAL Options to use |
|
57 | + * @param array $options OPTIONAL Options to use |
|
58 | 58 | * @throws Zend_Translation_Exception |
59 | 59 | * @return array |
60 | 60 | */ |
@@ -206,6 +206,9 @@ discard block |
||
206 | 206 | } |
207 | 207 | } |
208 | 208 | |
209 | + /** |
|
210 | + * @param string $filename |
|
211 | + */ |
|
209 | 212 | private function _findEncoding($filename) |
210 | 213 | { |
211 | 214 | $file = file_get_contents($filename, null, null, 0, 100); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @param string $locale Locale/Language to add data for, identical with locale identifier, |
49 | 49 | * see Zend_Locale for more information |
50 | 50 | * @param string $filename XMLTM file to add, full path must be given for access |
51 | - * @param array $option OPTIONAL Options to use |
|
51 | + * @param array $options OPTIONAL Options to use |
|
52 | 52 | * @throws Zend_Translation_Exception |
53 | 53 | * @return array |
54 | 54 | */ |
@@ -116,6 +116,9 @@ discard block |
||
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | + /** |
|
120 | + * @param string $filename |
|
121 | + */ |
|
119 | 122 | private function _findEncoding($filename) |
120 | 123 | { |
121 | 124 | $file = file_get_contents($filename, null, null, 0, 100); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * Generates the adapter |
19 | 19 | * |
20 | - * @param array|Zend_Config $options Translation content |
|
20 | + * @param string $options Translation content |
|
21 | 21 | */ |
22 | 22 | public function __construct($options = array()) { |
23 | 23 | $this->_options['keyDelimiter'] = "."; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param string|array $data Filename and full path to the translation source |
32 | 32 | * @param string $locale Locale/Language to add data for, identical with locale identifier, |
33 | 33 | * see Zend_Locale for more information |
34 | - * @param array $option OPTIONAL Options to use |
|
34 | + * @param array $options OPTIONAL Options to use |
|
35 | 35 | */ |
36 | 36 | protected function _loadTranslationData($data, $locale, array $options = array()) |
37 | 37 | { |
@@ -159,9 +159,9 @@ |
||
159 | 159 | /** |
160 | 160 | * Parses a scalar to a YAML string. |
161 | 161 | * |
162 | - * @param scalar $scalar |
|
162 | + * @param string $scalar |
|
163 | 163 | * @param string $delimiters |
164 | - * @param array $stringDelimiter |
|
164 | + * @param array $stringDelimiters |
|
165 | 165 | * @param integer $i |
166 | 166 | * @param boolean $evaluate |
167 | 167 | * |
@@ -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]; |
@@ -73,7 +66,7 @@ discard block |
||
73 | 66 | * Add or set a field on this object. |
74 | 67 | * |
75 | 68 | * @param string $field |
76 | - * @param mixed $value |
|
69 | + * @param string $value |
|
77 | 70 | */ |
78 | 71 | public function setField($field, $value) { |
79 | 72 | $this->array[$field] = $value; |
@@ -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) { |
@@ -93,7 +87,7 @@ discard block |
||
93 | 87 | * Converts an associative array to a simple object |
94 | 88 | * |
95 | 89 | * @param array |
96 | - * @return obj $obj |
|
90 | + * @return stdClass $obj |
|
97 | 91 | */ |
98 | 92 | public static function array_to_object($arr = null) { |
99 | 93 | $obj = new stdClass(); |
@@ -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) { |
@@ -336,7 +336,6 @@ discard block |
||
336 | 336 | /** |
337 | 337 | * Returns the modulus of the numerical position of the item in the data set. |
338 | 338 | * The count starts from $startIndex, which defaults to 1. |
339 | - * @param int $Mod The number to perform Mod operation to. |
|
340 | 339 | * @param int $startIndex Number to start count from. |
341 | 340 | * @return int |
342 | 341 | */ |
@@ -410,6 +409,10 @@ discard block |
||
410 | 409 | $this->underlay = $underlay ? $underlay : array(); |
411 | 410 | } |
412 | 411 | |
412 | + /** |
|
413 | + * @param string $interfaceToQuery |
|
414 | + * @param string $variableMethod |
|
415 | + */ |
|
413 | 416 | protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false) { |
414 | 417 | $implementers = ClassInfo::implementorsOf($interfaceToQuery); |
415 | 418 | if($implementers) foreach($implementers as $implementer) { |
@@ -751,7 +754,7 @@ discard block |
||
751 | 754 | * |
752 | 755 | * @param $className string - valid class name |
753 | 756 | * @param $suffix string |
754 | - * @param $baseClass string |
|
757 | + * @param string $baseClass string |
|
755 | 758 | * |
756 | 759 | * @return array |
757 | 760 | */ |
@@ -1156,7 +1159,7 @@ discard block |
||
1156 | 1159 | * @param string $template Template name |
1157 | 1160 | * @param mixed $data Data context |
1158 | 1161 | * @param array $arguments Additional arguments |
1159 | - * @return string Evaluated result |
|
1162 | + * @return HTMLText Evaluated result |
|
1160 | 1163 | */ |
1161 | 1164 | public static function execute_template($template, $data, $arguments = null, $scope = null) { |
1162 | 1165 | $v = new SSViewer($template); |
@@ -1182,6 +1185,9 @@ discard block |
||
1182 | 1185 | return $v->process($data, $arguments); |
1183 | 1186 | } |
1184 | 1187 | |
1188 | + /** |
|
1189 | + * @param string $content |
|
1190 | + */ |
|
1185 | 1191 | public function parseTemplateContent($content, $template="") { |
1186 | 1192 | return $this->getParser()->compileString( |
1187 | 1193 | $content, |
@@ -1210,7 +1216,7 @@ discard block |
||
1210 | 1216 | * Return an appropriate base tag for the given template. |
1211 | 1217 | * It will be closed on an XHTML document, and unclosed on an HTML document. |
1212 | 1218 | * |
1213 | - * @param $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
1219 | + * @param string $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
1214 | 1220 | * the DOCTYPE declaration. |
1215 | 1221 | */ |
1216 | 1222 | public static function get_base_tag($contentGeneratedSoFar) { |
@@ -1251,6 +1257,9 @@ discard block |
||
1251 | 1257 | */ |
1252 | 1258 | protected $cacheTemplate; |
1253 | 1259 | |
1260 | + /** |
|
1261 | + * @param string $content |
|
1262 | + */ |
|
1254 | 1263 | public function __construct($content, TemplateParser $parser = null) { |
1255 | 1264 | if ($parser) { |
1256 | 1265 | $this->setParser($parser); |
@@ -189,8 +189,6 @@ discard block |
||
189 | 189 | /** |
190 | 190 | * Method to facilitate deprecation of underscore-prefixed methods automatically being cached. |
191 | 191 | * |
192 | - * @param string $field |
|
193 | - * @param array $arguments |
|
194 | 192 | * @param string $identifier an optional custom cache identifier |
195 | 193 | * @return unknown |
196 | 194 | */ |
@@ -251,7 +249,7 @@ discard block |
||
251 | 249 | * - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)") |
252 | 250 | * |
253 | 251 | * @param string $field |
254 | - * @return array |
|
252 | + * @return string |
|
255 | 253 | */ |
256 | 254 | public function castingHelperPair($field) { |
257 | 255 | Deprecation::notice('2.5', 'use castingHelper() instead'); |
@@ -501,6 +499,7 @@ discard block |
||
501 | 499 | |
502 | 500 | /** |
503 | 501 | * Return the value of a field in an SQL-safe format. |
502 | + * @param string $field |
|
504 | 503 | */ |
505 | 504 | public function SQL_val($field, $arguments = null, $cache = true) { |
506 | 505 | return Convert::raw2sql($this->RAW_val($field, $arguments, $cache)); |
@@ -508,6 +507,7 @@ discard block |
||
508 | 507 | |
509 | 508 | /** |
510 | 509 | * Return the value of a field in a JavaScript-save format. |
510 | + * @param string $field |
|
511 | 511 | */ |
512 | 512 | public function JS_val($field, $arguments = null, $cache = true) { |
513 | 513 | return Convert::raw2js($this->RAW_val($field, $arguments, $cache)); |
@@ -515,6 +515,7 @@ discard block |
||
515 | 515 | |
516 | 516 | /** |
517 | 517 | * Return the value of a field escaped suitable to be inserted into an XML node attribute. |
518 | + * @param string $field |
|
518 | 519 | */ |
519 | 520 | public function ATT_val($field, $arguments = null, $cache = true) { |
520 | 521 | return Convert::raw2att($this->RAW_val($field, $arguments, $cache)); |
@@ -525,7 +526,6 @@ discard block |
||
525 | 526 | /** |
526 | 527 | * Get an array of XML-escaped values by field name |
527 | 528 | * |
528 | - * @param array $elements an array of field names |
|
529 | 529 | * @return array |
530 | 530 | */ |
531 | 531 | public function getXMLValues($fields) { |
@@ -53,6 +53,7 @@ |
||
53 | 53 | * Set actions that are exempt from validation |
54 | 54 | * |
55 | 55 | * @param array |
56 | + * @param string[] $actions |
|
56 | 57 | */ |
57 | 58 | public function setValidationExemptActions($actions) { |
58 | 59 | $this->validationExemptActions = $actions; |