@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * @return string |
|
| 77 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 78 | 78 | */ |
| 79 | 79 | public function InternallyLabelledField() { |
| 80 | 80 | Deprecation::notice('4.0', 'Please use ->setValue() instead'); |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * @return string |
|
| 77 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 78 | 78 | */ |
| 79 | 79 | public function InternallyLabelledField() { |
| 80 | 80 | Deprecation::notice('4.0', 'Please use ->setValue() instead'); |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use SilverStripe\Core\Convert; |
| 4 | -use SilverStripe\Core\Config\Config; |
|
| 5 | 4 | use SilverStripe\Dev\SapphireTest; |
| 6 | 5 | use SilverStripe\View\Parsers\URLSegmentFilter; |
| 7 | 6 | |
@@ -114,6 +114,8 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | /** |
| 116 | 116 | * Override the function that constructs the result arrays to also prepare a 'php' item in the array |
| 117 | + * @param string $matchrule |
|
| 118 | + * @param string $name |
|
| 117 | 119 | */ |
| 118 | 120 | function construct($matchrule, $name, $arguments = null) { |
| 119 | 121 | $res = parent::construct($matchrule, $name, $arguments); |
@@ -175,9 +177,9 @@ discard block |
||
| 175 | 177 | |
| 176 | 178 | /** |
| 177 | 179 | * Ensures that the arguments to addOpenBlock and addClosedBlock are valid |
| 178 | - * @param $name |
|
| 179 | - * @param $callable |
|
| 180 | - * @param $type |
|
| 180 | + * @param string $name |
|
| 181 | + * @param callable $callable |
|
| 182 | + * @param string $type |
|
| 181 | 183 | * @throws InvalidArgumentException |
| 182 | 184 | */ |
| 183 | 185 | protected function validateExtensionBlock($name, $callable, $type) { |
@@ -262,6 +264,7 @@ discard block |
||
| 262 | 264 | * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to |
| 263 | 265 | * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj) |
| 264 | 266 | * depending on the context the lookup is used in. |
| 267 | + * @param string $method |
|
| 265 | 268 | */ |
| 266 | 269 | function Lookup_AddLookupStep(&$res, $sub, $method) { |
| 267 | 270 | $res['LookupSteps'][] = $sub; |
@@ -1174,6 +1177,7 @@ discard block |
||
| 1174 | 1177 | |
| 1175 | 1178 | /** |
| 1176 | 1179 | * @param string $code |
| 1180 | + * @param string $templateName |
|
| 1177 | 1181 | * @return string $code |
| 1178 | 1182 | */ |
| 1179 | 1183 | protected function includeDebuggingComments($code, $templateName) { |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -139,6 +139,11 @@ |
||
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | + /** |
|
| 143 | + * @param string $action |
|
| 144 | + * |
|
| 145 | + * @return string |
|
| 146 | + */ |
|
| 142 | 147 | public function Link($action = null) { |
| 143 | 148 | if(!$action) $action = $this->sanitiseClassName($this->modelClass); |
| 144 | 149 | return parent::Link($action); |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\ORM\SS_List; |
| 8 | 8 | use SilverStripe\ORM\ArrayList; |
| 9 | 9 | use SilverStripe\ORM\DataObjectInterface; |
| 10 | -use SilverStripe\View\Requirements; |
|
| 11 | 10 | use InvalidArgumentException; |
| 12 | 11 | |
| 13 | 12 | /** |