Completed
Pull Request — master (#6829)
by Simon
08:26
created
tests/php/Forms/GridField/GridFieldAddNewButtonTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -88,6 +88,9 @@
 block discarded – undo
88 88
         $this->mockButtonFragments($list, null);
89 89
     }
90 90
 
91
+    /**
92
+     * @param \SilverStripe\ORM\DataObject $parent
93
+     */
91 94
     protected function mockButtonFragments(SS_List $list, $parent = null)
92 95
     {
93 96
         $form = Form::create(
Please login to merge, or discard this patch.
src/Security/InheritedPermissions.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
     /**
87 87
      * Global permissions required to edit
88 88
      *
89
-     * @param array $permissions
89
+     * @param string[] $permissions
90 90
      * @return $this
91 91
      */
92 92
     public function setGlobalEditPermissions($permissions)
Please login to merge, or discard this patch.
tests/php/Security/InheritedPermissionsTest/TestPermissionNode.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
         return Injector::inst()->get(PermissionChecker::class.'.testpermissions');
43 43
     }
44 44
 
45
+    /**
46
+     * @param DataObject $member
47
+     */
45 48
     public function canEdit($member = null)
46 49
     {
47 50
         if (!$member) {
Please login to merge, or discard this patch.
tests/php/View/SSViewerTest.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -159,6 +159,10 @@  discard block
 block discarded – undo
159 159
         ]);
160 160
     }
161 161
 
162
+    /**
163
+     * @param \SilverStripe\ORM\FieldType\DBHTMLText $result
164
+     * @param string[] $expected
165
+     */
162 166
     private function assertExpectedStrings($result, $expected)
163 167
     {
164 168
         foreach ($expected as $expectedStr) {
@@ -1089,6 +1093,10 @@  discard block
 block discarded – undo
1089 1093
         $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult);
1090 1094
     }
1091 1095
 
1096
+    /**
1097
+     * @param string $a
1098
+     * @param string $b
1099
+     */
1092 1100
     public function assertEqualIgnoringWhitespace($a, $b, $message = '')
1093 1101
     {
1094 1102
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
@@ -1817,6 +1825,11 @@  discard block
 block discarded – undo
1817 1825
             $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']);
1818 1826
         }
1819 1827
     }
1828
+
1829
+    /**
1830
+     * @param string $name
1831
+     * @param string $expected
1832
+     */
1820 1833
     private function _renderWithSourceFileComments($name, $expected)
