Completed
Push — pulls/3/auto-index-sort ( 612f1d...cde0ad )
by Daniel
08:43
created
dev/CSVParser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 	 *
102 102
 	 * You can use the object returned in a foreach loop to extract the data.
103 103
 	 *
104
-	 * @param $filename The name of the file.  If relative, it will be relative to the site's base dir
104
+	 * @param string $filename The name of the file.  If relative, it will be relative to the site's base dir
105 105
 	 * @param $delimiter The character for seperating columns
106 106
 	 * @param $enclosure The character for quoting or enclosing columns
107 107
 	 */
Please login to merge, or discard this patch.
dev/FixtureBlueprint.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -253,6 +253,9 @@  discard block
 block discarded – undo
253 253
 		return $this;
254 254
 	}
255 255
 
256
+	/**
257
+	 * @param string $type
258
+	 */
256 259
 	protected function invokeCallbacks($type, $args = array()) {
257 260
 		foreach($this->callbacks[$type] as $callback) {
258 261
 			call_user_func_array($callback, $args);
@@ -263,7 +266,6 @@  discard block
 block discarded – undo
263 266
 	 * Parse a value from a fixture file.  If it starts with =>
264 267
 	 * it will get an ID from the fixture dictionary
265 268
 	 *
266
-	 * @param string $fieldVal
267 269
 	 * @param array $fixtures See {@link createObject()}
268 270
 	 * @param string $class If the value parsed is a class relation, this parameter
269 271
 	 * will be given the value of that class's name
@@ -292,6 +294,9 @@  discard block
 block discarded – undo
292 294
 		$obj->$name = $this->parseValue($value, $fixtures);
293 295
 	}
294 296
 
297
+	/**
298
+	 * @param string $fieldName
299
+	 */
295 300
 	protected function overrideField($obj, $fieldName, $value, $fixtures = null) {
296 301
 		$table = ClassInfo::table_for_object_field(get_class($obj), $fieldName);
297 302
 		$value = $this->parseValue($value, $fixtures);
Please login to merge, or discard this patch.
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.
dev/TestRunner.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -264,7 +264,7 @@
 block discarded – undo
264 264
 	/**
265 265
 	 * Find all test classes in a directory and return an array of them.
266 266
 	 * @param string $directory To search in
267
-	 * @param array $ignore Ignore these test classes if they are found.
267
+	 * @param string[] $ignore Ignore these test classes if they are found.
268 268
 	 * @return array
269 269
 	 */
270 270
 	protected function getTestsInDirectory($directory, $ignore = array()) {
Please login to merge, or discard this patch.
forms/CheckboxSetField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@
 block discarded – undo
169 169
 	 * Note: Items marked as disabled through {@link setDisabledItems()} can still be
170 170
 	 * selected by default through this method.
171 171
 	 *
172
-	 * @param Array $items Collection of array keys, as defined in the $source array
172
+	 * @param integer[] $items Collection of array keys, as defined in the $source array
173 173
 	 */
174 174
 	public function setDefaultItems($items) {
175 175
 		$this->defaultItems = $items;
Please login to merge, or discard this patch.
forms/CompositeField.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -94,6 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
 	/**
96 96
 	 * @param string
97
+	 * @param string $tag
97 98
 	 */
98 99
 	public function setTag($tag) {
99 100
 		$this->tag = $tag;
@@ -110,6 +111,7 @@  discard block
 block discarded – undo
110 111
 
111 112
 	/**
112 113
 	 * @param string
114
+	 * @param string $legend
113 115
 	 */
114 116
 	public function setLegend($legend) {
115 117
 		$this->legend = $legend;
@@ -200,6 +202,9 @@  discard block
 block discarded – undo
200 202
 		return false;
201 203
 	}
202 204
 
205
+	/**
206
+	 * @param string $name
207
+	 */
203 208
 	public function fieldByName($name) {
204 209
 		return $this->children->fieldByName($name);
205 210
 	}
@@ -224,6 +229,8 @@  discard block
 block discarded – undo
224 229
 
225 230
 	/**
226 231
 	 * @uses FieldList->insertAfter()
232
+	 * @param string $insertAfter
233
+	 * @param FormField $field
227 234
 	 */
228 235
 	public function insertAfter($insertAfter, $field) {
229 236
 		$ret = $this->children->insertAfter($insertAfter, $field);
@@ -309,6 +316,7 @@  discard block
 block discarded – undo
309 316
 	 * the children collection. Doesn't work recursively.
310 317
 	 *
311 318
 	 * @param string|FormField
319
+	 * @param string $field
312 320
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
313 321
 	 *             be found.
314 322
 	 */
Please login to merge, or discard this patch.
forms/ConfirmedPasswordField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	/**
121 121
 	 * @param array $properties
122 122
 	 *
123
-	 * @return HTMLText
123
+	 * @return string
124 124
 	 */
125 125
 	public function Field($properties = array()) {
126 126
 		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 	 *
418 418
 	 * @param DataObjectInterface $record
419 419
 	 *
420
-	 * @return boolean
420
+	 * @return false|null
421 421
 	 */
422 422
 	public function saveInto(DataObjectInterface $record) {
423 423
 		if(!$this->isSaveable()) {
Please login to merge, or discard this patch.