Completed
Pull Request — master (#5433)
by Sam
19:38
created
dev/DebugView.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -142,6 +142,8 @@
 block discarded – undo
142 142
 
143 143
 	/**
144 144
 	 * @deprecated 4.0.0:5.0.0 Use renderInfo() instead
145
+	 * @param string $title
146
+	 * @param string|false $subtitle
145 147
 	 */
146 148
 	public function writeInfo($title, $subtitle, $description=false) {
147 149
 		Deprecation::notice('4.0', 'Use renderInfo() instead');
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/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/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/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/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.