Completed
Pull Request — master (#5433)
by Sam
14:37
created
model/HTMLValue.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,8 +152,8 @@
 block discarded – undo
152 152
 	/**
153 153
 	 * Make an xpath query against this HTML
154 154
 	 *
155
-	 * @param $query string - The xpath query string
156
-	 * @return DOMNodeList
155
+	 * @param string $query string - The xpath query string
156
+	 * @return \DOMNodeList
157 157
 	 */
158 158
 	public function query($query) {
159 159
 		$xp = new DOMXPath($this->getDocument());
Please login to merge, or discard this patch.
model/ManyManyList.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * Create a DataObject from the given SQL row.
116 116
 	 *
117 117
 	 * @param array $row
118
-	 * @return DataObject
118
+	 * @return SilverStripe\Model\DataObject
119 119
 	 */
120 120
 	protected function createDataObject($row) {
121 121
 		// remove any composed fields
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 	 * Note that for a ManyManyList, the item is never actually deleted, only
266 266
 	 * the join table is affected.
267 267
 	 *
268
-	 * @param DataObject $item
268
+	 * @param SilverStripe\Model\DataObject $item
269 269
 	 */
270 270
 	public function remove($item) {
271 271
 		if(!($item instanceof $this->dataClass)) {
Please login to merge, or discard this patch.
model/UnsavedRelationList.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -56,6 +56,7 @@
 block discarded – undo
56 56
 	 * Create a new UnsavedRelationList
57 57
 	 *
58 58
 	 * @param string $dataClass The DataObject class used in the relation
59
+	 * @param string $relationName
59 60
 	 */
60 61
 	public function __construct($baseClass, $relationName, $dataClass) {
61 62
 		$this->baseClass = $baseClass;
Please login to merge, or discard this patch.
model/versioning/Versioned.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1062,7 +1062,7 @@  discard block
 block discarded – undo
1062 1062
 	/**
1063 1063
 	 * Find objects in the given relationships, merging them into the given list
1064 1064
 	 *
1065
-	 * @param array $source Config property to extract relationships from
1065
+	 * @param string $source Config property to extract relationships from
1066 1066
 	 * @param bool $recursive True if recursive
1067 1067
 	 * @param ArrayList $list Optional list to add items to
1068 1068
 	 * @return ArrayList The list
@@ -1182,7 +1182,7 @@  discard block
 block discarded – undo
1182 1182
 	/**
1183 1183
 	 * Check if the current user can delete this record from live
1184 1184
 	 *
1185
-	 * @param null $member
1185
+	 * @param Member|null $member
1186 1186
 	 * @return mixed
1187 1187
 	 */
1188 1188
 	public function canUnpublish($member = null) {
@@ -1215,7 +1215,7 @@  discard block
 block discarded – undo
1215 1215
 	 * If extended, ensure that both canDelete and canUnpublish are extended also
1216 1216
 	 *
1217 1217
 	 * @param Member $member
1218
-	 * @return bool
1218
+	 * @return null|boolean
1219 1219
 	 */
1220 1220
 	public function canArchive($member = null) {
1221 1221
 		// Skip if invoked by extendedCan()
@@ -1292,7 +1292,7 @@  discard block
 block discarded – undo
1292 1292
 	 * Extend permissions to include additional security for objects that are not published to live.
1293 1293
 	 *
1294 1294
 	 * @param Member $member
1295
-	 * @return bool|null
1295
+	 * @return false|null
1296 1296
 	 */
1297 1297
 	public function canView($member = null) {
1298 1298
 		// Invoke default version-gnostic canView
@@ -2418,7 +2418,7 @@  discard block
 block discarded – undo
2418 2418
 	/**
2419 2419
 	 * Returns an array of possible stages.
2420 2420
 	 *
2421
-	 * @return array
2421
+	 * @return string[]
2422 2422
 	 */
2423 2423
 	public function getVersionedStages() {
2424 2424
 		if($this->hasStages()) {
Please login to merge, or discard this patch.
security/PasswordEncryptor.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,6 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * but is necessary for retain compatibility with password hashed
88 88
 	 * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and
89 89
 	 * {@link PasswordEncryptor_Blowfish}
90
+	 * @param string $password
90 91
 	 */
91 92
 	public function check($hash, $password, $salt = null, $member = null) {
92 93
 		return $hash === $this->encrypt($password, $salt, $member);
@@ -129,8 +130,7 @@  discard block
 block discarded – undo
129 130
 	/**
130 131
 	 * Gets the cost that is set for the blowfish algorithm
131 132
 	 *
132
-	 * @param int $cost
133
-	 * @return null
133
+	 * @return integer
134 134
 	 */
135 135
 	public static function get_cost() {
136 136
 		return self::$cost;
@@ -242,6 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 	/**
244 244
 	 * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
245
+	 * @param string $password
245 246
 	 */
246 247
 	public function salt($password, $member = null) {
247 248
 		$generator = new RandomGenerator();
Please login to merge, or discard this patch.