Completed
Pull Request — master (#6604)
by Andrew
11:43
created
admin/code/GroupImportForm.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -24,6 +24,10 @@
 block discarded – undo
24 24
      */
25 25
     protected $group;
26 26
 
27
+    /**
28
+     * @param SecurityAdmin $controller
29
+     * @param string $name
30
+     */
27 31
     public function __construct($controller, $name, $fields = null, $actions = null, $validator = null)
28 32
     {
29 33
         if (!$fields) {
Please login to merge, or discard this patch.
admin/code/MemberImportForm.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,10 @@  discard block
 block discarded – undo
25 25
      */
26 26
     protected $group;
27 27
 
28
+    /**
29
+     * @param SecurityAdmin $controller
30
+     * @param string $name
31
+     */
28 32
     public function __construct($controller, $name, $fields = null, $actions = null, $validator = null)
29 33
     {
30 34
         if (!$fields) {
@@ -127,7 +131,7 @@  discard block
 block discarded – undo
127 131
     }
128 132
 
129 133
     /**
130
-     * @param $group Group
134
+     * @param Group $group Group
131 135
      */
132 136
     public function setGroup($group)
133 137
     {
Please login to merge, or discard this patch.
admin/code/SecurityAdmin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     /**
261 261
      * @see SecurityAdmin_MemberImportForm
262 262
      *
263
-     * @return Form
263
+     * @return null|MemberImportForm
264 264
      */
265 265
     public function MemberImportForm()
266 266
     {
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
      * @see SecurityAdmin_MemberImportForm
298 298
      *
299 299
      * @skipUpgrade
300
-     * @return Form
300
+     * @return null|GroupImportForm
301 301
      */
302 302
     public function GroupImportForm()
303 303
     {
Please login to merge, or discard this patch.
bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -38,6 +38,7 @@
 block discarded – undo
38 38
 
39 39
     /**
40 40
      * Get Mink session from MinkContext
41
+     * @return \Behat\Mink\Session
41 42
      */
42 43
     public function getSession($name = null)
43 44
     {
Please login to merge, or discard this patch.
tests/php/Assets/Storage/AssetStoreTest/TestStore.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -163,6 +163,9 @@  discard block
 block discarded – undo
163 163
     }
164 164
 
165 165
 
166
+    /**
167
+     * @param string $fileID
168
+     */
166 169
     public function getOriginalFilename($fileID)
167 170
     {
168 171
         return parent::getOriginalFilename($fileID);
@@ -173,6 +176,9 @@  discard block
 block discarded – undo
173 176
         return parent::removeVariant($fileID);
174 177
     }
175 178
 
179
+    /**
180
+     * @param null|string $variant
181
+     */
176 182
     public function getDefaultConflictResolution($variant)
177 183
     {
178 184
         return parent::getDefaultConflictResolution($variant);
Please login to merge, or discard this patch.
tests/php/Core/Manifest/ConfigManifestTest.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
     /**
27 27
      * This is a helper method for displaying a relevant message about a parsing failure
28
+     * @param string $path
28 29
      */
29 30
     protected function getParsedAsMessage($path)
30 31
     {
@@ -50,7 +51,7 @@  discard block
 block discarded – undo
50 51
     /**
51 52
      * A helper method to return a mock of the manifest in order to test expectations and reduce dependency
52 53
      *
53
-     * @param  $methods
54
+     * @param  string[] $methods
54 55
      * @return ConfigManifest
55 56
      */
56 57
     protected function getManifestMock($methods)
Please login to merge, or discard this patch.
tests/php/Core/ObjectTest/Extending.php 1 patch
Doc Comments   +17 added lines patch added patch discarded remove patch
@@ -12,11 +12,22 @@  discard block
 block discarded – undo
12 12
         Extending_Extension::class,
13 13
     );
14 14
 
15
+    /**
16
+     * @param integer $first
17
+     * @param integer $second
18
+     * @param integer $third
19
+     */
15 20
     public function getResults(&$first, &$second, &$third)
16 21
     {
17 22
         // Before extending should be invoked second
18 23
         $this->beforeExtending(
19 24
             'updateResult',
25
+
26
+            /**
27
+             * @param integer $first
28
+             * @param integer $second
29
+             * @param integer $third
30
+             */
20 31
             function (&$first, &$second, &$third) {
21 32
                 if ($first === 1 && $second === 2 && $third === 3) {
22 33
                     $first = 11;
@@ -31,6 +42,12 @@  discard block
 block discarded – undo
31 42
         // After extending should be invoked fourth
32 43
         $this->afterExtending(
33 44
             'updateResult',
45
+
46
+            /**
47
+             * @param integer $first
48
+             * @param integer $second
49
+             * @param integer $third
50
+             */
34 51
             function (&$first, &$second, &$third) {
35 52
                 if ($first === 21 && $second === 22 && $third = 23) {
36 53
                     $first = 31;
Please login to merge, or discard this patch.
php/Core/Startup/ErrorControlChainTest/ErrorControlChainTest_Chain.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     /**
32 32
      * Modify method visibility to public for testing
33 33
      *
34
-     * @param mixed $errors
34
+     * @param string $errors
35 35
      */
36 36
     public function setDisplayErrors($errors)
37 37
     {
@@ -40,6 +40,10 @@  discard block
 block discarded – undo
40 40
     }
41 41
 
42 42
     // Change function visibility to be testable directly
43
+
44
+    /**
45
+     * @param string $memstring
46
+     */
43 47
     public function translateMemstring($memstring)
44 48
     {
45 49
         return parent::translateMemstring($memstring);
Please login to merge, or discard this patch.
tests/php/Dev/CsvBulkLoaderTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -271,6 +271,9 @@
 block discarded – undo
271 271
     }
272 272
 
273 273
 
274
+    /**
275
+     * @param resource $file
276
+     */
274 277
     protected function getLineCount(&$file)
275 278
     {
276 279
         $i = 0;
Please login to merge, or discard this patch.