Completed
Pull Request — master (#5830)
by Damian
11:27
created
dev/FunctionalTest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 * Find an attribute in a SimpleXMLElement object by name.
216 216
 	 * @param SimpleXMLElement $object
217 217
 	 * @param string $attribute Name of attribute to find
218
-	 * @return SimpleXMLElement object of the attribute
218
+	 * @return boolean object of the attribute
219 219
 	 */
220 220
 	public function findAttribute($object, $attribute) {
221 221
 		$found = false;
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
246 246
 	 *
247 247
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
248
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
248
+	 * @param string[] $expectedMatches The content of at least one of the matched tags
249 249
 	 * @throws PHPUnit_Framework_AssertionFailedError
250 250
 	 * @return boolean
251 251
 	 */
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
343 343
 	 * @param array|string $expectedMatches The content of *all* matched tags as an array
344 344
 	 * @throws PHPUnit_Framework_AssertionFailedError
345
-	 * @return boolean
345
+	 * @return boolean|null
346 346
 	 */
347 347
 	public function assertExactHTMLMatchBySelector($selector, $expectedMatches) {
348 348
 		$items = $this->cssParser()->getBySelector($selector);
Please login to merge, or discard this patch.
dev/SapphireTestReporter.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @access private
320 320
 	 * @param obj PHPUnit_Framework_Test, current test that is being run
321 321
 	 * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error
322
-	 * @return array
322
+	 * @return string
323 323
 	 */
324 324
 	private function getTestException(PHPUnit_Framework_Test $test, Exception $e) {
325 325
 		// get the name of the testFile from the test
@@ -406,6 +406,9 @@  discard block
 block discarded – undo
406 406
 
407 407
 	}
408 408
 
409
+	/**
410
+	 * @param string $name
411
+	 */
409 412
 	protected function testNameToPhrase($name) {
410 413
 		return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
411 414
 	}
Please login to merge, or discard this patch.
dev/TestListener.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -52,6 +52,7 @@
 block discarded – undo
52 52
 
53 53
 	/**
54 54
 	 * @param String Classname
55
+	 * @param string $name
55 56
 	 * @return boolean
56 57
 	 */
57 58
 	protected function isValidClass($name) {
Please login to merge, or discard this patch.
filesystem/FileNameFilter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 	protected $transliterator;
100 100
 
101 101
 	/**
102
-	 * @return SS_Transliterator|NULL
102
+	 * @return SS_Transliterator
103 103
 	 */
104 104
 	public function getTransliterator() {
105 105
 		if($this->transliterator === null && $this->config()->default_use_transliterator) {
Please login to merge, or discard this patch.
filesystem/GDBackend.php 1 patch
Doc Comments   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -184,7 +184,6 @@  discard block
 block discarded – undo
184 184
 	 * Check if this image has previously crashed GD when attempting to open it - if it's opened
185 185
 	 * successfully, the manipulation's cache key is removed.
186 186
 	 *
187
-	 * @param string $args,... Any number of args that identify this image
188 187
 	 * @return bool True if failed
189 188
 	 */
190 189
 	public function failedResample() {
@@ -195,7 +194,6 @@  discard block
 block discarded – undo
195 194
 	/**
196 195
 	 * Mark a file as failed
197 196
 	 *
198
-	 * @param string $args,... Any number of args that identify this image
199 197
 	 */
200 198
 	protected function markFailed() {
201 199
 		$key = sha1(implode('|', func_get_args()));
@@ -205,7 +203,6 @@  discard block
 block discarded – undo
205 203
 	/**
206 204
 	 * Mark a file as succeeded
207 205
 	 *
208
-	 * @param string $args,... Any number of args that identify this image
209 206
 	 */
210 207
 	protected function markSucceeded() {
211 208
 		$key = sha1(implode('|', func_get_args()));
@@ -347,7 +344,7 @@  discard block
 block discarded – undo
347 344
 	 * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu)
348 345
 	 *
349 346
 	 * @param float $angle Angle in degrees
350
-	 * @return static
347
+	 * @return null|resource
351 348
 	 */
352 349
 	public function rotatePixelByPixel($angle) {
353 350
 		if(!$this->gd) {
Please login to merge, or discard this patch.
forms/DateField.php 1 patch
Doc Comments   +9 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,6 +90,11 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	protected $valueObj = null;
92 92
 
93
+	/**
94
+	 * @param string $name
95
+	 * @param string $title
96
+	 * @param string $value
97
+	 */
93 98
 	public function __construct($name, $title = null, $value = null) {
94 99
 		if(!$this->locale) {
95 100
 			$this->locale = i18n::get_locale();
@@ -288,6 +293,9 @@  discard block
 block discarded – undo
288 293
 		return $field;
289 294
 	}
290 295
 
296
+	/**
297
+	 * @param string $class
298
+	 */
291 299
 	public function castedCopy($class) {
292 300
 		$copy = new $class($this->name);
293 301
 		if($copy->hasMethod('setConfig')) {
@@ -326,7 +334,7 @@  discard block
 block discarded – undo
326 334
 	 * @deprecated 4.0 Use the "DateField.default_config" config setting instead
327 335
 	 * @param String $k
328 336
 	 * @param mixed $v
329
-	 * @return boolean
337
+	 * @return boolean|null
330 338
 	 */
331 339
 	public static function set_default_config($k, $v) {
332 340
 		Deprecation::notice('4.0', 'Use the "DateField.default_config" config setting instead');
Please login to merge, or discard this patch.
forms/FormScaffolder.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
 
50 50
 	/**
51 51
 	 * @param DataObject $obj
52
-	 * @param array $params
53 52
 	 */
54 53
 	public function __construct($obj) {
55 54
 		$this->obj = $obj;
Please login to merge, or discard this patch.
forms/gridfield/GridFieldAddExistingAutocompleter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 	/**
130 130
 	 *
131 131
 	 * @param GridField $gridField
132
-	 * @return array
132
+	 * @return string[]
133 133
 	 */
134 134
 	public function getActions($gridField) {
135 135
 		return array('addto');
Please login to merge, or discard this patch.
forms/gridfield/GridFieldComponent.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * If you attempt to return HTML for a fragment that doesn't exist, an
34 34
 	 * exception will be thrown when the {@link GridField} is rendered.
35 35
 	 *
36
+	 * @param GridField $gridField
36 37
 	 * @return array
37 38
 	 */
38 39
 	public function getHTMLFragments($gridField);
@@ -57,6 +58,7 @@  discard block
 block discarded – undo
57 58
 	 * @param GridField $gridField
58 59
 	 * @param arary $columns List of columns
59 60
 	 * @param array - List reference of all column names.
61
+	 * @return void
60 62
 	 */
61 63
 	public function augmentColumns($gridField, &$columns);
62 64
 
@@ -139,6 +141,7 @@  discard block
 block discarded – undo
139 141
 	 * @param String Action identifier, see {@link getActions()}.
140 142
 	 * @param Array Arguments relevant for this
141 143
 	 * @param Array All form data
144
+	 * @param string $actionName
142 145
 	 */
143 146
 	public function handleAction(GridField $gridField, $actionName, $arguments, $data);
144 147
 }
@@ -189,6 +192,7 @@  discard block
 block discarded – undo
189 192
 	 *
190 193
 	 * Handler methods will be called on the component, rather than the
191 194
 	 * {@link GridField}.
195
+	 * @param GridField $gridField
192 196
 	 */
193 197
 	public function getURLHandlers($gridField);
194 198
 }
@@ -205,7 +209,6 @@  discard block
 block discarded – undo
205 209
 	/**
206 210
 	 * Called when a grid field is saved - i.e. the form is submitted.
207 211
 	 *
208
-	 * @param GridField $field
209 212
 	 * @param DataObjectInterface $record
210 213
 	 */
211 214
 	public function handleSave(GridField $grid, DataObjectInterface $record);
Please login to merge, or discard this patch.