@@ -94,7 +94,6 @@ discard block |
||
| 94 | 94 | /** |
| 95 | 95 | * Adds a file to the concatenation/compression process. |
| 96 | 96 | * |
| 97 | - * @param String $path Path to the file to include in the compressed package/output. |
|
| 98 | 97 | */ |
| 99 | 98 | public function &addFile($file) { |
| 100 | 99 | $this->files .= ($this->files ? "," : "") . $file; |
@@ -267,7 +266,7 @@ discard block |
||
| 267 | 266 | /** |
| 268 | 267 | * Renders a script tag that loads the TinyMCE script. |
| 269 | 268 | * |
| 270 | - * @param Array $settings Name/value array with settings for the script tag. |
|
| 269 | + * @param Array $tagSettings Name/value array with settings for the script tag. |
|
| 271 | 270 | * @param Bool $return The script tag is return instead of being output if true |
| 272 | 271 | * @return String the tag is returned if $return is true |
| 273 | 272 | */ |
@@ -97,6 +97,9 @@ |
||
| 97 | 97 | return $return; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | + /** |
|
| 101 | + * @param boolean $index |
|
| 102 | + */ |
|
| 100 | 103 | function f($index) { |
| 101 | 104 | return stripslashes($this->row[$index]); |
| 102 | 105 | } |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | * Url handler for edit form |
| 477 | 477 | * |
| 478 | 478 | * @param HTTPRequest $request |
| 479 | - * @return Form |
|
| 479 | + * @return null|CampaignAdmin |
|
| 480 | 480 | */ |
| 481 | 481 | public function DetailEditForm($request) { |
| 482 | 482 | // Get ID either from posted back value, or url parameter |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | * @todo Use GridFieldDetailForm once it can handle structured data and form schemas |
| 489 | 489 | * |
| 490 | 490 | * @param int $id |
| 491 | - * @return Form |
|
| 491 | + * @return null|CampaignAdmin |
|
| 492 | 492 | */ |
| 493 | 493 | public function getDetailEditForm($id) { |
| 494 | 494 | // Get record-specific fields |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @see http://www.w3.org/TR/REC-html40/types.html#type-cdata |
| 56 | 56 | * |
| 57 | - * @param array|string $val String to escape, or array of strings |
|
| 57 | + * @param string $val String to escape, or array of strings |
|
| 58 | 58 | * |
| 59 | 59 | * @return array|string |
| 60 | 60 | */ |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * table, or column name. Supports encoding of multi identfiers separated by |
| 183 | 183 | * a delimiter (e.g. ".") |
| 184 | 184 | * |
| 185 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
| 185 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
| 186 | 186 | * to be joined via the separator. |
| 187 | 187 | * @param string $separator The string that delimits subsequent identifiers |
| 188 | 188 | * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
@@ -267,6 +267,7 @@ discard block |
||
| 267 | 267 | * call this function directly, Please use {@link Convert::xml2array()} |
| 268 | 268 | * |
| 269 | 269 | * @param SimpleXMLElement |
| 270 | + * @param SimpleXMLElement $xml |
|
| 270 | 271 | * |
| 271 | 272 | * @return mixed |
| 272 | 273 | */ |
@@ -469,7 +470,7 @@ discard block |
||
| 469 | 470 | * - IDField => idField |
| 470 | 471 | * - iDField => iDField |
| 471 | 472 | * |
| 472 | - * @param $str |
|
| 473 | + * @param string $str |
|
| 473 | 474 | * @return string |
| 474 | 475 | */ |
| 475 | 476 | public static function upperCamelToLowerCamel($str) { |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 | * Get the current value of an option |
| 139 | 139 | * |
| 140 | 140 | * @param string $key The key of the option to get |
| 141 | - * @return mixed The value of the specified option |
|
| 141 | + * @return string The value of the specified option |
|
| 142 | 142 | */ |
| 143 | 143 | abstract public function getOption($key); |
| 144 | 144 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * column. Can contain a relation name in dot notation, which will automatically join |
| 61 | 61 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
| 62 | 62 | * search the "Name" column when applying this filter to a SiteTree class). |
| 63 | - * @param mixed $value |
|
| 63 | + * @param string $value |
|
| 64 | 64 | * @param array $modifiers |
| 65 | 65 | */ |
| 66 | 66 | public function __construct($fullName = null, $value = false, array $modifiers = array()) { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | /** |
| 141 | 141 | * Gets supported modifiers for this filter |
| 142 | 142 | * |
| 143 | - * @return array |
|
| 143 | + * @return string[] |
|
| 144 | 144 | */ |
| 145 | 145 | public function getSupportedModifiers() |
| 146 | 146 | { |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | /** |
| 322 | 322 | * Determines case sensitivity based on {@link getModifiers()}. |
| 323 | 323 | * |
| 324 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 324 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 325 | 325 | */ |
| 326 | 326 | protected function getCaseSensitive() { |
| 327 | 327 | $modifiers = $this->getModifiers(); |
@@ -6,11 +6,9 @@ |
||
| 6 | 6 | /** @skipUpgrade */ |
| 7 | 7 | use SilverStripe\Admin\ModelAdmin; |
| 8 | 8 | /** @skipUpgrade */ |
| 9 | -use SilverStripe\Control\Controller as Cont ; |
|
| 10 | 9 | /** @skipUpgrade */ |
| 11 | -use SilverStripe\Control\HTTPRequest as Request, SilverStripe\Control\HTTPResponse as Response, SilverStripe\Security\PermissionProvider as P; |
|
| 10 | +use SilverStripe\Security\PermissionProvider as P; |
|
| 12 | 11 | /** @skipUpgrade */ |
| 13 | -use silverstripe\test\ClassA; |
|
| 14 | 12 | /** @skipUpgrade */ |
| 15 | 13 | use \SilverStripe\Core\Object; |
| 16 | 14 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | * Assign the list of active themes to apply. |
| 176 | 176 | * If default themes should be included add $default as the last entry. |
| 177 | 177 | * |
| 178 | - * @param array $themes |
|
| 178 | + * @param string[] $themes |
|
| 179 | 179 | */ |
| 180 | 180 | public static function set_themes($themes = []) { |
| 181 | 181 | SSViewer::config() |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | * @param mixed $data Data context |
| 623 | 623 | * @param array $arguments Additional arguments |
| 624 | 624 | * @param Object $scope |
| 625 | - * @return string Evaluated result |
|
| 625 | + * @return DBHTMLText Evaluated result |
|
| 626 | 626 | */ |
| 627 | 627 | public static function execute_template($template, $data, $arguments = null, $scope = null) { |
| 628 | 628 | $v = new SSViewer($template); |
@@ -648,6 +648,9 @@ discard block |
||
| 648 | 648 | return $v->process($data, $arguments); |
| 649 | 649 | } |
| 650 | 650 | |
| 651 | + /** |
|
| 652 | + * @param string $content |
|
| 653 | + */ |
|
| 651 | 654 | public function parseTemplateContent($content, $template="") { |
| 652 | 655 | return $this->getParser()->compileString( |
| 653 | 656 | $content, |