Completed
Pull Request — master (#6884)
by Sam
07:37
created
src/Core/Startup/ParameterConfirmationToken.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
      */
39 39
     protected $token = null;
40 40
 
41
+    /**
42
+     * @param string $token
43
+     */
41 44
     protected function pathForToken($token)
42 45
     {
43 46
         return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
@@ -247,7 +250,7 @@  discard block
 block discarded – undo
247 250
      * Given a list of token names, suppress all tokens that have not been validated, and
248 251
      * return the non-validated token with the highest priority
249 252
      *
250
-     * @param array $keys List of token keys in ascending priority (low to high)
253
+     * @param string[] $keys List of token keys in ascending priority (low to high)
251 254
      * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority
252 255
      */
253 256
     public static function prepare_tokens($keys)
Please login to merge, or discard this patch.
src/Dev/Backtrace.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
      * @param mixed $returnVal
133 133
      * @param bool $ignoreAjax
134 134
      * @param array $ignoredFunctions
135
-     * @return mixed
135
+     * @return string|null
136 136
      */
137 137
     public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null)
138 138
     {
Please login to merge, or discard this patch.
src/Dev/BulkLoader_Result.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
     }
133 133
 
134 134
     /**
135
-     * @param $obj DataObject
136
-     * @param $message string
135
+     * @param DataObject $obj DataObject
136
+     * @param string $message string
137 137
      */
138 138
     public function addCreated($obj, $message = null)
139 139
     {
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
     }
147 147
 
148 148
     /**
149
-     * @param $obj DataObject
150
-     * @param $message string
149
+     * @param DataObject $obj DataObject
150
+     * @param string $message string
151 151
      */
152 152
     public function addUpdated($obj, $message = null)
153 153
     {
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
     }
161 161
 
162 162
     /**
163
-     * @param $obj DataObject
164
-     * @param $message string
163
+     * @param DataObject|null $obj DataObject
164
+     * @param string $message string
165 165
      */
166 166
     public function addDeleted($obj, $message = null)
167 167
     {
Please login to merge, or discard this patch.
src/Dev/CsvBulkLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
      * @param string $path Path to large file to split
101 101
      * @param int $lines Number of lines per file
102 102
      *
103
-     * @return array List of file paths
103
+     * @return string[] List of file paths
104 104
      */
105 105
     protected function splitFile($path, $lines = null)
106 106
     {
Please login to merge, or discard this patch.
src/Dev/FixtureBlueprint.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -304,6 +304,9 @@  discard block
 block discarded – undo
304 304
         return $this;
305 305
     }
306 306
 
307
+    /**
308
+     * @param string $type
309
+     */
307 310
     protected function invokeCallbacks($type, $args = array())
308 311
     {
309 312
         foreach ($this->callbacks[$type] as $callback) {
@@ -346,6 +349,9 @@  discard block
 block discarded – undo
346 349
         $obj->$name = $this->parseValue($value, $fixtures);
347 350
     }
348 351
 
352
+    /**
353
+     * @param string $fieldName
354
+     */
349 355
     protected function overrideField($obj, $fieldName, $value, $fixtures = null)
350 356
     {
351 357
         $class = get_class($obj);
Please login to merge, or discard this patch.
src/Forms/FormAction.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -214,6 +214,7 @@
 block discarded – undo
214 214
      * Enable or disable the rendering of this action as a <button />
215 215
      *
216 216
      * @param boolean
217
+     * @param boolean $bool
217 218
      * @return $this
218 219
      */
219 220
     public function setUseButtonTag($bool)
Please login to merge, or discard this patch.
src/Forms/GridField/GridField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@
 block discarded – undo
228 228
      *
229 229
      * @todo refactor this into GridFieldComponent
230 230
      *
231
-     * @param mixed $value
231
+     * @param string $value
232 232
      * @param string|array $castingDefinition
233 233
      *
234 234
      * @return mixed
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -92,6 +92,9 @@  discard block
 block discarded – undo
92 92
         parent::__construct();
93 93
     }
94 94
 
95
+    /**
96
+     * @param string $action
97
+     */
95 98
     public function Link($action = null)
96 99
     {
97 100
         return Controller::join_links(
@@ -341,6 +344,9 @@  discard block
 block discarded – undo
341 344
         return $c;
342 345
     }
343 346
 
347
+    /**
348
+     * @return string
349
+     */
344 350
     protected function getBackLink()
345 351
     {
346 352
         // TODO Coupling with CMS
@@ -448,6 +454,9 @@  discard block
 block discarded – undo
448 454
         }
449 455
     }
450 456
 
457
+    /**
458
+     * @param integer $errorCode
459
+     */
451 460
     public function httpError($errorCode, $errorMessage = null)
452 461
     {
453 462
         $controller = $this->getToplevelController();
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldEditButton.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      * Which columns are handled by this component
66 66
      *
67 67
      * @param GridField $gridField
68
-     * @return array
68
+     * @return string[]
69 69
      */
70 70
     public function getColumnsHandled($gridField)
71 71
     {
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param GridField $gridField
88 88
      * @param DataObject $record
89 89
      * @param string $columnName
90
-     * @return string The HTML for the column
90
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText The HTML for the column
91 91
      */
92 92
     public function getColumnContent($gridField, $record, $columnName)
93 93
     {
Please login to merge, or discard this patch.