@@ -118,6 +118,10 @@ |
||
118 | 118 | |
119 | 119 | // Patch in multibyte support |
120 | 120 | if (!function_exists('mb_substr')) { |
121 | + |
|
122 | + /** |
|
123 | + * @param string $str |
|
124 | + */ |
|
121 | 125 | function mb_substr($str, $start, $len = '', $encoding="UTF-8"){ |
122 | 126 | $limit = strlen($str); |
123 | 127 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | /** |
53 | 53 | * Throws an error message back to the user. This will stop all execution. |
54 | 54 | * |
55 | - * @param {String} $str Message to send back to user. |
|
55 | + * @param string $str Message to send back to user. |
|
56 | 56 | */ |
57 | 57 | function throwError($str) { |
58 | 58 | die('{"result":null,"id":null,"error":{"errstr":"' . addslashes($str) . '","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}'); |
@@ -342,6 +342,9 @@ discard block |
||
342 | 342 | return null; |
343 | 343 | } |
344 | 344 | |
345 | + /** |
|
346 | + * @param integer $len |
|
347 | + */ |
|
345 | 348 | function skip($len) { |
346 | 349 | $this->_pos += $len; |
347 | 350 | } |
@@ -369,6 +372,9 @@ discard block |
||
369 | 372 | return $this->readValue($reader); |
370 | 373 | } |
371 | 374 | |
375 | + /** |
|
376 | + * @param Moxiecode_JSONReader $reader |
|
377 | + */ |
|
372 | 378 | function readValue(&$reader) { |
373 | 379 | $this->data = array(); |
374 | 380 | $this->parents = array(); |
@@ -554,6 +560,11 @@ discard block |
||
554 | 560 | return '"' . $input . '"'; |
555 | 561 | } |
556 | 562 | |
563 | + /** |
|
564 | + * @param string $utf8 |
|
565 | + * |
|
566 | + * @return string |
|
567 | + */ |
|
557 | 568 | function _utf82utf16($utf8) { |
558 | 569 | if (function_exists('mb_convert_encoding')) |
559 | 570 | return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); |
@@ -86,6 +86,9 @@ discard block |
||
86 | 86 | return $this->_level; |
87 | 87 | } |
88 | 88 | |
89 | + /** |
|
90 | + * @param string $path |
|
91 | + */ |
|
89 | 92 | function setPath($path) { |
90 | 93 | $this->_path = $path; |
91 | 94 | } |
@@ -102,6 +105,9 @@ discard block |
||
102 | 105 | return $this->_filename; |
103 | 106 | } |
104 | 107 | |
108 | + /** |
|
109 | + * @param string $format |
|
110 | + */ |
|
105 | 111 | function setFormat($format) { |
106 | 112 | $this->_format = $format; |
107 | 113 | } |
@@ -110,6 +116,9 @@ discard block |
||
110 | 116 | return $this->_format; |
111 | 117 | } |
112 | 118 | |
119 | + /** |
|
120 | + * @param string $size |
|
121 | + */ |
|
113 | 122 | function setMaxSize($size) { |
114 | 123 | // Fix log max size |
115 | 124 | $logMaxSizeBytes = intval(preg_replace("/[^0-9]/", "", $size)); |
@@ -130,6 +139,9 @@ discard block |
||
130 | 139 | return $this->_maxSize; |
131 | 140 | } |
132 | 141 | |
142 | + /** |
|
143 | + * @param string $max_files |
|
144 | + */ |
|
133 | 145 | function setMaxFiles($max_files) { |
134 | 146 | $this->_maxFiles = $max_files; |
135 | 147 | } |
@@ -183,6 +195,10 @@ discard block |
||
183 | 195 | return $this->_level >= MC_LOGGER_FATAL; |
184 | 196 | } |
185 | 197 | |
198 | + /** |
|
199 | + * @param integer $level |
|
200 | + * @param string $message |
|
201 | + */ |
|
186 | 202 | function _logMsg($level, $message) { |
187 | 203 | $roll = false; |
188 | 204 |
@@ -94,7 +94,6 @@ discard block |
||
94 | 94 | /** |
95 | 95 | * Adds a file to the concatenation/compression process. |
96 | 96 | * |
97 | - * @param String $path Path to the file to include in the compressed package/output. |
|
98 | 97 | */ |
99 | 98 | public function &addFile($file) { |
100 | 99 | $this->files .= ($this->files ? "," : "") . $file; |
@@ -267,7 +266,7 @@ discard block |
||
267 | 266 | /** |
268 | 267 | * Renders a script tag that loads the TinyMCE script. |
269 | 268 | * |
270 | - * @param Array $settings Name/value array with settings for the script tag. |
|
269 | + * @param Array $tagSettings Name/value array with settings for the script tag. |
|
271 | 270 | * @param Bool $return The script tag is return instead of being output if true |
272 | 271 | * @return String the tag is returned if $return is true |
273 | 272 | */ |
@@ -97,6 +97,9 @@ |
||
97 | 97 | return $return; |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param boolean $index |
|
102 | + */ |
|
100 | 103 | function f($index) { |
101 | 104 | return stripslashes($this->row[$index]); |
102 | 105 | } |
@@ -12,7 +12,6 @@ |
||
12 | 12 | use SilverStripe\ORM\ValidationException; |
13 | 13 | use SilverStripe\ORM\FieldType\DBComposite; |
14 | 14 | use SilverStripe\Security\Permission; |
15 | -use SilverStripe\Core\Convert; |
|
16 | 15 | |
17 | 16 | /** |
18 | 17 | * Represents a file reference stored in a database |
@@ -131,6 +131,9 @@ discard block |
||
131 | 131 | return Injector::inst()->get($className); |
132 | 132 | } |
133 | 133 | |
134 | +/** |
|
135 | + * @return string |
|
136 | + */ |
|
134 | 137 | function project() { |
135 | 138 | global $project; |
136 | 139 | return $project; |
@@ -154,7 +157,7 @@ discard block |
||
154 | 157 | * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()}, |
155 | 158 | * and defaults to the 'memory_limit' setting in the PHP configuration. |
156 | 159 | * |
157 | - * @param string|int $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
160 | + * @param integer $memoryLimit A memory limit string, such as "64M". If omitted, unlimited memory will be set. |
|
158 | 161 | * @return Boolean TRUE indicates a successful change, FALSE a denied change. |
159 | 162 | */ |
160 | 163 | function increase_memory_limit_to($memoryLimit = -1) { |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | use SilverStripe\Core\Convert; |
4 | -use SilverStripe\Core\Config\Config; |
|
5 | 4 | use SilverStripe\Dev\SapphireTest; |
6 | 5 | use SilverStripe\View\Parsers\URLSegmentFilter; |
7 | 6 |
@@ -132,7 +132,7 @@ |
||
132 | 132 | * @param mixed $returnVal |
133 | 133 | * @param bool $ignoreAjax |
134 | 134 | * @param array $ignoredFunctions |
135 | - * @return mixed |
|
135 | + * @return string|null |
|
136 | 136 | */ |
137 | 137 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) |
138 | 138 | { |