Completed
Pull Request — master (#5886)
by Damian
11:53
created
ORM/Queries/SQLSelect.php 1 patch
Doc Comments   +2 added lines, -5 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	/**
62 62
 	 * Construct a new SQLSelect.
63 63
 	 *
64
-	 * @param array|string $select An array of SELECT fields.
64
+	 * @param string $select An array of SELECT fields.
65 65
 	 * @param array|string $from An array of FROM clauses. The first one should be just the table name.
66 66
 	 * Each should be ANSI quoted.
67 67
 	 * @param array $where An array of WHERE clauses.
@@ -115,7 +115,6 @@  discard block
 block discarded – undo
115 115
 	 * </code>
116 116
 	 *
117 117
 	 * @param string|array $fields Field names should be ANSI SQL quoted. Array keys should be unquoted.
118
-	 * @param boolean $clear Clear existing select fields?
119 118
 	 * @return $this Self reference
120 119
 	 */
121 120
 	public function setSelect($fields) {
@@ -352,7 +351,7 @@  discard block
 block discarded – undo
352 351
 	 *
353 352
 	 * @param string $value
354 353
 	 * @param string $defaultDirection
355
-	 * @return array A two element array: array($column, $direction)
354
+	 * @return string[] A two element array: array($column, $direction)
356 355
 	 */
357 356
 	private function getDirectionFromString($value, $defaultDirection = null) {
358 357
 		if(preg_match('/^(.*)(asc|desc)$/i', $value, $matches)) {
@@ -447,7 +446,6 @@  discard block
 block discarded – undo
447 446
 	 * @see SQLSelect::addWhere() for syntax examples
448 447
 	 *
449 448
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
450
-	 * @param mixed $having,... Unlimited additional predicates
451 449
 	 * @return self Self reference
452 450
 	 */
453 451
 	public function setHaving($having) {
@@ -462,7 +460,6 @@  discard block
 block discarded – undo
462 460
 	 * @see SQLSelect::addWhere() for syntax examples
463 461
 	 *
464 462
 	 * @param mixed $having Predicate(s) to set, as escaped SQL statements or paramaterised queries
465
-	 * @param mixed $having,... Unlimited additional predicates
466 463
 	 * @return self Self reference
467 464
 	 */
468 465
 	public function addHaving($having) {
Please login to merge, or discard this patch.
ORM/UnsavedRelationList.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * Add a number of items to the relation.
147 147
 	 *
148 148
 	 * @param array $items Items to add, as either DataObjects or IDs.
149
-	 * @return DataList
149
+	 * @return UnsavedRelationList
150 150
 	 */
151 151
 	public function addMany($items) {
152 152
 		foreach($items as $item) {
Please login to merge, or discard this patch.
ORM/ValidationResult.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -21,6 +21,7 @@
 block discarded – undo
21 21
 	/**
22 22
 	 * Create a new ValidationResult.
23 23
 	 * By default, it is a successful result.	Call $this->error() to record errors.
24
+	 * @param string $message
24 25
 	 */
25 26
 	public function __construct($valid = true, $message = null) {
26 27
 		$this->isValid = $valid;
Please login to merge, or discard this patch.
ORM/Versioning/DataDifferencer.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -47,6 +47,7 @@
 block discarded – undo
47 47
 	 *
48 48
 	 * @param DataObject (Optional)
49 49
 	 * @param DataObject
50
+	 * @param DataObject|null $fromRecord
50 51
 	 */
51 52
 	public function __construct($fromRecord, DataObject $toRecord) {
52 53
 		if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING);
Please login to merge, or discard this patch.
ORM/Versioning/VersionedGridFieldItemRequest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
      *
83 83
      * @param array $data
84 84
      * @param Form $form
85
-	 * @return SS_HTTPResponse
85
+	 * @return \SS_HTTPResponse|null
86 86
      */
87 87
 	public function doArchive($data, $form) {
88 88
 		$record = $this->getRecord();
Please login to merge, or discard this patch.
parsers/HTML/HTMLValue.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 	/**
145 145
 	 * Make an xpath query against this HTML
146 146
 	 *
147
-	 * @param $query string - The xpath query string
147
+	 * @param string $query string - The xpath query string
148 148
 	 * @return DOMNodeList
149 149
 	 */
150 150
 	public function query($query) {
Please login to merge, or discard this patch.
search/SearchContext.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@
 block discarded – undo
179 179
 	 * @param array $searchParams
180 180
 	 * @param array|bool|string $sort
181 181
 	 * @param array|bool|string $limit
182
-	 * @return SS_List
182
+	 * @return DataList
183 183
 	 * @throws Exception
184 184
 	 */
185 185
 	public function getResults($searchParams, $sort = false, $limit = false) {
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.