@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | private static $nice_format = 'd/m/Y'; |
29 | 29 | |
30 | 30 | |
31 | + /** |
|
32 | + * @param string|null $value |
|
33 | + */ |
|
31 | 34 | public function setValue($value, $record = null) { |
32 | 35 | if($value === false || $value === null || (is_string($value) && !strlen($value))) { |
33 | 36 | // don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be |
@@ -110,7 +113,7 @@ discard block |
||
110 | 113 | |
111 | 114 | /** |
112 | 115 | * Returns the day of the month. |
113 | - * @param boolean $includeOrdinals Include ordinal suffix to day, e.g. "th" or "rd" |
|
116 | + * @param boolean $includeOrdinal Include ordinal suffix to day, e.g. "th" or "rd" |
|
114 | 117 | * @return string |
115 | 118 | */ |
116 | 119 | public function DayOfMonth($includeOrdinal = false) { |
@@ -164,7 +167,7 @@ discard block |
||
164 | 167 | * Return a date formatted as per a CMS user's settings. |
165 | 168 | * |
166 | 169 | * @param Member $member |
167 | - * @return boolean | string A date formatted as per user-defined settings. |
|
170 | + * @return false|string | string A date formatted as per user-defined settings. |
|
168 | 171 | */ |
169 | 172 | public function FormatFromSettings($member = null) { |
170 | 173 | require_once 'Zend/Date.php'; |
@@ -209,6 +209,9 @@ |
||
209 | 209 | |
210 | 210 | } |
211 | 211 | |
212 | + /** |
|
213 | + * @param string $tableName |
|
214 | + */ |
|
212 | 215 | public function setTable($tableName) { |
213 | 216 | $this->tableName = $tableName; |
214 | 217 | } |
@@ -129,6 +129,7 @@ |
||
129 | 129 | |
130 | 130 | /** |
131 | 131 | * @param boolean |
132 | + * @param boolean $bool |
|
132 | 133 | */ |
133 | 134 | public function setAllowMultibyte($bool) { |
134 | 135 | $this->allowMultibyte = $bool; |
@@ -92,6 +92,9 @@ |
||
92 | 92 | return $return; |
93 | 93 | } |
94 | 94 | |
95 | + /** |
|
96 | + * @param boolean $index |
|
97 | + */ |
|
95 | 98 | function f($index) { |
96 | 99 | return stripslashes($this->row[$index]); |
97 | 100 | } |
@@ -63,6 +63,7 @@ discard block |
||
63 | 63 | * while automatically busting this cache every time the file is changed. |
64 | 64 | * |
65 | 65 | * @param bool |
66 | + * @param boolean $var |
|
66 | 67 | */ |
67 | 68 | public static function set_suffix_requirements($var) { |
68 | 69 | self::backend()->set_suffix_requirements($var); |
@@ -123,7 +124,7 @@ discard block |
||
123 | 124 | /** |
124 | 125 | * Return all registered custom scripts |
125 | 126 | * |
126 | - * @return array |
|
127 | + * @return string |
|
127 | 128 | */ |
128 | 129 | public static function get_custom_scripts() { |
129 | 130 | return self::backend()->get_custom_scripts(); |
@@ -531,7 +532,7 @@ discard block |
||
531 | 532 | /** |
532 | 533 | * Enable or disable the combination of CSS and JavaScript files |
533 | 534 | * |
534 | - * @param $enable |
|
535 | + * @param boolean $enable |
|
535 | 536 | */ |
536 | 537 | public function set_combined_files_enabled($enable) { |
537 | 538 | $this->combined_files_enabled = (bool) $enable; |
@@ -599,6 +600,7 @@ discard block |
||
599 | 600 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
600 | 601 | * |
601 | 602 | * @param bool |
603 | + * @param boolean $var |
|
602 | 604 | */ |
603 | 605 | public function set_force_js_to_bottom($var) { |
604 | 606 | $this->force_js_to_bottom = $var; |
@@ -638,7 +640,7 @@ discard block |
||
638 | 640 | /** |
639 | 641 | * Return all registered custom scripts |
640 | 642 | * |
641 | - * @return array |
|
643 | + * @return string |
|
642 | 644 | */ |
643 | 645 | public function get_custom_scripts() { |
644 | 646 | $requirements = ""; |
@@ -1051,7 +1053,7 @@ discard block |
||
1051 | 1053 | * @param array $files Array of filenames relative to docroot |
1052 | 1054 | * @param string $media |
1053 | 1055 | * |
1054 | - * @return bool|void |
|
1056 | + * @return false|null |
|
1055 | 1057 | */ |
1056 | 1058 | public function combine_files($combinedFileName, $files, $media = null) { |
1057 | 1059 | // duplicate check |
@@ -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}"; |
@@ -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; |
@@ -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) { |
@@ -834,6 +838,10 @@ discard block |
||
834 | 838 | $this->cache = array(); |
835 | 839 | } |
836 | 840 | |
841 | + /** |
|
842 | + * @param integer $key |
|
843 | + * @param integer $val |
|
844 | + */ |
|
837 | 845 | public function set($key, $val, $tags = array()) { |
838 | 846 | foreach($tags as $t) { |
839 | 847 | if(!isset($this->tags[$t])) { |
@@ -852,6 +860,9 @@ discard block |
||
852 | 860 | return $this->miss ? ($this->hit / $this->miss) : 0; |
853 | 861 | } |
854 | 862 | |
863 | + /** |
|
864 | + * @param integer $key |
|
865 | + */ |
|
855 | 866 | public function get($key) { |
856 | 867 | list($hit, $result) = $this->checkAndGet($key); |
857 | 868 | return $hit ? $result : false; |
@@ -871,6 +882,9 @@ discard block |
||
871 | 882 | } |
872 | 883 | } |
873 | 884 | |
885 | + /** |
|
886 | + * @param string $tag |
|
887 | + */ |
|
874 | 888 | public function clean($tag = null) { |
875 | 889 | if($tag) { |
876 | 890 | if(isset($this->tags[$tag])) { |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @param array|string $val String to escape, or array of strings |
52 | 52 | * |
53 | - * @return array|string |
|
53 | + * @return string |
|
54 | 54 | */ |
55 | 55 | public static function raw2htmlname($val) { |
56 | 56 | if(is_array($val)) { |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | * |
182 | 182 | * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' |
183 | 183 | * @param string $separator The string that delimits subsequent identifiers |
184 | - * @return string|array The escaped identifier. E.g. '"SiteTree"."Title"' |
|
184 | + * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
|
185 | 185 | */ |
186 | 186 | public static function symbol2sql($identifier, $separator = '.') { |
187 | 187 | if(is_array($identifier)) { |
@@ -266,6 +266,7 @@ discard block |
||
266 | 266 | * call this function directly, Please use {@link Convert::xml2array()} |
267 | 267 | * |
268 | 268 | * @param SimpleXMLElement |
269 | + * @param SimpleXMLElement $xml |
|
269 | 270 | * |
270 | 271 | * @return mixed |
271 | 272 | */ |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * Find a File object by the given filename. |
235 | 235 | * |
236 | 236 | * @param String $filename Matched against the "Name" property. |
237 | - * @return mixed null if not found, File object of found file |
|
237 | + * @return null|DataObject null if not found, File object of found file |
|
238 | 238 | */ |
239 | 239 | public static function find($filename) { |
240 | 240 | // Get the base file if $filename points to a resampled file |
@@ -449,6 +449,7 @@ discard block |
||
449 | 449 | * showing icons on filelinks, etc. |
450 | 450 | * Possible group values are: "audio", "mov", "zip", "image". |
451 | 451 | * |
452 | + * @param string $ext |
|
452 | 453 | * @return String |
453 | 454 | */ |
454 | 455 | public static function get_app_category($ext) { |
@@ -150,6 +150,7 @@ discard block |
||
150 | 150 | * successfully, the manipulation's cache key is removed. |
151 | 151 | * |
152 | 152 | * @param string $filename |
153 | + * @param string $manipulation |
|
153 | 154 | * @return boolean |
154 | 155 | */ |
155 | 156 | public function failedResample($filename, $manipulation) { |
@@ -428,6 +429,10 @@ discard block |
||
428 | 429 | return $useAsMinimum ? $this->resizeByWidth( $maxWidth ) : $this->resizeByHeight( $maxHeight ); |
429 | 430 | } |
430 | 431 | |
432 | + /** |
|
433 | + * @param resource $image |
|
434 | + * @param string $webColor |
|
435 | + */ |
|
431 | 436 | public static function color_web2gd($image, $webColor, $transparencyPercent = 0) { |
432 | 437 | if(substr($webColor,0,1) == "#") $webColor = substr($webColor,1); |
433 | 438 | $r = hexdec(substr($webColor,0,2)); |
@@ -546,6 +551,9 @@ discard block |
||
546 | 551 | return $output; |
547 | 552 | } |
548 | 553 | |
554 | + /** |
|
555 | + * @param string $dirname |
|
556 | + */ |
|
549 | 557 | public function makeDir($dirname) { |
550 | 558 | if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname)); |
551 | 559 | if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask')); |