@@ -58,7 +58,7 @@ |
||
| 58 | 58 | /** |
| 59 | 59 | * Get permissions |
| 60 | 60 | * |
| 61 | - * @return array Associative array of permissions in this permission |
|
| 61 | + * @return string Associative array of permissions in this permission |
|
| 62 | 62 | * group. The array indicies are the permission codes as |
| 63 | 63 | * used in {@link Permission::check()}. The value is |
| 64 | 64 | * suitable for using in an interface. |
@@ -85,6 +85,9 @@ |
||
| 85 | 85 | return $this->token; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | + /** |
|
| 89 | + * @param string $token |
|
| 90 | + */ |
|
| 88 | 91 | public function setToken($token) |
| 89 | 92 | { |
| 90 | 93 | $this->token = $token; |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | * Combine the given forms into a formset with a tabbed interface |
| 533 | 533 | * |
| 534 | 534 | * @param array $forms List of LoginForm instances |
| 535 | - * @return string |
|
| 535 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 536 | 536 | */ |
| 537 | 537 | protected function generateLoginFormSet($forms) |
| 538 | 538 | { |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | /** |
| 1150 | 1150 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
| 1151 | 1151 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
| 1152 | - * @param $flag True or false |
|
| 1152 | + * @param boolean $flag True or false |
|
| 1153 | 1153 | */ |
| 1154 | 1154 | public static function set_ignore_disallowed_actions($flag) |
| 1155 | 1155 | { |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
| 164 | - * @param string|array $content If passed as an array, values will be concatenated with a comma. |
|
| 164 | + * @param string $content If passed as an array, values will be concatenated with a comma. |
|
| 165 | 165 | * @return array |
| 166 | 166 | */ |
| 167 | 167 | public static function getHTMLChunks($content) |
@@ -150,6 +150,7 @@ |
||
| 150 | 150 | /** |
| 151 | 151 | * Get the body element, or false if there isn't one (we haven't loaded any content |
| 152 | 152 | * or this instance is in an invalid state) |
| 153 | + * @return \DOMElement |
|
| 153 | 154 | */ |
| 154 | 155 | public function getBody() |
| 155 | 156 | { |
@@ -197,6 +197,9 @@ |
||
| 197 | 197 | |
| 198 | 198 | // -------------------------------------------------------------------------------------------------------------- |
| 199 | 199 | |
| 200 | + /** |
|
| 201 | + * @param DOMElement $node |
|
| 202 | + */ |
|
| 200 | 203 | protected function removeNode($node) |
| 201 | 204 | { |
| 202 | 205 | $node->parentNode->removeChild($node); |
@@ -139,6 +139,7 @@ |
||
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * @param boolean |
| 142 | + * @param boolean $bool |
|
| 142 | 143 | */ |
| 143 | 144 | public function setAllowMultibyte($bool) |
| 144 | 145 | { |
@@ -321,6 +321,7 @@ |
||
| 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) |
@@ -648,7 +648,7 @@ discard block |
||
| 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 |
||
| 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( |