Completed
Pull Request — 3.1 (#5200)
by Daniel
12:18
created
core/TempPath.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * @package framework
6 6
  * @subpackage core
7 7
  *
8
- * @param $base The base path to use for determining the temporary path
8
+ * @param string $base The base path to use for determining the temporary path
9 9
  * @return string Path to temp
10 10
  */
11 11
 function getTempFolder($base = null) {
Please login to merge, or discard this patch.
dev/Backtrace.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 *
115 115
 	 * @param unknown_type $returnVal
116 116
 	 * @param unknown_type $ignoreAjax
117
-	 * @return unknown
117
+	 * @return string|null
118 118
 	 */
119 119
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
120 120
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * shown
132 132
 	 *
133 133
 	 * @param Object $item
134
-	 * @param boolean $showArg
134
+	 * @param boolean $showArgs
135 135
 	 * @param Int $argCharLimit
136 136
 	 * @return String
137 137
 	 */
Please login to merge, or discard this patch.
dev/BulkLoader.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 *
212 212
 	 * @todo Mix in custom column mappings
213 213
 	 *
214
-	 * @return array
214
+	 * @return string
215 215
 	 **/
216 216
 	public function getImportSpec() {
217 217
 		$spec = array();
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 * so this is mainly a customization method.
238 238
 	 *
239 239
 	 * @param mixed $val
240
-	 * @param string $field Name of the field as specified in the array-values for {@link self::$columnMap}.
240
+	 * @param string $fieldName Name of the field as specified in the array-values for {@link self::$columnMap}.
241 241
 	 * @return boolean
242 242
 	 */
243 243
 	protected function isNullValue($val, $fieldName = null) {
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 
358 358
 	/**
359 359
 	 * @param $obj DataObject
360
-	 * @param $message string
360
+	 * @param string $message string
361 361
 	 */
362 362
 	public function addCreated($obj, $message = null) {
363 363
 		$this->created[] = $this->lastChange = array(
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 
371 371
 	/**
372 372
 	 * @param $obj DataObject
373
-	 * @param $message string
373
+	 * @param string $message string
374 374
 	 */
375 375
 	public function addUpdated($obj, $message = null) {
376 376
 		$this->updated[] = $this->lastChange = array(
Please login to merge, or discard this patch.
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/Deprecation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 * greater than or equal to this version, a message will be raised
73 73
 	 *
74 74
 	 * @static
75
-	 * @param $ver string -
75
+	 * @param string $ver string -
76 76
 	 *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
77 77
 	 * @param null $forModule string -
78 78
 	 *    The name of a module. The passed version will be used as the check value for
Please login to merge, or discard this patch.
dev/FixtureFactory.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -117,6 +117,7 @@  discard block
 block discarded – undo
117 117
 	/**
118 118
 	 * Return all of the IDs in the fixture of a particular class name.
119 119
 	 * 
120
+	 * @param string $class
120 121
 	 * @return A map of fixture-identifier => object-id
121 122
 	 */
122 123
 	public function getIds($class) {
@@ -131,6 +132,7 @@  discard block
 block discarded – undo
131 132
 	 * @param String 
132 133
 	 * @param String $identifier
133 134
 	 * @param Int $databaseId
135
+	 * @param string $class
134 136
 	 */
135 137
 	public function setId($class, $identifier, $databaseId) {
136 138
 		$this->fixtures[$class][$identifier] = $databaseId;
@@ -140,8 +142,8 @@  discard block
 block discarded – undo
140 142
 	/**
141 143
 	 * Get an object from the fixture.
142 144
 	 * 
143
-	 * @param $class The data class, as specified in your fixture file.  Parent classes won't work
144
-	 * @param $identifier The identifier string, as provided in your fixture file
145
+	 * @param string $class The data class, as specified in your fixture file.  Parent classes won't work
146
+	 * @param string $identifier The identifier string, as provided in your fixture file
145 147
 	 */
146 148
 	public function get($class, $identifier) {
147 149
 		$id = $this->getId($class, $identifier);
@@ -161,7 +163,7 @@  discard block
 block discarded – undo
161 163
 	 * or {@link createRaw()}, both from the internal fixture mapping and the database.
162 164
 	 * If the $class argument is set, limit clearing to items of this class.
163 165
 	 * 
164
-	 * @param String $class
166
+	 * @param string $limitToClass
165 167
 	 */
166 168
 	public function clear($limitToClass = null) {
167 169
 		$classes = ($limitToClass) ? array($limitToClass) : array_keys($this->fixtures);
@@ -202,7 +204,6 @@  discard block
 block discarded – undo
202 204
 	 * Parse a value from a fixture file.  If it starts with => 
203 205
 	 * it will get an ID from the fixture dictionary
204 206
 	 *
205
-	 * @param String $fieldVal
206 207
 	 * @return String Fixture database ID, or the original value
207 208
 	 */
208 209
 	protected function parseValue($value) {
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.