Completed
Pull Request — 3.7 (#8242)
by Sam
09:16
created
dev/Deprecation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 * greater than or equal to this version, a message will be raised
73 73
 	 *
74 74
 	 * @static
75
-	 * @param $ver string -
75
+	 * @param string|null $ver string -
76 76
 	 *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
77 77
 	 * @param null $forModule string -
78 78
 	 *    The name of a module. The passed version will be used as the check value for
Please login to merge, or discard this patch.
forms/DateField.php 1 patch
Doc Comments   +8 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,6 +90,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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');
Please login to merge, or discard this patch.
forms/Form.php 1 patch
Doc Comments   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
 	/**
533 533
 	 * Fields can have action to, let's check if anyone of the responds to $funcname them
534 534
 	 *
535
-	 * @param SS_List|array $fields
535
+	 * @param FieldList|null $fields
536 536
 	 * @param callable $funcName
537 537
 	 * @return FormField
538 538
 	 */
@@ -791,6 +791,7 @@  discard block
 block discarded – undo
791 791
 	}
792 792
 
793 793
 	/**
794
+	 * @param string $name
794 795
 	 * @return string $name
795 796
 	 */
796 797
 	public function getAttribute($name) {
@@ -825,6 +826,7 @@  discard block
 block discarded – undo
825 826
 	 *
826 827
 	 * @param array Custom attributes to process. Falls back to {@link getAttributes()}.
827 828
 	 * If at least one argument is passed as a string, all arguments act as excludes by name.
829
+	 * @param string $attrs
828 830
 	 *
829 831
 	 * @return string HTML attributes, ready for insertion into an HTML tag
830 832
 	 */
@@ -1032,7 +1034,7 @@  discard block
 block discarded – undo
1032 1034
 	 * If set to false (the default), then the form method is only used to construct the default
1033 1035
 	 * form.
1034 1036
 	 *
1035
-	 * @param $bool boolean
1037
+	 * @param boolean $bool boolean
1036 1038
 	 * @return $this
1037 1039
 	 */
1038 1040
 	public function setStrictFormMethodCheck($bool) {
@@ -1529,7 +1531,7 @@  discard block
 block discarded – undo
1529 1531
 	 * This is returned when you access a form as $FormObject rather
1530 1532
 	 * than <% with FormObject %>
1531 1533
 	 *
1532
-	 * @return HTML
1534
+	 * @return HTMLText
1533 1535
 	 */
1534 1536
 	public function forTemplate() {
1535 1537
 		$return = $this->renderWith(array_merge(
@@ -1549,7 +1551,7 @@  discard block
 block discarded – undo
1549 1551
 	 * It triggers slightly different behaviour, such as disabling the rewriting
1550 1552
 	 * of # links.
1551 1553
 	 *
1552
-	 * @return HTML
1554
+	 * @return HTMLText
1553 1555
 	 */
1554 1556
 	public function forAjaxTemplate() {
1555 1557
 		$view = new SSViewer(array(
@@ -1572,7 +1574,7 @@  discard block
 block discarded – undo
1572 1574
 	 * and _form_enctype.  These are the attributes of the form.  These fields
1573 1575
 	 * can be used to send the form to Ajax.
1574 1576
 	 *
1575
-	 * @return HTML
1577
+	 * @return string
1576 1578
 	 */
1577 1579
 	public function formHtmlContent() {
1578 1580
 		$this->IncludeFormTag = false;
@@ -1830,6 +1832,9 @@  discard block
 block discarded – undo
1830 1832
 
1831 1833
 	protected $form;
1832 1834
 
1835
+	/**
1836
+	 * @param Form $form
1837
+	 */
1833 1838
 	public function __construct($form) {
1834 1839
 		$this->form = $form;
1835 1840
 		parent::__construct();
Please login to merge, or discard this patch.
forms/gridfield/GridFieldDetailForm.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -164,6 +164,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
model/DatabaseAdmin.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
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() {
Please login to merge, or discard this patch.
model/DB.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -217,9 +217,8 @@  discard block
 block discarded – undo
217 217
 	 * Given the database configuration, this method will create the correct
218 218
 	 * subclass of {@link SS_Database}.
219 219
 	 *
220
-	 * @param array $database A map of options. The 'type' is the name of the subclass of SS_Database to use. For the
220
+	 * @param array $databaseConfig A map of options. The 'type' is the name of the subclass of SS_Database to use. For the
221 221
 	 *                        rest of the options, see the specific class.
222
-	 * @param string $name identifier for the connection
223 222
 	 *
224 223
 	 * @return SS_Database
225 224
 	 */
@@ -413,7 +412,7 @@  discard block
 block discarded – undo
413 412
 
414 413
 	/**
415 414
 	 * Create a new table.
416
-	 * @param string $tableName The name of the table
415
+	 * @param string $table The name of the table
417 416
 	 * @param array$fields A map of field names to field types
418 417
 	 * @param array $indexes A map of indexes
419 418
 	 * @param array $options An map of additional options.  The available keys are as follows:
@@ -500,6 +499,8 @@  discard block
 block discarded – undo
500 499
 
501 500
 	/**
502 501
 	 * @deprecated since version 4.0 Use DB::require_field instead
502
+	 * @param string $field
503
+	 * @param string $spec
503 504
 	 */
504 505
 	public static function requireField($table, $field, $spec) {
505 506
 		Deprecation::notice('4.0', 'Use DB::require_field instead');
@@ -563,7 +564,7 @@  discard block
 block discarded – undo
563 564
 	/**
564 565
 	 * Checks a table's integrity and repairs it if necessary.
565 566
 	 *
566
-	 * @param string $tableName The name of the table.
567
+	 * @param string $table The name of the table.
567 568
 	 * @return boolean Return true if the table has integrity after the method is complete.
568 569
 	 */
569 570
 	public static function check_and_repair_table($table) {
Please login to merge, or discard this patch.
model/fieldtypes/Money.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -236,6 +236,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
model/fieldtypes/PrimaryKey.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
model/Image_Backend.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,8 +71,8 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.