@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * |
81 | 81 | * Get the backend-specific resource handling the manipulations. Replaces Image::getGD() |
82 | 82 | * |
83 | - * @return mixed |
|
83 | + * @return ImagickBackend |
|
84 | 84 | */ |
85 | 85 | public function getImageResource() { |
86 | 86 | return $this; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * |
112 | 112 | * @param int $width |
113 | 113 | * @param int $height |
114 | - * @return Image_Backend |
|
114 | + * @return null|ImagickBackend |
|
115 | 115 | */ |
116 | 116 | public function resize($width, $height) { |
117 | 117 | if(!$this->valid()) return; |
@@ -141,9 +141,9 @@ discard block |
||
141 | 141 | /** |
142 | 142 | * resizeRatio |
143 | 143 | * |
144 | - * @param int $width |
|
145 | - * @param int $height |
|
146 | - * @return Image_Backend |
|
144 | + * @param integer $maxWidth |
|
145 | + * @param integer $maxHeight |
|
146 | + * @return null|ImagickBackend |
|
147 | 147 | */ |
148 | 148 | public function resizeRatio($maxWidth, $maxHeight, $useAsMinimum = false) { |
149 | 149 | if(!$this->valid()) return; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | * resizeByWidth |
164 | 164 | * |
165 | 165 | * @param int $width |
166 | - * @return Image_Backend |
|
166 | + * @return null|ImagickBackend |
|
167 | 167 | */ |
168 | 168 | public function resizeByWidth($width) { |
169 | 169 | if(!$this->valid()) return; |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | * resizeByHeight |
179 | 179 | * |
180 | 180 | * @param int $height |
181 | - * @return Image_Backend |
|
181 | + * @return null|ImagickBackend |
|
182 | 182 | */ |
183 | 183 | public function resizeByHeight($height) { |
184 | 184 | if(!$this->valid()) return; |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * |
195 | 195 | * @param int $width |
196 | 196 | * @param int $height |
197 | - * @return Image_Backend |
|
197 | + * @return null|ImagickBackend |
|
198 | 198 | */ |
199 | 199 | public function paddedResize($width, $height, $backgroundColor = "FFFFFF") { |
200 | 200 | $new = $this->resizeRatio($width, $height); |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | * |
212 | 212 | * @param int $width |
213 | 213 | * @param int $height |
214 | - * @return Image_Backend |
|
214 | + * @return null|ImagickBackend |
|
215 | 215 | */ |
216 | 216 | public function croppedResize($width, $height) { |
217 | 217 | if(!$this->valid()) return; |
@@ -90,6 +90,10 @@ discard block |
||
90 | 90 | */ |
91 | 91 | protected $valueObj = null; |
92 | 92 | |
93 | + /** |
|
94 | + * @param string $name |
|
95 | + * @param string $title |
|
96 | + */ |
|
93 | 97 | public function __construct($name, $title = null, $value = null) { |
94 | 98 | if(!$this->locale) { |
95 | 99 | $this->locale = i18n::get_locale(); |
@@ -288,6 +292,9 @@ discard block |
||
288 | 292 | return $field; |
289 | 293 | } |
290 | 294 | |
295 | + /** |
|
296 | + * @param string $class |
|
297 | + */ |
|
291 | 298 | public function castedCopy($class) { |
292 | 299 | $copy = new $class($this->name); |
293 | 300 | if($copy->hasMethod('setConfig')) { |
@@ -326,7 +333,7 @@ discard block |
||
326 | 333 | * @deprecated 4.0 Use the "DateField.default_config" config setting instead |
327 | 334 | * @param String $k |
328 | 335 | * @param mixed $v |
329 | - * @return boolean |
|
336 | + * @return boolean|null |
|
330 | 337 | */ |
331 | 338 | public static function set_default_config($k, $v) { |
332 | 339 | Deprecation::notice('4.0', 'Use the "DateField.default_config" config setting instead'); |
@@ -532,6 +532,7 @@ discard block |
||
532 | 532 | * |
533 | 533 | * Caution: this doesn't work on all fields, see {@link setAttribute()}. |
534 | 534 | * |
535 | + * @param string $name |
|
535 | 536 | * @return null|string |
536 | 537 | */ |
537 | 538 | public function getAttribute($name) { |
@@ -643,7 +644,6 @@ discard block |
||
643 | 644 | * Set the field value. |
644 | 645 | * |
645 | 646 | * @param mixed $value |
646 | - * @param null|array|DataObject $data {@see Form::loadDataFrom} |
|
647 | 647 | * |
648 | 648 | * @return $this |
649 | 649 | */ |
@@ -1185,7 +1185,7 @@ discard block |
||
1185 | 1185 | * |
1186 | 1186 | * @param FieldList $containerFieldList |
1187 | 1187 | * |
1188 | - * @return FieldList |
|
1188 | + * @return FormField |
|
1189 | 1189 | */ |
1190 | 1190 | public function setContainerFieldList($containerFieldList) { |
1191 | 1191 | $this->containerFieldList = $containerFieldList; |
@@ -164,6 +164,7 @@ discard block |
||
164 | 164 | |
165 | 165 | /** |
166 | 166 | * @param String |
167 | + * @param string $class |
|
167 | 168 | */ |
168 | 169 | public function setItemRequestClass($class) { |
169 | 170 | $this->itemRequestClass = $class; |
@@ -271,6 +272,9 @@ discard block |
||
271 | 272 | parent::__construct(); |
272 | 273 | } |
273 | 274 | |
275 | + /** |
|
276 | + * @param string $action |
|
277 | + */ |
|
274 | 278 | public function Link($action = null) { |
275 | 279 | return Controller::join_links($this->gridField->Link('item'), |
276 | 280 | $this->record->ID ? $this->record->ID : 'new', $action); |
@@ -299,6 +303,9 @@ discard block |
||
299 | 303 | } |
300 | 304 | } |
301 | 305 | |
306 | + /** |
|
307 | + * @param SS_HTTPRequest $request |
|
308 | + */ |
|
302 | 309 | public function edit($request) { |
303 | 310 | $controller = $this->getToplevelController(); |
304 | 311 | $form = $this->ItemEditForm($this->gridField, $request); |
@@ -89,6 +89,7 @@ |
||
89 | 89 | * Determines if the field should render open or closed by default. |
90 | 90 | * |
91 | 91 | * @param boolean |
92 | + * @param boolean $bool |
|
92 | 93 | */ |
93 | 94 | public function startClosed($bool) { |
94 | 95 | ($bool) ? $this->addExtraClass('startClosed') : $this->removeExtraClass('startClosed'); |
@@ -152,7 +152,7 @@ |
||
152 | 152 | /** |
153 | 153 | * Returns the timestamp of the time that the database was last built |
154 | 154 | * |
155 | - * @return string Returns the timestamp of the time that the database was |
|
155 | + * @return integer|null Returns the timestamp of the time that the database was |
|
156 | 156 | * last built |
157 | 157 | */ |
158 | 158 | public static function lastBuilt() { |
@@ -236,6 +236,8 @@ discard block |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
239 | + * @param string $currency |
|
240 | + * @param string $locale |
|
239 | 241 | * @return string |
240 | 242 | */ |
241 | 243 | public function getSymbol($currency = null, $locale = null) { |
@@ -247,6 +249,8 @@ discard block |
||
247 | 249 | } |
248 | 250 | |
249 | 251 | /** |
252 | + * @param string $currency |
|
253 | + * @param string $locale |
|
250 | 254 | * @return string |
251 | 255 | */ |
252 | 256 | public function getShortName($currency = null, $locale = null) { |
@@ -257,6 +261,8 @@ discard block |
||
257 | 261 | } |
258 | 262 | |
259 | 263 | /** |
264 | + * @param string $currency |
|
265 | + * @param string $locale |
|
260 | 266 | * @return string |
261 | 267 | */ |
262 | 268 | public function getName($currency = null, $locale = null) { |
@@ -17,7 +17,7 @@ |
||
17 | 17 | |
18 | 18 | /** |
19 | 19 | * @param string $name |
20 | - * @param DataOject $object The object that this is primary key for (should have a relation with $name) |
|
20 | + * @param DataObject $object The object that this is primary key for (should have a relation with $name) |
|
21 | 21 | */ |
22 | 22 | public function __construct($name = null, $object) { |
23 | 23 | $this->object = $object; |
@@ -71,8 +71,8 @@ |
||
71 | 71 | /** |
72 | 72 | * resizeRatio |
73 | 73 | * |
74 | - * @param int $width |
|
75 | - * @param int $height |
|
74 | + * @param integer $maxWidth |
|
75 | + * @param integer $maxHeight |
|
76 | 76 | * @return Image_Backend |
77 | 77 | */ |
78 | 78 | public function resizeRatio($maxWidth, $maxHeight, $useAsMinimum = false); |