@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | |
60 | 60 | // -- Public Static Methods -------------------------------------------------- |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $js |
|
64 | + */ |
|
62 | 65 | public static function minify($js) { |
63 | 66 | $jsmin = new JSMin($js); |
64 | 67 | return $jsmin->min(); |
@@ -82,6 +85,10 @@ discard block |
||
82 | 85 | action treats a string as a single character. Wow! |
83 | 86 | action recognizes a regular expression if it is preceded by ( or , or =. |
84 | 87 | */ |
88 | + |
|
89 | + /** |
|
90 | + * @param integer $d |
|
91 | + */ |
|
85 | 92 | protected function action($d) { |
86 | 93 | switch($d) { |
87 | 94 | case 1: |
@@ -160,6 +167,9 @@ discard block |
||
160 | 167 | } |
161 | 168 | } |
162 | 169 | |
170 | + /** |
|
171 | + * @return string |
|
172 | + */ |
|
163 | 173 | protected function get() { |
164 | 174 | $c = $this->lookAhead; |
165 | 175 | $this->lookAhead = null; |
@@ -187,6 +197,10 @@ discard block |
||
187 | 197 | /* isAlphanum -- return true if the character is a letter, digit, underscore, |
188 | 198 | dollar sign, or non-ASCII character. |
189 | 199 | */ |
200 | + |
|
201 | + /** |
|
202 | + * @param string $c |
|
203 | + */ |
|
190 | 204 | protected function isAlphaNum($c) { |
191 | 205 | return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
192 | 206 | } |
@@ -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; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | - * @return null|int |
|
50 | + * @return integer |
|
51 | 51 | */ |
52 | 52 | public function getMaxLength() { |
53 | 53 | return $this->maxLength; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
76 | - * @return string |
|
76 | + * @return DBHTMLText |
|
77 | 77 | */ |
78 | 78 | public function InternallyLabelledField() { |
79 | 79 | Deprecation::notice('4.0', 'Please use ->setValue() instead'); |