Completed
Pull Request — master (#6699)
by Sam
09:28
created
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/Dev/SapphireTestReporter.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
      *
369 369
      * @param PHPUnit_Framework_Test $test current test that is being run
370 370
      * @param Exception $e PHPUnit error
371
-     * @return array
371
+     * @return string
372 372
      */
373 373
     private function getTestException(PHPUnit_Framework_Test $test, Exception $e)
374 374
     {
@@ -483,6 +483,9 @@  discard block
 block discarded – undo
483 483
         echo "</div>";
484 484
     }
485 485
 
486
+    /**
487
+     * @param string $name
488
+     */
486 489
     protected function testNameToPhrase($name)
487 490
     {
488 491
         return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
Please login to merge, or discard this patch.
src/Forms/CompositeField.php 1 patch
Doc Comments   +14 added lines patch added patch discarded remove patch
@@ -261,6 +261,9 @@  discard block
 block discarded – undo
261 261
 
262 262
 
263 263
 
264
+    /**
265
+     * @param boolean $disabled
266
+     */
264 267
     public function setDisabled($disabled)
265 268
     {
266 269
         parent::setDisabled($disabled);
@@ -270,6 +273,9 @@  discard block
 block discarded – undo
270 273
         return $this;
271 274
     }
272 275
 
276
+    /**
277
+     * @param boolean $readonly
278
+     */
273 279
     public function setReadonly($readonly)
274 280
     {
275 281
         parent::setReadonly($readonly);
@@ -362,6 +368,10 @@  discard block
 block discarded – undo
362 368
         $this->children->removeByName($fieldName, $dataFieldOnly);
363 369
     }
364 370
 
371
+    /**
372
+     * @param string $fieldName
373
+     * @param FormField $newField
374
+     */
365 375
     public function replaceField($fieldName, $newField)
366 376
     {
367 377
         return $this->children->replaceField($fieldName, $newField);
@@ -437,6 +447,9 @@  discard block
 block discarded – undo
437 447
         return $clone;
438 448
     }
439 449
 
450
+    /**
451
+     * @return boolean
452
+     */
440 453
     public function IsReadonly()
441 454
     {
442 455
         return $this->readonly;
@@ -447,6 +460,7 @@  discard block
 block discarded – undo
447 460
      * the children collection. Doesn't work recursively.
448 461
      *
449 462
      * @param string|FormField
463
+     * @param string $field
450 464
      * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
451 465
      *             be found.
452 466
      */
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.
src/Forms/GridField/GridFieldExportButton.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * export is an action button
76 76
      *
77 77
      * @param GridField $gridField
78
-     * @return array
78
+     * @return string[]
79 79
      */
80 80
     public function getActions($gridField)
81 81
     {
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
      * Generate export fields for CSV.
150 150
      *
151 151
      * @param GridField $gridField
152
-     * @return array
152
+     * @return string
153 153
      */
154 154
     public function generateExportFileData($gridField)
155 155
     {
Please login to merge, or discard this patch.
src/Forms/HiddenField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
     /**
14 14
      * @param array $properties
15
-     * @return string
15
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
16 16
      */
17 17
     public function FieldHolder($properties = array())
18 18
     {
Please login to merge, or discard this patch.