Completed
Pull Request — master (#6045)
by Sam
11:26
created
ORM/FieldType/DBCurrency.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -23,6 +23,9 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	private static $currency_symbol = '$';
25 25
 
26
+	/**
27
+	 * @param string $name
28
+	 */
26 29
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
27 30
 		parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
28 31
 	}
@@ -46,6 +49,9 @@  discard block
 block discarded – undo
46 49
 		else return $val;
47 50
 	}
48 51
 
52
+	/**
53
+	 * @param string $value
54
+	 */
49 55
 	public function setValue($value, $record = null, $markChanged = true) {
50 56
 		$matches = null;
51 57
 		if(is_numeric($value)) {
Please login to merge, or discard this patch.
ORM/FieldType/DBDatetime.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 	 * Return a date and time formatted as per a CMS user's settings.
109 109
 	 *
110 110
 	 * @param Member $member
111
-	 * @return boolean | string A time and date pair formatted as per user-defined settings.
111
+	 * @return false|string | string A time and date pair formatted as per user-defined settings.
112 112
 	 */
113 113
 	public function FormatFromSettings($member = null) {
114 114
 		require_once 'Zend/Date.php';
Please login to merge, or discard this patch.
ORM/FieldType/DBPrimaryKey.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@
 block discarded – undo
20 20
 	 */
21 21
 	protected $autoIncrement = true;
22 22
 
23
+	/**
24
+	 * @param boolean $autoIncrement
25
+	 */
23 26
 	public function setAutoIncrement($autoIncrement) {
24 27
 		$this->autoIncrement = $autoIncrement;
25 28
 		return $this;
Please login to merge, or discard this patch.
ORM/FieldType/DBTime.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -55,6 +55,9 @@
 block discarded – undo
55 55
 		if($this->value) return date($format, strtotime($this->value));
56 56
 	}
57 57
 
58
+	/**
59
+	 * @param string[] $parts
60
+	 */
58 61
 	public function TwelveHour( $parts ) {
59 62
 		$hour = $parts[1];
60 63
 		$min = $parts[2];
Please login to merge, or discard this patch.
ORM/FieldType/DBYear.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -18,6 +18,9 @@
 block discarded – undo
18 18
 		DB::require_field($this->tableName, $this->name, $values);
19 19
 	}
20 20
 
21
+	/**
22
+	 * @param string $title
23
+	 */
21 24
 	public function scaffoldFormField($title = null, $params = null) {
22 25
 		$selectBox = new DropdownField($this->name, $title);
23 26
 		$selectBox->setSource($this->getDefaultOptions());
Please login to merge, or discard this patch.
ORM/Map.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -41,6 +41,7 @@  discard block
 block discarded – undo
41 41
 	 * Set the key field for this map.
42 42
 	 *
43 43
 	 * @var string $keyField
44
+	 * @param string $keyField
44 45
 	 */
45 46
 	public function setKeyField($keyField) {
46 47
 		$this->keyField = $keyField;
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
 	 * Set the value field for this map.
51 52
 	 *
52 53
 	 * @var string $valueField
54
+	 * @param string $valueField
53 55
 	 */
54 56
 	public function setValueField($valueField) {
55 57
 		$this->valueField = $valueField;
@@ -95,6 +97,7 @@  discard block
 block discarded – undo
95 97
 	 *
96 98
 	 * @var string $key
97 99
 	 * @var mixed $value
100
+	 * @param string $value
98 101
 	 */
99 102
 	public function unshift($key, $value) {
100 103
 		$oldItems = $this->firstItems;
@@ -114,6 +117,7 @@  discard block
 block discarded – undo
114 117
 	 *
115 118
 	 * @var string $key
116 119
 	 * @var mixed $value
120
+	 * @param string $value
117 121
 	 */
118 122
 	public function push($key, $value) {
119 123
 		$oldItems = $this->lastItems;
Please login to merge, or discard this patch.
ORM/Queries/SQLConditionalExpression.php 1 patch
Doc Comments   -4 removed lines patch added patch discarded remove patch
@@ -374,7 +374,6 @@  discard block
 block discarded – undo
374 374
 	 * @see SQLConditionalExpression::addWhere() for syntax examples
375 375
 	 *
376 376
 	 * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries
377
-	 * @param mixed $where,... Unlimited additional predicates
378 377
 	 * @return self Self reference
379 378
 	 */
380 379
 	public function setWhere($where) {
@@ -460,7 +459,6 @@  discard block
 block discarded – undo
460 459
 	 * </code>
461 460
 	 *
462 461
 	 * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries
463
-	 * @param mixed $where,... Unlimited additional predicates
464 462
 	 * @return self Self reference
465 463
 	 */
466 464
 	public function addWhere($where) {
@@ -476,7 +474,6 @@  discard block
 block discarded – undo
476 474
 	 * @see SQLConditionalExpression::addWhere()
477 475
 	 *
478 476
 	 * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries
479
-	 * @param mixed $filters,... Unlimited additional predicates
480 477
 	 * @return self Self reference
481 478
 	 */
482 479
 	public function setWhereAny($filters) {
@@ -490,7 +487,6 @@  discard block
 block discarded – undo
490 487
 	 * @see SQLConditionalExpression::addWhere()
491 488
 	 *
492 489
 	 * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries
493
-	 * @param mixed $filters,... Unlimited additional predicates
494 490
 	 * @return self Self reference
495 491
 	 */
496 492
 	public function addWhereAny($filters) {
Please login to merge, or discard this patch.
tests/i18n/i18nTextCollectorTest.php 1 patch
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -843,6 +843,10 @@  discard block
 block discarded – undo
843 843
  * Assist with testing of specific protected methods
844 844
  */
845 845
 class i18nTextCollectorTest_Collector extends i18nTextCollector implements TestOnly {
846
+
847
+	/**
848
+	 * @param string $directory
849
+	 */
846 850
 	public function getModules_Test($directory) {
847 851
 		return $this->getModules($directory);
848 852
 	}
@@ -851,6 +855,9 @@  discard block
 block discarded – undo
851 855
 		return $this->resolveDuplicateConflicts($entitiesByModule);
852 856
 	}
853 857
 
858
+	/**
859
+	 * @param string $module
860
+	 */
854 861
 	public function getFileListForModule_Test($module) {
855 862
 		return $this->getFileListForModule($module);
856 863
 	}
@@ -859,6 +866,9 @@  discard block
 block discarded – undo
859 866
 		return $this->getConflicts($entitiesByModule);
860 867
 	}
861 868
 
869
+	/**
870
+	 * @param string $class
871
+	 */
862 872
 	public function findModuleForClass_Test($class) {
863 873
 		return $this->findModuleForClass($class);
864 874
 	}
Please login to merge, or discard this patch.
tests/model/VersionedOwnershipTest.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 	/**
731 731
 	 * All custom objects with the same number. E.g. 'Page 1' owns 'Custom 1'
732 732
 	 *
733
-	 * @return DataList
733
+	 * @return SilverStripe\ORM\DataList
734 734
 	 */
735 735
 	public function Custom() {
736 736
 		$title = str_replace('Page', 'Custom', $this->Title);
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 	/**
785 785
 	 * All pages with the same number. E.g. 'Page 1' owns 'Custom 1'
786 786
 	 *
787
-	 * @return DataList
787
+	 * @return SilverStripe\ORM\DataList
788 788
 	 */
789 789
 	public function Pages() {
790 790
 		$title = str_replace('Custom', 'Page', $this->Title);
Please login to merge, or discard this patch.