Completed
Pull Request — master (#6930)
by Daniel
15:05 queued 05:18
created
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/ORM/Connect/DBSchemaManager.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
      *   - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full
332 332
      *     control over the index.
333 333
      * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type
334
-     * @param array $options Create table options (ENGINE, etc.)
334
+     * @param string|null $options Create table options (ENGINE, etc.)
335 335
      * @param array|bool $extensions List of extensions
336 336
      */
337 337
     public function requireTable(
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
      *
596 596
      * @param string $table The table name.
597 597
      * @param string $field The field name.
598
-     * @param array|string $spec The field specification. If passed in array syntax, the specific database
598
+     * @param string $spec The field specification. If passed in array syntax, the specific database
599 599
      *  driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to
600 600
      *  be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll
601 601
      *  need to take care of database abstraction in your DBField subclass.
Please login to merge, or discard this patch.
src/ORM/DataObjectSchema.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
      * Cache all indexes for the given class.
489 489
      * Will do nothing if already cached
490 490
      *
491
-     * @param $class
491
+     * @param string $class
492 492
      */
493 493
     protected function cacheDatabaseIndexes($class)
494 494
     {
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
      * @param string $parentClass Parent class name
792 792
      * @param string $component ManyMany name
793 793
      * @param string|array $specification Declaration of many_many relation type
794
-     * @return array
794
+     * @return string[]
795 795
      */
796 796
     protected function parseManyManyComponent($parentClass, $component, $specification)
797 797
     {
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.