1821 1834
     {
1822 1835
         $viewer = new SSViewer(array($name));
Please login to merge, or discard this patch.
tests/php/Forms/ValidatorTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     /**
20 20
      * Common method for setting up form, since that will always be a dependency for the validator.
21 21
      *
22
-     * @param    array $fieldNames
22
+     * @param    string[] $fieldNames
23 23
      * @return    Form
24 24
      */
25 25
     protected function getForm(array $fieldNames = array())
Please login to merge, or discard this patch.
src/Core/Injector/Injector.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
      *
372 372
      * @param string $property
373 373
      *                the name of the property
374
-     * @param object $object
374
+     * @param string $object
375 375
      *                the object to be set
376 376
      * @return $this
377 377
      */
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
      *              The name of the service to update the definition for
467 467
      * @param string $property
468 468
      *              The name of the property to update.
469
-     * @param mixed $value
469
+     * @param string $value
470 470
      *              The value to set
471 471
      * @param boolean $append
472 472
      *              Whether to append (the default) when the property is an array
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
     /**
789 789
      * @deprecated 4.0.0:5.0.0 Use Injector::has() instead
790 790
      * @param $name
791
-     * @return string
791
+     * @return boolean
792 792
      */
793 793
     public function hasService($name)
794 794
     {
@@ -997,6 +997,7 @@  discard block
 block discarded – undo
997 997
      *
998 998
      * @param string $name
999 999
      * @param mixed $argument,... arguments to pass to the constructor
1000
+     * @param string $argument
1000 1001
      * @return mixed A new instance of the specified object
1001 1002
      */
1002 1003
     public function create($name, $argument = null)
Please login to merge, or discard this patch.
src/ORM/DataObject.php 1 patch
Doc Comments   +9 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2165,7 +2165,7 @@  discard block
 block discarded – undo
2165 2165
      * Called by {@link __get()} and any getFieldName() methods you might create.
2166 2166
      *
2167 2167
      * @param string $field The name of the field
2168
-     * @return mixed The field value
2168
+     * @return string|null The field value
2169 2169
      */
2170 2170
     public function getField($field)
2171 2171
     {
@@ -2447,6 +2447,7 @@  discard block
 block discarded – undo
2447 2447
 
2448 2448
     /**
2449 2449
      * {@inheritdoc}
2450
+     * @param string $field
2450 2451
      */
2451 2452
     public function castingHelper($field)
2452 2453
     {
@@ -2552,7 +2553,7 @@  discard block
 block discarded – undo
2552 2553
      * </code>
2553 2554
      *
2554 2555
      * @param string $methodName Method on the same object, e.g. {@link canEdit()}
2555
-     * @param Member|int $member
2556
+     * @param Member|null $member
2556 2557
      * @param array $context Optional context
2557 2558
      * @return boolean|null
2558 2559
      */
@@ -2575,7 +2576,7 @@  discard block
 block discarded – undo
2575 2576
 
2576 2577
     /**
2577 2578
      * @param Member $member
2578
-     * @return boolean
2579
+     * @return boolean|string
2579 2580
      */
2580 2581
     public function canView($member = null)
2581 2582
     {
@@ -2588,7 +2589,7 @@  discard block
 block discarded – undo
2588 2589
 
2589 2590
     /**
2590 2591
      * @param Member $member
2591
-     * @return boolean
2592
+     * @return boolean|string
2592 2593
      */
2593 2594
     public function canEdit($member = null)
2594 2595
     {
@@ -2601,7 +2602,7 @@  discard block
 block discarded – undo
2601 2602
 
2602 2603
     /**
2603 2604
      * @param Member $member
2604
-     * @return boolean
2605
+     * @return boolean|string
2605 2606
      */
2606 2607
     public function canDelete($member = null)
2607 2608
     {
@@ -2616,7 +2617,7 @@  discard block
 block discarded – undo
2616 2617
      * @param Member $member
2617 2618
      * @param array $context Additional context-specific data which might
2618 2619
      * affect whether (or where) this object could be created.
2619
-     * @return boolean
2620
+     * @return boolean|string
2620 2621
      */
2621 2622
     public function canCreate($member = null, $context = array())
2622 2623
     {
@@ -2731,7 +2732,7 @@  discard block
 block discarded – undo
2731 2732
      * Traverses to a field referenced by relationships between data objects, returning the value
2732 2733
      * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
2733 2734
      *
2734
-     * @param $fieldName string
2735
+     * @param string $fieldName string
2735 2736
      * @return string | null - will return null on a missing value
2736 2737
      */
2737 2738
     public function relField($fieldName)
@@ -2809,7 +2810,7 @@  discard block
 block discarded – undo
2809 2810
      * @param string $callerClass The class of objects to be returned
2810 2811
      * @param string|array $filter A filter to be inserted into the WHERE clause.
2811 2812
      * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
2812
-     * @param string|array $sort A sort expression to be inserted into the ORDER
2813
+     * @param string $sort A sort expression to be inserted into the ORDER
2813 2814
      * BY clause.  If omitted, self::$default_sort will be used.
2814 2815
      * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
2815 2816
      * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
Please login to merge, or discard this patch.
src/Security/CMSSecurity.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -49,6 +49,9 @@  discard block
 block discarded – undo
49 49
         return parent::login($request, Authenticator::CMS_LOGIN);
50 50
     }
51 51
 
52
+    /**
53
+     * @param string $action
54
+     */
52 55
     public function Link($action = null)
53 56
     {
54 57
         /** @skipUpgrade */
@@ -79,6 +82,9 @@  discard block
 block discarded – undo
79 82
         return null;
80 83
     }
81 84
 
85
+    /**
86
+     * @param string $title
87
+     */
82 88
     public function getResponseController($title)
83 89
     {
84 90
         // Use $this to prevent use of Page to render underlying templates
Please login to merge, or discard this patch.
src/Security/Member.php 1 patch
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -422,7 +422,6 @@  discard block
 block discarded – undo
422 422
     /**
423 423
      * @deprecated Use Security::setCurrentUser() or IdentityStore::logIn()
424 424
      *
425
-     * @param bool $remember If set to TRUE, the member will be logged in automatically the next time.
426 425
      */
427 426
     public function logIn()
428 427
     {
@@ -737,9 +736,9 @@  discard block
 block discarded – undo
737 736
      * });
738 737
      * </code>
739 738
      *
740
-     * @param Member|null|int $member Member or member ID to log in as.
739
+     * @param null|Member $member Member or member ID to log in as.
741 740
      * Set to null or 0 to act as a logged out user.
742
-     * @param $callback
741
+     * @param \Closure $callback
743 742
      */
744 743
     public static function actAs($member, $callback)
745 744
     {
@@ -1489,7 +1488,7 @@  discard block
 block discarded – undo
1489 1488
      * This is likely to be customized for social sites etc. with a looser permission model.
1490 1489
      *
1491 1490
      * @param Member $member
1492
-     * @return bool
1491
+     * @return boolean|string
1493 1492
      */
1494 1493
     public function canView($member = null)
1495 1494
     {
@@ -1520,7 +1519,7 @@  discard block
 block discarded – undo
1520 1519
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1521 1520
      *
1522 1521
      * @param Member $member
1523
-     * @return bool
1522
+     * @return boolean|string
1524 1523
      */
1525 1524
     public function canEdit($member = null)
1526 1525
     {
@@ -1555,7 +1554,7 @@  discard block
 block discarded – undo
1555 1554
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1556 1555
      *
1557 1556
      * @param Member $member
1558
-     * @return bool
1557
+     * @return boolean|string
1559 1558
      */
1560 1559
     public function canDelete($member = null)
1561 1560
     {
Please login to merge, or discard this patch.