Completed
Pull Request — master (#5418)
by Damian
49:31 queued 37:38
created
core/startup/ErrorControlChain.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 	 * Add this callback to the chain of callbacks to call along with the state
89 89
 	 * that $error must be in this point in the chain for the callback to be called
90 90
 	 *
91
-	 * @param $callback - The callback to call
91
+	 * @param callable $callback - The callback to call
92 92
 	 * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either
93 93
 	 * @return $this
94 94
 	 */
Please login to merge, or discard this patch.
forms/gridfield/GridField.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 *
200 200
 	 * @todo refactor this into GridFieldComponent
201 201
 	 *
202
-	 * @param mixed $value
202
+	 * @param string $value
203 203
 	 * @param string|array $castingDefinition
204 204
 	 *
205 205
 	 * @return mixed
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 	 *
287 287
 	 * @param array $properties
288 288
 	 *
289
-	 * @return HTMLText
289
+	 * @return DBField
290 290
 	 */
291 291
 	public function FieldHolder($properties = array()) {
292 292
 		Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
 	/**
601 601
 	 * @param array $properties
602 602
 	 *
603
-	 * @return HTMLText
603
+	 * @return DBField
604 604
 	 */
605 605
 	public function Field($properties = array()) {
606 606
 		$this->extend('onBeforeRender', $this);
Please login to merge, or discard this patch.
model/ArrayList.php 1 patch
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 	 *
380 380
 	 * Note that columns may be double quoted as per ANSI sql standard
381 381
 	 *
382
-	 * @return DataList
382
+	 * @return ArrayList
383 383
 	 * @see SS_List::sort()
384 384
 	 * @example $list->sort('Name'); // default ASC sorting
385 385
 	 * @example $list->sort('Name DESC'); // DESC sorting
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 	 *          $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43)));
516 516
 	 *
517 517
 	 * @param string|array See {@link filter()}
518
-	 * @return DataList
518
+	 * @return ArrayList
519 519
 	 */
520 520
 	public function filterAny() {
521 521
 		$keepUs = call_user_func_array(array($this, 'normaliseFilterArgs'), func_get_args());
@@ -582,6 +582,9 @@  discard block
 block discarded – undo
582 582
 		return $this->filter('ID', $ids);
583 583
 	}
584 584
 
585
+	/**
586
+	 * @param integer $id
587
+	 */
585 588
 	public function byID($id) {
586 589
 		$firstElement = $this->filter("ID", $id)->first();
587 590
 
@@ -666,7 +669,6 @@  discard block
 block discarded – undo
666 669
 	/**
667 670
 	 * Returns whether an item with $key exists
668 671
 	 *
669
-	 * @param mixed $key
670 672
 	 * @return bool
671 673
 	 */
672 674
 	public function offsetExists($offset) {
@@ -676,7 +678,6 @@  discard block
 block discarded – undo
676 678
 	/**
677 679
 	 * Returns item stored in list with index $key
678 680
 	 *
679
-	 * @param mixed $key
680 681
 	 * @return DataObject
681 682
 	 */
682 683
 	public function offsetGet($offset) {
@@ -686,7 +687,6 @@  discard block
 block discarded – undo
686 687
 	/**
687 688
 	 * Set an item with the key in $key
688 689
 	 *
689
-	 * @param mixed $key
690 690
 	 * @param mixed $value
691 691
 	 */
692 692
 	public function offsetSet($offset, $value) {
@@ -700,7 +700,6 @@  discard block
 block discarded – undo
700 700
 	/**
701 701
 	 * Unset an item with the key in $key
702 702
 	 *
703
-	 * @param mixed $key
704 703
 	 */
705 704
 	public function offsetUnset($offset) {
706 705
 		unset($this->items[$offset]);
Please login to merge, or discard this patch.
oembed/Oembed.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,6 +46,7 @@  discard block
 block discarded – undo
46 46
 	 *
47 47
 	 * @param $url Human-readable URL.
48 48
 	 * @returns string/bool URL of an endpoint, or false if no matching provider exists.
49
+	 * @return string
49 50
 	 */
50 51
 	protected static function find_endpoint($url) {
51 52
 		foreach(self::get_providers() as $scheme=>$endpoint) {
@@ -117,7 +118,7 @@  discard block
 block discarded – undo
117 118
 	 * Given a response body, determine if there is an autodiscover url
118 119
 	 *
119 120
 	 * @param string $body
120
-	 * @return bool|string
121
+	 * @return string|false
121 122
 	 */
122 123
 	public static function autodiscover_from_body($body) {
123 124
 		// Look within the body for an oembed link.
@@ -355,6 +356,7 @@  discard block
 block discarded – undo
355 356
 
356 357
 	/**
357 358
 	 * Wrap the check for looking into Oembed JSON within $this->data.
359
+	 * @param string $field
358 360
 	 */
359 361
 	public function hasField($field) {
360 362
 		$this->loadData();
Please login to merge, or discard this patch.