Completed
Push — master ( 11de4a...90c2a7 )
by Daniel
37s
created
tests/php/View/Parsers/ShortcodeParserTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -208,6 +208,10 @@
 block discarded – undo
208 208
         $this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]'));
209 209
     }
210 210
 
211
+    /**
212
+     * @param string $a
213
+     * @param string $b
214
+     */
211 215
     protected function assertEqualsIgnoringWhitespace($a, $b, $message = null)
212 216
     {
213 217
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
Please login to merge, or discard this patch.
tests/php/View/RequirementsTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -1048,6 +1048,10 @@
 block discarded – undo
1048 1048
         }
1049 1049
     }
1050 1050
 
1051
+    /**
1052
+     * @param Requirements_Backend $backend
1053
+     * @param string $type
1054
+     */
1051 1055
     public function assertFileNotIncluded($backend, $type, $files)
1052 1056
     {
1053 1057
         $includedFiles = $this->getBackendFiles($backend, $type);
Please login to merge, or discard this patch.
src/View/Parsers/Diff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@
 block discarded – undo
161 161
     }
162 162
 
163 163
     /**
164
-     * @param string|bool|array $content If passed as an array, values will be concatenated with a comma.
164
+     * @param string $content If passed as an array, values will be concatenated with a comma.
165 165
      * @return array
166 166
      */
167 167
     public static function getHTMLChunks($content)
Please login to merge, or discard this patch.
src/Forms/TreeDropdownField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
     /**
315 315
      * @param array $properties
316
-     * @return string
316
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
317 317
      */
318 318
     public function Field($properties = array())
319 319
     {
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
     /**
481 481
      * Marking a specific node in the tree as disabled
482
-     * @param $node
482
+     * @param DataObject $node
483 483
      * @return boolean
484 484
      */
485 485
     public function nodeIsDisabled($node)
Please login to merge, or discard this patch.
src/ORM/Hierarchy/MarkedSet.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
      *
381 381
      * @param DataObject $node
382 382
      * @param int $depth
383
-     * @return array|string
383
+     * @return callable
384 384
      */
385 385
     protected function getSubtree($node, $depth = 0)
386 386
     {
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
     /**
614 614
      * Expose the given object in the tree, by marking this page and all it ancestors.
615 615
      *
616
-     * @param DataObject|Hierarchy $childObj
616
+     * @param DataObject $childObj
617 617
      * @return $this
618 618
      */
619 619
     public function markToExpose(DataObject $childObj)
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
     /**
759 759
      * Check if this node has too many children
760 760
      *
761
-     * @param DataObject|Hierarchy $node
761
+     * @param DataObject $node
762 762
      * @param int $count Children count (if already calculated)
763 763
      * @return bool
764 764
      */
Please login to merge, or discard this patch.
tests/php/ORM/MarkedSetTest.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -418,6 +418,7 @@  discard block
 block discarded – undo
418 418
      *
419 419
      * @param string$html
420 420
      * @param DataObject $node
421
+     * @param string $html
421 422
      * @return string
422 423
      */
423 424
     protected function getNodeClassFromTree($html, $node)
@@ -434,6 +435,10 @@  discard block
 block discarded – undo
434 435
         return '';
435 436
     }
436 437
 
438
+    /**
439
+     * @param string $expected
440
+     * @param string $actual
441
+     */
437 442
     protected function assertHTMLSame($expected, $actual, $message = '')
438 443
     {
439 444
         // Trim each line, strip empty lines
Please login to merge, or discard this patch.
src/Forms/TimeField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
     /**
248 248
      * Assign value posted from form submission
249 249
      *
250
-     * @param mixed $value
250
+     * @param string $value
251 251
      * @param mixed $data
252 252
      * @return $this
253 253
      */
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
     /**
265 265
      * Set time assigned from database value
266 266
      *
267
-     * @param mixed $value
267
+     * @param string $value
268 268
      * @param mixed $data
269 269
      * @return $this
270 270
      */
Please login to merge, or discard this patch.
src/Control/Email/Email.php 1 patch
Doc Comments   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
 
136 136
     /**
137 137
      * Email constructor.
138
-     * @param string|array|null $from
139
-     * @param string|array|null $to
138
+     * @param string $from
139
+     * @param string $to
140 140
      * @param string|null $subject
141 141
      * @param string|null $body
142
-     * @param string|array|null $cc
143
-     * @param string|array|null $bcc
142
+     * @param string $cc
143
+     * @param string $bcc
144 144
      * @param string|null $returnPath
145 145
      */
146 146
     public function __construct(
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     }
227 227
 
228 228
     /**
229
-     * @param string|array $address
229
+     * @param string $address
230 230
      * @param string|null $name
231 231
      * @return $this
232 232
      */
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
     }
239 239
 
240 240
     /**
241
-     * @return array
241
+     * @return string
242 242
      */
243 243
     public function getSender()
244 244
     {
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
     }
304 304
 
305 305
     /**
306
-     * @param string|array $address
306
+     * @param string $address
307 307
      * @param string|null $name
308 308
      * @return $this
309 309
      */
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
     }
336 336
 
337 337
     /**
338
-     * @param string|array $address
338
+     * @param string $address
339 339
      * @param string|null $name
340 340
      * @return $this
341 341
      */
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
     }
368 368
 
369 369
     /**
370
-     * @param string|array $address
370
+     * @param string $address
371 371
      * @param string|null $name
372 372
      * @return $this
373 373
      */
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
     }
385 385
 
386 386
     /**
387
-     * @param string|array $address
387
+     * @param string $address
388 388
      * @param string|null $name
389 389
      * @return $this
390 390
      */
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     }
397 397
 
398 398
     /**
399
-     * @param string|array $address
399
+     * @param string $address
400 400
      * @param string|null $name
401 401
      * @return $this
402 402
      */
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
     }
503 503
 
504 504
     /**
505
-     * @param string|array $name The data name to add or array to names => value
505
+     * @param string $name The data name to add or array to names => value
506 506
      * @param string|null $value The value of the data to add
507 507
      * @return $this
508 508
      */
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
     }
729 729
 
730 730
     /**
731
-     * @return Swift_MimePart|false
731
+     * @return \Swift_Mime_MimeEntity
732 732
      */
733 733
     public function findPlainPart()
734 734
     {
Please login to merge, or discard this patch.
src/Control/Session.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -330,6 +330,9 @@  discard block
 block discarded – undo
330 330
         }
331 331
     }
332 332
 
333
+    /**
334
+     * @param string $name
335
+     */
333 336
     public function inst_set($name, $val)
334 337
     {
335 338
         // Quicker execution path for "."-free names
@@ -379,6 +382,11 @@  discard block
 block discarded – undo
379 382
         $diffVar[sizeof($var)-1] = $val;
380 383
     }
381 384
 
385
+    /**
386
+     * @param string $name
387
+     *
388
+     * @return string
389
+     */
382 390
     public function inst_get($name)
383 391
     {
384 392
         // Quicker execution path for "."-free names
Please login to merge, or discard this patch.