@@ -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 | { |
@@ -74,6 +74,7 @@ |
||
74 | 74 | * while automatically busting this cache every time the file is changed. |
75 | 75 | * |
76 | 76 | * @param bool |
77 | + * @param boolean $var |
|
77 | 78 | */ |
78 | 79 | public static function set_suffix_requirements($var) |
79 | 80 | { |
@@ -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) |
@@ -95,6 +95,8 @@ discard block |
||
95 | 95 | |
96 | 96 | /** |
97 | 97 | * Override the function that constructs the result arrays to also prepare a 'php' item in the array |
98 | + * @param string $matchrule |
|
99 | + * @param string $name |
|
98 | 100 | */ |
99 | 101 | function construct($matchrule, $name, $arguments = null) |
100 | 102 | { |
@@ -163,9 +165,9 @@ discard block |
||
163 | 165 | |
164 | 166 | /** |
165 | 167 | * Ensures that the arguments to addOpenBlock and addClosedBlock are valid |
166 | - * @param $name |
|
167 | - * @param $callable |
|
168 | - * @param $type |
|
168 | + * @param string $name |
|
169 | + * @param callable $callable |
|
170 | + * @param string $type |
|
169 | 171 | * @throws InvalidArgumentException |
170 | 172 | */ |
171 | 173 | protected function validateExtensionBlock($name, $callable, $type) |
@@ -924,6 +926,7 @@ discard block |
||
924 | 926 | * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to |
925 | 927 | * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj) |
926 | 928 | * depending on the context the lookup is used in. |
929 | + * @param string $method |
|
927 | 930 | */ |
928 | 931 | function Lookup_AddLookupStep(&$res, $sub, $method) |
929 | 932 | { |
@@ -6477,6 +6480,7 @@ discard block |
||
6477 | 6480 | |
6478 | 6481 | /** |
6479 | 6482 | * @param string $code |
6483 | + * @param string $templateName |
|
6480 | 6484 | * @return string $code |
6481 | 6485 | */ |
6482 | 6486 | protected function includeDebuggingComments($code, $templateName) |
@@ -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( |
@@ -30,6 +30,9 @@ |
||
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) { |
@@ -11,11 +11,9 @@ |
||
11 | 11 | use SilverStripe\Security\Member; |
12 | 12 | use SilverStripe\Security\MemberAuthenticator; |
13 | 13 | use SilverStripe\Security\Security; |
14 | -use SilverStripe\Security\Permission; |
|
15 | 14 | use SilverStripe\Core\Config\Config; |
16 | 15 | use SilverStripe\Core\Convert; |
17 | 16 | use SilverStripe\Dev\FunctionalTest; |
18 | -use SilverStripe\Dev\TestOnly; |
|
19 | 17 | use SilverStripe\Control\HTTPResponse; |
20 | 18 | use SilverStripe\Control\Session; |
21 | 19 | use SilverStripe\Control\Director; |
@@ -676,6 +676,8 @@ discard block |
||
676 | 676 | /** |
677 | 677 | * Execute a log-in form using Director::test(). |
678 | 678 | * Helper method for the tests above |
679 | + * @param string $email |
|
680 | + * @param string $password |
|
679 | 681 | */ |
680 | 682 | public function doTestLoginForm($email, $password, $backURL = 'test/link') |
681 | 683 | { |
@@ -697,6 +699,8 @@ discard block |
||
697 | 699 | |
698 | 700 | /** |
699 | 701 | * Helper method to execute a change password form |
702 | + * @param string $oldPassword |
|
703 | + * @param string $newPassword |
|
700 | 704 | */ |
701 | 705 | public function doTestChangepasswordForm($oldPassword, $newPassword) |
702 | 706 | { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * @param array $attributes an array of attributes to include on the link. |
118 | 118 | * @param string $iconClass |
119 | 119 | * |
120 | - * @return boolean The result of the operation. |
|
120 | + * @return boolean|null The result of the operation. |
|
121 | 121 | */ |
122 | 122 | public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null, $iconClass = null) |
123 | 123 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * @param array $attributes an array of attributes to include on the link. |
141 | 141 | * @param string $iconClass |
142 | 142 | * |
143 | - * @return bool Success |
|
143 | + * @return boolean|null Success |
|
144 | 144 | */ |
145 | 145 | public static function add_menu_item( |
146 | 146 | $code, |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @param array $attributes an array of attributes to include on the link. |
323 | 323 | * @param string $iconClass |
324 | 324 | * |
325 | - * @return bool Success |
|
325 | + * @return boolean|null Success |
|
326 | 326 | */ |
327 | 327 | public static function replace_menu_item( |
328 | 328 | $code, |
@@ -24,6 +24,10 @@ |
||
24 | 24 | */ |
25 | 25 | protected $group; |
26 | 26 | |
27 | + /** |
|
28 | + * @param SecurityAdmin $controller |
|
29 | + * @param string $name |
|
30 | + */ |
|
27 | 31 | public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) |
28 | 32 | { |
29 | 33 | if (!$fields) { |