@@ -24,7 +24,7 @@ |
||
24 | 24 | * |
25 | 25 | * @param array $properties |
26 | 26 | * |
27 | - * @return string |
|
27 | + * @return SilverStripe\ORM\FieldType\DBHTMLText |
|
28 | 28 | */ |
29 | 29 | public function Field($properties = array()) { |
30 | 30 | $source = ArrayLib::flatten($this->getSource()); |
@@ -95,7 +95,7 @@ |
||
95 | 95 | * If $dontEscape is false the returned value will be safely encoded, |
96 | 96 | * but should not be escaped by the frontend. |
97 | 97 | * |
98 | - * @return mixed|string |
|
98 | + * @return string |
|
99 | 99 | */ |
100 | 100 | public function Value() { |
101 | 101 | // Get raw value |
@@ -760,7 +760,6 @@ discard block |
||
760 | 760 | * Set the field value. |
761 | 761 | * |
762 | 762 | * @param mixed $value |
763 | - * @param null|array|DataObject $data {@see Form::loadDataFrom} |
|
764 | 763 | * |
765 | 764 | * @return $this |
766 | 765 | */ |
@@ -1184,7 +1183,7 @@ discard block |
||
1184 | 1183 | /** |
1185 | 1184 | * @param FormTransformation $transformation |
1186 | 1185 | * |
1187 | - * @return mixed |
|
1186 | + * @return FormField |
|
1188 | 1187 | */ |
1189 | 1188 | public function transform(FormTransformation $transformation) { |
1190 | 1189 | return $transformation->transform($this); |
@@ -1287,7 +1286,7 @@ discard block |
||
1287 | 1286 | * This function is used by the template processor. If you refer to a field as a $ variable, it |
1288 | 1287 | * will return the $Field value. |
1289 | 1288 | * |
1290 | - * @return string |
|
1289 | + * @return DBHTMLText |
|
1291 | 1290 | */ |
1292 | 1291 | public function forTemplate() { |
1293 | 1292 | return $this->Field(); |
@@ -1309,7 +1308,7 @@ discard block |
||
1309 | 1308 | * |
1310 | 1309 | * @param FieldList $containerFieldList |
1311 | 1310 | * |
1312 | - * @return FieldList |
|
1311 | + * @return FormField |
|
1313 | 1312 | */ |
1314 | 1313 | public function setContainerFieldList($containerFieldList) { |
1315 | 1314 | $this->containerFieldList = $containerFieldList; |
@@ -470,11 +470,17 @@ discard block |
||
470 | 470 | |
471 | 471 | protected $extraConfigSources = array(); |
472 | 472 | |
473 | + /** |
|
474 | + * @param string $class |
|
475 | + */ |
|
473 | 476 | public function extraConfigSourcesChanged($class) { |
474 | 477 | unset($this->extraConfigSources[$class]); |
475 | 478 | $this->cache->clean("__{$class}"); |
476 | 479 | } |
477 | 480 | |
481 | + /** |
|
482 | + * @param integer $sourceOptions |
|
483 | + */ |
|
478 | 484 | protected function getUncached($class, $name, $sourceOptions, &$result, $suppress, &$tags) { |
479 | 485 | $tags[] = "__{$class}"; |
480 | 486 | $tags[] = "__{$class}__{$name}"; |
@@ -603,7 +609,7 @@ discard block |
||
603 | 609 | * replace the current array value, you'll need to call remove first. |
604 | 610 | * |
605 | 611 | * @param $class string - The class to update a configuration value for |
606 | - * @param $name string - The configuration property name to update |
|
612 | + * @param string $name string - The configuration property name to update |
|
607 | 613 | * @param $value any - The value to update with |
608 | 614 | * |
609 | 615 | * Arrays are recursively merged into current configuration as "latest" - for associative arrays the passed value |
@@ -648,15 +654,6 @@ discard block |
||
648 | 654 | * |
649 | 655 | * @param string $class The class to remove a configuration value from |
650 | 656 | * @param string $name The configuration name |
651 | - * @param mixed $key An optional key to filter against. |
|
652 | - * If referenced config value is an array, only members of that array that match this key will be removed |
|
653 | - * Must also match value if provided to be removed |
|
654 | - * @param mixed $value And optional value to filter against. |
|
655 | - * If referenced config value is an array, only members of that array that match this value will be removed |
|
656 | - * If referenced config value is not an array, value will be removed only if it matches this argument |
|
657 | - * Must also match key if provided and referenced config value is an array to be removed |
|
658 | - * |
|
659 | - * Matching is always by "==", not by "===" |
|
660 | 657 | */ |
661 | 658 | public function remove($class, $name /*,$key = null*/ /*,$value = null*/) { |
662 | 659 | $argc = func_num_args(); |
@@ -735,6 +732,10 @@ discard block |
||
735 | 732 | $this->cache = $cloned; |
736 | 733 | } |
737 | 734 | |
735 | + /** |
|
736 | + * @param integer $key |
|
737 | + * @param integer $val |
|
738 | + */ |
|
738 | 739 | public function set($key, $val, $tags = array()) { |
739 | 740 | // Find an index to set at |
740 | 741 | $replacing = null; |
@@ -775,7 +776,7 @@ discard block |
||
775 | 776 | * For a more robust cache checking, use {@link checkAndGet()} |
776 | 777 | * |
777 | 778 | * @param string $key The cache key |
778 | - * @return variant Cached value, if hit. False otherwise |
|
779 | + * @return boolean Cached value, if hit. False otherwise |
|
779 | 780 | */ |
780 | 781 | public function get($key) { |
781 | 782 | list($hit, $result) = $this->checkAndGet($key); |
@@ -803,6 +804,9 @@ discard block |
||
803 | 804 | } |
804 | 805 | } |
805 | 806 | |
807 | + /** |
|
808 | + * @param string $tag |
|
809 | + */ |
|
806 | 810 | public function clean($tag = null) { |
807 | 811 | if ($tag) { |
808 | 812 | foreach ($this->cache as $i => $v) { |
@@ -841,6 +845,10 @@ discard block |
||
841 | 845 | $this->cache = array(); |
842 | 846 | } |
843 | 847 | |
848 | + /** |
|
849 | + * @param integer $key |
|
850 | + * @param integer $val |
|
851 | + */ |
|
844 | 852 | public function set($key, $val, $tags = array()) { |
845 | 853 | foreach($tags as $t) { |
846 | 854 | if(!isset($this->tags[$t])) { |
@@ -859,6 +867,11 @@ discard block |
||
859 | 867 | return $this->miss ? ($this->hit / $this->miss) : 0; |
860 | 868 | } |
861 | 869 | |
870 | + /** |
|
871 | + * @param integer $key |
|
872 | + * |
|
873 | + * @return boolean |
|
874 | + */ |
|
862 | 875 | public function get($key) { |
863 | 876 | list($hit, $result) = $this->checkAndGet($key); |
864 | 877 | return $hit ? $result : false; |
@@ -878,6 +891,9 @@ discard block |
||
878 | 891 | } |
879 | 892 | } |
880 | 893 | |
894 | + /** |
|
895 | + * @param string $tag |
|
896 | + */ |
|
881 | 897 | public function clean($tag = null) { |
882 | 898 | if($tag) { |
883 | 899 | if(isset($this->tags[$tag])) { |
@@ -7,9 +7,27 @@ |
||
7 | 7 | * @subpackage manifest |
8 | 8 | */ |
9 | 9 | interface ManifestCache { |
10 | + |
|
11 | + /** |
|
12 | + * @return void |
|
13 | + */ |
|
10 | 14 | public function __construct($name); |
15 | + |
|
16 | + /** |
|
17 | + * @param string $key |
|
18 | + */ |
|
11 | 19 | public function load($key); |
20 | + |
|
21 | + /** |
|
22 | + * @param string $key |
|
23 | + * |
|
24 | + * @return void |
|
25 | + */ |
|
12 | 26 | public function save($data, $key); |
27 | + |
|
28 | + /** |
|
29 | + * @return void |
|
30 | + */ |
|
13 | 31 | public function clear(); |
14 | 32 | } |
15 | 33 |
@@ -30,6 +30,9 @@ |
||
30 | 30 | self::$instance = $instance; |
31 | 31 | } |
32 | 32 | |
33 | + /** |
|
34 | + * @param string $base |
|
35 | + */ |
|
33 | 36 | public function __construct($base = null) { |
34 | 37 | $this->base = $base ? $base : BASE_PATH; |
35 | 38 | } |
@@ -64,6 +64,10 @@ discard block |
||
64 | 64 | */ |
65 | 65 | protected $config; |
66 | 66 | |
67 | + /** |
|
68 | + * @param string $name |
|
69 | + * @param string $title |
|
70 | + */ |
|
67 | 71 | public function __construct($name, $title = null, $value = ""){ |
68 | 72 | $this->config = $this->config()->default_config; |
69 | 73 | |
@@ -74,6 +78,9 @@ discard block |
||
74 | 78 | parent::__construct($name, $title, $value); |
75 | 79 | } |
76 | 80 | |
81 | + /** |
|
82 | + * @param Form $form |
|
83 | + */ |
|
77 | 84 | public function setForm($form) { |
78 | 85 | parent::setForm($form); |
79 | 86 | |
@@ -84,6 +91,9 @@ discard block |
||
84 | 91 | return $this; |
85 | 92 | } |
86 | 93 | |
94 | + /** |
|
95 | + * @param string $name |
|
96 | + */ |
|
87 | 97 | public function setName($name) { |
88 | 98 | parent::setName($name); |
89 | 99 | |
@@ -96,7 +106,7 @@ discard block |
||
96 | 106 | |
97 | 107 | /** |
98 | 108 | * @param array $properties |
99 | - * @return string |
|
109 | + * @return DBHTMLText |
|
100 | 110 | */ |
101 | 111 | public function FieldHolder($properties = array()) { |
102 | 112 | $config = array( |
@@ -110,7 +120,7 @@ discard block |
||
110 | 120 | |
111 | 121 | /** |
112 | 122 | * @param array $properties |
113 | - * @return string |
|
123 | + * @return DBHTMLText |
|
114 | 124 | */ |
115 | 125 | public function Field($properties = array()) { |
116 | 126 | Requirements::css(FRAMEWORK_DIR . '/client/dist/styles/DatetimeField.css'); |
@@ -223,6 +233,9 @@ discard block |
||
223 | 233 | return $this; |
224 | 234 | } |
225 | 235 | |
236 | + /** |
|
237 | + * @param boolean $bool |
|
238 | + */ |
|
226 | 239 | public function setReadonly($bool) { |
227 | 240 | parent::setReadonly($bool); |
228 | 241 | $this->dateField->setReadonly($bool); |
@@ -240,6 +253,7 @@ discard block |
||
240 | 253 | |
241 | 254 | /** |
242 | 255 | * @param FormField |
256 | + * @param DateField $field |
|
243 | 257 | */ |
244 | 258 | public function setDateField($field) { |
245 | 259 | $expected = $this->getName() . '[date]'; |
@@ -265,6 +279,7 @@ discard block |
||
265 | 279 | |
266 | 280 | /** |
267 | 281 | * @param FormField |
282 | + * @param TimeField $field |
|
268 | 283 | */ |
269 | 284 | public function setTimeField($field) { |
270 | 285 | $expected = $this->getName() . '[time]'; |
@@ -312,7 +327,7 @@ discard block |
||
312 | 327 | * to set field-specific config options. |
313 | 328 | * |
314 | 329 | * @param string $name |
315 | - * @param mixed $val |
|
330 | + * @param string $val |
|
316 | 331 | */ |
317 | 332 | public function setConfig($name, $val) { |
318 | 333 | $this->config[$name] = $val; |
@@ -330,7 +345,7 @@ discard block |
||
330 | 345 | * to get field-specific config options. |
331 | 346 | * |
332 | 347 | * @param String $name Optional, returns the whole configuration array if empty |
333 | - * @return mixed |
|
348 | + * @return string|null |
|
334 | 349 | */ |
335 | 350 | public function getConfig($name = null) { |
336 | 351 | if($name) { |
@@ -340,6 +355,9 @@ discard block |
||
340 | 355 | } |
341 | 356 | } |
342 | 357 | |
358 | + /** |
|
359 | + * @param RequiredFields $validator |
|
360 | + */ |
|
343 | 361 | public function validate($validator) { |
344 | 362 | $dateValid = $this->dateField->validate($validator); |
345 | 363 | $timeValid = $this->timeField->validate($validator); |
@@ -52,6 +52,10 @@ discard block |
||
52 | 52 | |
53 | 53 | protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_TIME; |
54 | 54 | |
55 | + /** |
|
56 | + * @param string $name |
|
57 | + * @param string $title |
|
58 | + */ |
|
55 | 59 | public function __construct($name, $title = null, $value = ""){ |
56 | 60 | if(!$this->locale) { |
57 | 61 | $this->locale = i18n::get_locale(); |
@@ -213,7 +217,7 @@ discard block |
||
213 | 217 | |
214 | 218 | /** |
215 | 219 | * @param String $name Optional, returns the whole configuration array if empty |
216 | - * @return mixed|array |
|
220 | + * @return string|null |
|
217 | 221 | */ |
218 | 222 | public function getConfig($name = null) { |
219 | 223 | if($name) { |
@@ -230,6 +234,9 @@ discard block |
||
230 | 234 | return $this->castedCopy('TimeField_Readonly'); |
231 | 235 | } |
232 | 236 | |
237 | + /** |
|
238 | + * @param string $class |
|
239 | + */ |
|
233 | 240 | public function castedCopy($class) { |
234 | 241 | $copy = parent::castedCopy($class); |
235 | 242 | if($copy->hasMethod('setConfig')) { |
@@ -385,9 +385,9 @@ discard block |
||
385 | 385 | * it's only advisable to send small files through this method. |
386 | 386 | * |
387 | 387 | * @static |
388 | - * @param $fileData |
|
388 | + * @param string $fileData |
|
389 | 389 | * @param $fileName |
390 | - * @param null $mimeType |
|
390 | + * @param string $mimeType |
|
391 | 391 | * @return SS_HTTPResponse |
392 | 392 | */ |
393 | 393 | public static function send_file($fileData, $fileName, $mimeType = null) { |
@@ -605,7 +605,7 @@ discard block |
||
605 | 605 | * This is used by the request handler to prevent infinite parsing loops. |
606 | 606 | * |
607 | 607 | * @param $pattern |
608 | - * @return bool |
|
608 | + * @return boolean|null |
|
609 | 609 | */ |
610 | 610 | public function isEmptyPattern($pattern) { |
611 | 611 | if(preg_match('/^([A-Za-z]+) +(.*)$/', $pattern, $matches)) { |