Completed
Pull Request — master (#6776)
by Nic
09:32
created
src/View/SSViewer.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
      * @param mixed $data Data context
649 649
      * @param array $arguments Additional arguments
650 650
      * @param Object $scope
651
-     * @return string Evaluated result
651
+     * @return DBHTMLText Evaluated result
652 652
      */
653 653
     public static function execute_template($template, $data, $arguments = null, $scope = null)
654 654
     {
@@ -676,6 +676,9 @@  discard block
 block discarded – undo
676 676
         return $v->process($data, $arguments);
677 677
     }
678 678
 
679
+    /**
680
+     * @param string $content
681
+     */
679 682
     public function parseTemplateContent($content, $template = "")
680 683
     {
681 684
         return $this->getParser()->compileString(
Please login to merge, or discard this patch.
src/View/SSViewer_FromString.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -30,6 +30,9 @@
 block discarded – undo
30 30
      */
31 31
     protected $cacheTemplate;
32 32
 
33
+    /**
34
+     * @param string $content
35
+     */
33 36
     public function __construct($content, TemplateParser $parser = null)
34 37
     {
35 38
         if ($parser) {
Please login to merge, or discard this patch.
src/Forms/FileField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@
 block discarded – undo
238 238
 
239 239
     /**
240 240
      * @param array $properties
241
-     * @return string
241
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
242 242
      */
243 243
     public function Field($properties = array())
244 244
     {
Please login to merge, or discard this patch.
src/Forms/UploadReceiver.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,6 @@
 block discarded – undo
97 97
      * for each of these categories
98 98
      *
99 99
      * @param string $category Category name
100
-     * @param string,... $categories Additional category names
101 100
      * @return $this
102 101
      */
103 102
     public function setAllowedFileCategories($category)
Please login to merge, or discard this patch.
src/Dev/Deprecation.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
      * greater than or equal to this version, a message will be raised
76 76
      *
77 77
      * @static
78
-     * @param $ver string -
78
+     * @param string $ver string -
79 79
      *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
80 80
      * @param null $forModule string -
81 81
      *    The name of a module. The passed version will be used as the check value for
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
     /**
142 142
      * Determine if deprecation notices should be displayed
143 143
      *
144
-     * @return bool
144
+     * @return boolean|string
145 145
      */
146 146
     public static function get_enabled()
147 147
     {
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/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.