Completed
Pull Request — master (#6394)
by Ed
10:36
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_DataPresenter.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -33,6 +33,10 @@  discard block
 block discarded – undo
33 33
      */
34 34
     protected $underlay;
35 35
 
36
+    /**
37
+     * @param ViewableData $item
38
+     * @param ViewableData $inheritedScope
39
+     */
36 40
     public function __construct($item, $overlay = null, $underlay = null, $inheritedScope = null)
37 41
     {
38 42
         parent::__construct($item, $inheritedScope);
@@ -65,6 +69,10 @@  discard block
 block discarded – undo
65 69
         $this->underlay = $underlay ? $underlay : array();
66 70
     }
67 71
 
72
+    /**
73
+     * @param string $interfaceToQuery
74
+     * @param string $variableMethod
75
+     */
68 76
     protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false)
69 77
     {
70 78
         $implementers = ClassInfo::implementorsOf($interfaceToQuery);
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/FormAction.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -139,6 +139,7 @@
 block discarded – undo
139 139
 
140 140
     /**
141 141
      * @param boolean
142
+     * @param boolean $bool
142 143
      */
143 144
     public function setAllowMultibyte($bool)
144 145
     {
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
@@ -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/ListboxField.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/LookupField.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/TextField.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/View/Requirements.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -321,6 +321,7 @@
 block discarded – undo
321 321
      * Forces the JavaScript requirements to the end of the body, right before the closing tag
322 322
      *
323 323
      * @param bool
324
+     * @param boolean $var
324 325
      * @return $this
325 326
      */
326 327
     public function setForceJSToBottom($var)
Please login to merge, or discard this patch.