@@ -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 | |
@@ -132,7 +132,7 @@ |
||
| 132 | 132 | * @param mixed $returnVal |
| 133 | 133 | * @param bool $ignoreAjax |
| 134 | 134 | * @param array $ignoredFunctions |
| 135 | - * @return mixed |
|
| 135 | + * @return string|null |
|
| 136 | 136 | */ |
| 137 | 137 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) |
| 138 | 138 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Filesystem\ImageManipulation; |
| 6 | 6 | use SilverStripe\Filesystem\Storage\AssetContainer; |
| 7 | 7 | use SilverStripe\Filesystem\Storage\AssetStore; |
| 8 | - |
|
| 9 | 8 | use Injector; |
| 10 | 9 | use AssetField; |
| 11 | 10 | use File; |
@@ -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 | /** |
@@ -70,6 +70,10 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | protected $config; |
| 72 | 72 | |
| 73 | + /** |
|
| 74 | + * @param string $name |
|
| 75 | + * @param string $title |
|
| 76 | + */ |
|
| 73 | 77 | public function __construct($name, $title = null, $value = "") |
| 74 | 78 | { |
| 75 | 79 | $this->config = $this->config()->default_config; |
@@ -81,6 +85,9 @@ discard block |
||
| 81 | 85 | parent::__construct($name, $title, $value); |
| 82 | 86 | } |
| 83 | 87 | |
| 88 | + /** |
|
| 89 | + * @param Form $form |
|
| 90 | + */ |
|
| 84 | 91 | public function setForm($form) |
| 85 | 92 | { |
| 86 | 93 | parent::setForm($form); |
@@ -92,6 +99,9 @@ discard block |
||
| 92 | 99 | return $this; |
| 93 | 100 | } |
| 94 | 101 | |
| 102 | + /** |
|
| 103 | + * @param string $name |
|
| 104 | + */ |
|
| 95 | 105 | public function setName($name) |
| 96 | 106 | { |
| 97 | 107 | parent::setName($name); |
@@ -105,7 +115,7 @@ discard block |
||
| 105 | 115 | |
| 106 | 116 | /** |
| 107 | 117 | * @param array $properties |
| 108 | - * @return string |
|
| 118 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 109 | 119 | */ |
| 110 | 120 | public function FieldHolder($properties = array()) |
| 111 | 121 | { |
@@ -120,7 +130,7 @@ discard block |
||
| 120 | 130 | |
| 121 | 131 | /** |
| 122 | 132 | * @param array $properties |
| 123 | - * @return string |
|
| 133 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 124 | 134 | */ |
| 125 | 135 | public function Field($properties = array()) |
| 126 | 136 | { |
@@ -254,6 +264,9 @@ discard block |
||
| 254 | 264 | return $this; |
| 255 | 265 | } |
| 256 | 266 | |
| 267 | + /** |
|
| 268 | + * @param boolean $bool |
|
| 269 | + */ |
|
| 257 | 270 | public function setReadonly($bool) |
| 258 | 271 | { |
| 259 | 272 | parent::setReadonly($bool); |
@@ -354,7 +367,7 @@ discard block |
||
| 354 | 367 | * to set field-specific config options. |
| 355 | 368 | * |
| 356 | 369 | * @param string $name |
| 357 | - * @param mixed $val |
|
| 370 | + * @param string $val |
|
| 358 | 371 | * @return $this |
| 359 | 372 | */ |
| 360 | 373 | public function setConfig($name, $val) |
@@ -374,7 +387,7 @@ discard block |
||
| 374 | 387 | * to get field-specific config options. |
| 375 | 388 | * |
| 376 | 389 | * @param String $name Optional, returns the whole configuration array if empty |
| 377 | - * @return mixed |
|
| 390 | + * @return string |
|
| 378 | 391 | */ |
| 379 | 392 | public function getConfig($name = null) |
| 380 | 393 | { |
@@ -385,6 +398,9 @@ discard block |
||
| 385 | 398 | } |
| 386 | 399 | } |
| 387 | 400 | |
| 401 | + /** |
|
| 402 | + * @param RequiredFields $validator |
|
| 403 | + */ |
|
| 388 | 404 | public function validate($validator) |
| 389 | 405 | { |
| 390 | 406 | $dateValid = $this->dateField->validate($validator); |
@@ -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 | /** |
@@ -228,7 +228,7 @@ |
||
| 228 | 228 | * |
| 229 | 229 | * @todo refactor this into GridFieldComponent |
| 230 | 230 | * |
| 231 | - * @param mixed $value |
|
| 231 | + * @param string $value |
|
| 232 | 232 | * @param string|array $castingDefinition |
| 233 | 233 | * |
| 234 | 234 | * @return mixed |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use DOMAttr; |
| 6 | 6 | use DOMElement; |
| 7 | -use DOMNode; |
|
| 8 | 7 | use SilverStripe\Core\Injector\Injectable; |
| 9 | 8 | use SilverStripe\View\Parsers\HTMLValue; |
| 10 | 9 | use stdClass; |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | /** |
| 53 | 53 | * Given a TinyMCE pattern (close to unix glob style), create a regex that does the match |
| 54 | 54 | * |
| 55 | - * @param $str - The TinyMCE pattern |
|
| 55 | + * @param string|null $str - The TinyMCE pattern |
|
| 56 | 56 | * @return string - The equivalent regex |
| 57 | 57 | */ |
| 58 | 58 | protected function patternToRegex($str) |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Forms; |
| 4 | 4 | |
| 5 | -use SilverStripe\View\Requirements; |
|
| 6 | - |
|
| 7 | 5 | /** |
| 8 | 6 | * Render a button that will submit the form its contained in through ajax. |
| 9 | 7 | * |
@@ -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 | /** |