Completed
Pull Request — master (#5433)
by Sam
18:10 queued 05:47
created
admin/code/CampaignAdmin.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@
 block discarded – undo
331 331
 	/**
332 332
 	 * Gets viewable list of campaigns
333 333
 	 *
334
-	 * @return SS_List
334
+	 * @return SilverStripe\Model\ArrayList
335 335
 	 */
336 336
 	protected function getListItems() {
337 337
 		return ChangeSet::get()
Please login to merge, or discard this patch.
filesystem/FileMigrationHelper.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
 	/**
89 89
 	 * Get list of File dataobjects to import
90 90
 	 *
91
-	 * @return DataList
91
+	 * @return SilverStripe\Model\DataList
92 92
 	 */
93 93
 	protected function getFileQuery() {
94 94
 		// Select all records which have a Filename value, but not FileFilename.
Please login to merge, or discard this patch.
forms/gridfield/GridField.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	}
193 193
 
194 194
 	/**
195
-	 * @return ArrayList
195
+	 * @return SilverStripe\Model\ArrayList
196 196
 	 */
197 197
 	public function getComponents() {
198 198
 		return $this->config->getComponents();
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 	 *
204 204
 	 * @todo refactor this into GridFieldComponent
205 205
 	 *
206
-	 * @param mixed $value
206
+	 * @param string $value
207 207
 	 * @param string|array $castingDefinition
208 208
 	 *
209 209
 	 * @return mixed
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	 *
291 291
 	 * @param array $properties
292 292
 	 *
293
-	 * @return HTMLText
293
+	 * @return DBField
294 294
 	 */
295 295
 	public function FieldHolder($properties = array()) {
296 296
 		Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 	/**
605 605
 	 * @param array $properties
606 606
 	 *
607
-	 * @return HTMLText
607
+	 * @return DBField
608 608
 	 */
609 609
 	public function Field($properties = array()) {
610 610
 		$this->extend('onBeforeRender', $this);
Please login to merge, or discard this patch.
model/connect/MySQLStatement.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,8 +78,8 @@
 block discarded – undo
78 78
 
79 79
 	/**
80 80
 	 * Hook the result-set given into a Query class, suitable for use by SilverStripe.
81
-	 * @param mysqli_stmt $statement The related statement, if present
82
-	 * @param mysqli_result $metadata The metadata for this statement
81
+	 * @param \mysqli_stmt $statement The related statement, if present
82
+	 * @param \mysqli_result $metadata The metadata for this statement
83 83
 	 */
84 84
 	public function __construct($statement, $metadata) {
85 85
 		$this->statement = $statement;
Please login to merge, or discard this patch.
model/versioning/ChangeSetItem.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 * Find version of this object in the given stage
133 133
 	 *
134 134
 	 * @param string $stage
135
-	 * @return Versioned|DataObject
135
+	 * @return DataObject|null
136 136
 	 */
137 137
 	protected function getObjectInStage($stage) {
138 138
 		return Versioned::get_by_stage($this->ObjectClass, $stage)->byID($this->ObjectID);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	/**
142 142
 	 * Find latest version of this object
143 143
 	 *
144
-	 * @return Versioned|DataObject
144
+	 * @return DataObject|null
145 145
 	 */
146 146
 	protected function getObjectLatestVersion() {
147 147
 		return Versioned::get_latest_version($this->ObjectClass, $this->ObjectID);
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 	 * Get the ChangeSetItems that reference a passed DataObject
326 326
 	 *
327 327
 	 * @param DataObject $object
328
-	 * @return DataList
328
+	 * @return SilverStripe\Model\DataList
329 329
 	 */
330 330
 	public static function get_for_object($object) {
331 331
 		return ChangeSetItem::get()->filter([
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 *
340 340
 	 * @param int $objectID The ID of the object
341 341
 	 * @param string $objectClass The class of the object (or any parent class)
342
-	 * @return DataList
342
+	 * @return SilverStripe\Model\DataList
343 343
 	 */
344 344
 	public static function get_for_object_by_id($objectID, $objectClass) {
345 345
 		return ChangeSetItem::get()->filter([
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
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
 	/**
729 729
 	 * All custom objects with the same number. E.g. 'Page 1' owns 'Custom 1'
730 730
 	 *
731
-	 * @return DataList
731
+	 * @return SilverStripe\Model\DataList
732 732
 	 */
733 733
 	public function Custom() {
734 734
 		$title = str_replace('Page', 'Custom', $this->Title);
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 	/**
783 783
 	 * All pages with the same number. E.g. 'Page 1' owns 'Custom 1'
784 784
 	 *
785
-	 * @return DataList
785
+	 * @return SilverStripe\Model\DataList
786 786
 	 */
787 787
 	public function Pages() {
788 788
 		$title = str_replace('Custom', 'Page', $this->Title);
Please login to merge, or discard this patch.