@@ -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); |
@@ -732,6 +732,9 @@ discard block |
||
| 732 | 732 | return $result; |
| 733 | 733 | } |
| 734 | 734 | |
| 735 | + /** |
|
| 736 | + * @param string $mode |
|
| 737 | + */ |
|
| 735 | 738 | protected function _get($dir, $mode, $tags = array()) |
| 736 | 739 | { |
| 737 | 740 | if (!is_dir($dir)) { |
@@ -819,6 +822,7 @@ discard block |
||
| 819 | 822 | /** |
| 820 | 823 | * Compute & return the expire time |
| 821 | 824 | * |
| 825 | + * @param integer $lifetime |
|
| 822 | 826 | * @return int expire time (unix timestamp) |
| 823 | 827 | */ |
| 824 | 828 | protected function _expireTime($lifetime) |
@@ -59,6 +59,10 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | protected $config; |
| 61 | 61 | |
| 62 | + /** |
|
| 63 | + * @param string $name |
|
| 64 | + * @param string $title |
|
| 65 | + */ |
|
| 62 | 66 | public function __construct($name, $title = null, $value = ""){ |
| 63 | 67 | $this->config = $this->config()->default_config; |
| 64 | 68 | |
@@ -71,6 +75,9 @@ discard block |
||
| 71 | 75 | parent::__construct($name, $title, $value); |
| 72 | 76 | } |
| 73 | 77 | |
| 78 | + /** |
|
| 79 | + * @param Form $form |
|
| 80 | + */ |
|
| 74 | 81 | public function setForm($form) { |
| 75 | 82 | parent::setForm($form); |
| 76 | 83 | |
@@ -81,6 +88,9 @@ discard block |
||
| 81 | 88 | return $this; |
| 82 | 89 | } |
| 83 | 90 | |
| 91 | + /** |
|
| 92 | + * @param string $name |
|
| 93 | + */ |
|
| 84 | 94 | public function setName($name) { |
| 85 | 95 | parent::setName($name); |
| 86 | 96 | |
@@ -93,7 +103,7 @@ discard block |
||
| 93 | 103 | |
| 94 | 104 | /** |
| 95 | 105 | * @param array $properties |
| 96 | - * @return HTMLText |
|
| 106 | + * @return string |
|
| 97 | 107 | */ |
| 98 | 108 | public function FieldHolder($properties = array()) { |
| 99 | 109 | $config = array( |
@@ -108,7 +118,7 @@ discard block |
||
| 108 | 118 | |
| 109 | 119 | /** |
| 110 | 120 | * @param array $properties |
| 111 | - * @return HTMLText |
|
| 121 | + * @return DBField |
|
| 112 | 122 | */ |
| 113 | 123 | public function Field($properties = array()) { |
| 114 | 124 | Requirements::css(FRAMEWORK_DIR . '/css/DatetimeField.css'); |
@@ -243,6 +253,7 @@ discard block |
||
| 243 | 253 | |
| 244 | 254 | /** |
| 245 | 255 | * @param FormField |
| 256 | + * @param DateField $field |
|
| 246 | 257 | */ |
| 247 | 258 | public function setDateField($field) { |
| 248 | 259 | $expected = $this->getName() . '[date]'; |
@@ -268,6 +279,7 @@ discard block |
||
| 268 | 279 | |
| 269 | 280 | /** |
| 270 | 281 | * @param FormField |
| 282 | + * @param TimeField $field |
|
| 271 | 283 | */ |
| 272 | 284 | public function setTimeField($field) { |
| 273 | 285 | $expected = $this->getName() . '[time]'; |
@@ -306,7 +318,7 @@ discard block |
||
| 306 | 318 | * to set field-specific config options. |
| 307 | 319 | * |
| 308 | 320 | * @param string $name |
| 309 | - * @param mixed $val |
|
| 321 | + * @param string $val |
|
| 310 | 322 | */ |
| 311 | 323 | public function setConfig($name, $val) { |
| 312 | 324 | $this->config[$name] = $val; |
@@ -324,7 +336,7 @@ discard block |
||
| 324 | 336 | * to get field-specific config options. |
| 325 | 337 | * |
| 326 | 338 | * @param String $name Optional, returns the whole configuration array if empty |
| 327 | - * @return mixed |
|
| 339 | + * @return string|null |
|
| 328 | 340 | */ |
| 329 | 341 | public function getConfig($name = null) { |
| 330 | 342 | if($name) { |
@@ -334,6 +346,9 @@ discard block |
||
| 334 | 346 | } |
| 335 | 347 | } |
| 336 | 348 | |
| 349 | + /** |
|
| 350 | + * @param RequiredFields $validator |
|
| 351 | + */ |
|
| 337 | 352 | public function validate($validator) { |
| 338 | 353 | $dateValid = $this->dateField->validate($validator); |
| 339 | 354 | $timeValid = $this->timeField->validate($validator); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * Which columns are handled by this component |
| 56 | 56 | * |
| 57 | 57 | * @param GridField $gridField |
| 58 | - * @return array |
|
| 58 | + * @return string[] |
|
| 59 | 59 | */ |
| 60 | 60 | public function getColumnsHandled($gridField) { |
| 61 | 61 | return array('Actions'); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @param DataObject $record |
| 77 | 77 | * @param string $columnName |
| 78 | 78 | * |
| 79 | - * @return string - the HTML for the column |
|
| 79 | + * @return DBField - the HTML for the column |
|
| 80 | 80 | */ |
| 81 | 81 | public function getColumnContent($gridField, $record, $columnName) { |
| 82 | 82 | // No permission checks, handled through GridFieldDetailForm, |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Create a new action button. |
| 20 | - * @param action The method to call when the button is clicked |
|
| 20 | + * @param action string method to call when the button is clicked |
|
| 21 | 21 | * @param title The label on the button |
| 22 | 22 | * @param extraClass A CSS class to apply to the button in addition to 'action' |
| 23 | 23 | */ |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * @param array $properties |
| 35 | - * @return HTMLText |
|
| 35 | + * @return DBField |
|
| 36 | 36 | */ |
| 37 | 37 | public function Field($properties = array()) { |
| 38 | 38 | if($this->includeDefaultJS) { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * @param array $properties |
| 81 | - * @return HTMLText |
|
| 81 | + * @return DBField |
|
| 82 | 82 | */ |
| 83 | 83 | public function Field($properties = array()) { |
| 84 | 84 | return DBField::create_field('HTMLText', |
@@ -112,6 +112,10 @@ discard block |
||
| 112 | 112 | )); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | + /** |
|
| 116 | + * @param DBField $result |
|
| 117 | + * @param string[] $expected |
|
| 118 | + */ |
|
| 115 | 119 | private function assertExpectedStrings($result, $expected) { |
| 116 | 120 | foreach ($expected as $expectedStr) { |
| 117 | 121 | $this->assertTrue( |
@@ -718,6 +722,10 @@ discard block |
||
| 718 | 722 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
| 719 | 723 | } |
| 720 | 724 | |
| 725 | + /** |
|
| 726 | + * @param string $a |
|
| 727 | + * @param string $b |
|
| 728 | + */ |
|
| 721 | 729 | public function assertEqualIgnoringWhitespace($a, $b) { |
| 722 | 730 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b)); |
| 723 | 731 | } |
@@ -1328,6 +1336,11 @@ discard block |
||
| 1328 | 1336 | Config::inst()->update('SSViewer', 'source_file_comments', false); |
| 1329 | 1337 | Config::inst()->update('Director', 'environment_type', $origEnv); |
| 1330 | 1338 | } |
| 1339 | + |
|
| 1340 | + /** |
|
| 1341 | + * @param string $name |
|
| 1342 | + * @param string $expected |
|
| 1343 | + */ |
|
| 1331 | 1344 | private function _renderWithSourceFileComments($name, $expected) { |
| 1332 | 1345 | $viewer = new SSViewer(array($name)); |
| 1333 | 1346 | $data = new ArrayData(array()); |
@@ -338,7 +338,6 @@ discard block |
||
| 338 | 338 | /** |
| 339 | 339 | * Returns the modulus of the numerical position of the item in the data set. |
| 340 | 340 | * The count starts from $startIndex, which defaults to 1. |
| 341 | - * @param int $Mod The number to perform Mod operation to. |
|
| 342 | 341 | * @param int $startIndex Number to start count from. |
| 343 | 342 | * @return int |
| 344 | 343 | */ |
@@ -412,6 +411,10 @@ discard block |
||
| 412 | 411 | $this->underlay = $underlay ? $underlay : array(); |
| 413 | 412 | } |
| 414 | 413 | |
| 414 | + /** |
|
| 415 | + * @param string $interfaceToQuery |
|
| 416 | + * @param string $variableMethod |
|
| 417 | + */ |
|
| 415 | 418 | protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false) { |
| 416 | 419 | $implementers = ClassInfo::implementorsOf($interfaceToQuery); |
| 417 | 420 | if($implementers) foreach($implementers as $implementer) { |
@@ -753,7 +756,7 @@ discard block |
||
| 753 | 756 | * |
| 754 | 757 | * @param $className string - valid class name |
| 755 | 758 | * @param $suffix string |
| 756 | - * @param $baseClass string |
|
| 759 | + * @param string $baseClass string |
|
| 757 | 760 | * |
| 758 | 761 | * @return array |
| 759 | 762 | */ |
@@ -1083,7 +1086,7 @@ discard block |
||
| 1083 | 1086 | * @param array|null $arguments - arguments to an included template |
| 1084 | 1087 | * @param Object $inheritedScope - the current scope of a parent template including a sub-template |
| 1085 | 1088 | * |
| 1086 | - * @return HTMLText Parsed template output. |
|
| 1089 | + * @return DBField Parsed template output. |
|
| 1087 | 1090 | */ |
| 1088 | 1091 | public function process($item, $arguments = null, $inheritedScope = null) { |
| 1089 | 1092 | SSViewer::$topLevel[] = $item; |
@@ -1158,7 +1161,7 @@ discard block |
||
| 1158 | 1161 | * @param string $template Template name |
| 1159 | 1162 | * @param mixed $data Data context |
| 1160 | 1163 | * @param array $arguments Additional arguments |
| 1161 | - * @return string Evaluated result |
|
| 1164 | + * @return DBField Evaluated result |
|
| 1162 | 1165 | */ |
| 1163 | 1166 | public static function execute_template($template, $data, $arguments = null, $scope = null) { |
| 1164 | 1167 | $v = new SSViewer($template); |
@@ -1184,6 +1187,9 @@ discard block |
||
| 1184 | 1187 | return $v->process($data, $arguments); |
| 1185 | 1188 | } |
| 1186 | 1189 | |
| 1190 | + /** |
|
| 1191 | + * @param string $content |
|
| 1192 | + */ |
|
| 1187 | 1193 | public function parseTemplateContent($content, $template="") { |
| 1188 | 1194 | return $this->getParser()->compileString( |
| 1189 | 1195 | $content, |
@@ -1212,7 +1218,7 @@ discard block |
||
| 1212 | 1218 | * Return an appropriate base tag for the given template. |
| 1213 | 1219 | * It will be closed on an XHTML document, and unclosed on an HTML document. |
| 1214 | 1220 | * |
| 1215 | - * @param $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
| 1221 | + * @param string $contentGeneratedSoFar The content of the template generated so far; it should contain |
|
| 1216 | 1222 | * the DOCTYPE declaration. |
| 1217 | 1223 | */ |
| 1218 | 1224 | public static function get_base_tag($contentGeneratedSoFar) { |
@@ -1253,6 +1259,9 @@ discard block |
||
| 1253 | 1259 | */ |
| 1254 | 1260 | protected $cacheTemplate; |
| 1255 | 1261 | |
| 1262 | + /** |
|
| 1263 | + * @param string $content |
|
| 1264 | + */ |
|
| 1256 | 1265 | public function __construct($content, TemplateParser $parser = null) { |
| 1257 | 1266 | if ($parser) { |
| 1258 | 1267 | $this->setParser($parser); |
@@ -37,6 +37,9 @@ discard block |
||
| 37 | 37 | ] |
| 38 | 38 | ); |
| 39 | 39 | |
| 40 | + /** |
|
| 41 | + * @param string $root |
|
| 42 | + */ |
|
| 40 | 43 | public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) { |
| 41 | 44 | // Get root path |
| 42 | 45 | $root = $this->findRoot($root); |
@@ -117,7 +120,7 @@ discard block |
||
| 117 | 120 | * Render server configuration file from a template file |
| 118 | 121 | * |
| 119 | 122 | * @param string $template |
| 120 | - * @return \HTMLText Rendered results |
|
| 123 | + * @return string Rendered results |
|
| 121 | 124 | */ |
| 122 | 125 | protected function renderTemplate($template) { |
| 123 | 126 | // Build allowed extensions |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | * Provide secure downloadable |
| 43 | 43 | * |
| 44 | 44 | * @param string $path |
| 45 | - * @return string|null |
|
| 45 | + * @return string |
|
| 46 | 46 | */ |
| 47 | 47 | public function getProtectedUrl($path) { |
| 48 | 48 | // Public URLs are handled via a request handler within /assets. |