@@ -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 | /** |
@@ -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 | /** |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * @return FixtureFactory |
|
| 63 | + * @return \SilverStripe\Dev\FixtureFactory |
|
| 64 | 64 | */ |
| 65 | 65 | public function getFixtureFactory() { |
| 66 | 66 | if(!$this->fixtureFactory) { |
@@ -36,6 +36,7 @@ |
||
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * Get Mink session from MinkContext |
| 39 | + * @return \Behat\Mink\Session |
|
| 39 | 40 | */ |
| 40 | 41 | public function getSession($name = null) { |
| 41 | 42 | return $this->getMainContext()->getSession($name); |
@@ -2,13 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Framework\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\ClosuredContextInterface; |
|
| 6 | -use Behat\Behat\Context\TranslatedContextInterface; |
|
| 7 | 5 | use Behat\Behat\Context\BehatContext; |
| 8 | -use Behat\Behat\Context\Step; |
|
| 9 | -use Behat\Behat\Exception\PendingException; |
|
| 10 | 6 | use Behat\Mink\Exception\ElementHtmlException; |
| 11 | -use Behat\Gherkin\Node\PyStringNode; |
|
| 12 | 7 | use Behat\Gherkin\Node\TableNode; |
| 13 | 8 | use Behat\MinkExtension\Context\MinkContext as MinkContext; |
| 14 | 9 | use Symfony\Component\DomCrawler\Crawler; |
@@ -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) |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Versioning; |
| 4 | 4 | |
| 5 | -use SilverStripe\Forms\FieldList; |
|
| 6 | -use SilverStripe\Forms\TextField; |
|
| 7 | -use SilverStripe\Forms\ReadonlyField; |
|
| 8 | 5 | use SilverStripe\i18n\i18n; |
| 9 | 6 | use SilverStripe\ORM\HasManyList; |
| 10 | 7 | use SilverStripe\ORM\ValidationException; |