| @@ -4,11 +4,9 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Symfony\Component\DependencyInjection\ContainerInterface; | 
| 6 | 6 | use Symfony\Component\Console\Command\Command; | 
| 7 | -use Symfony\Component\Console\Input\InputArgument; | |
| 8 | 7 | use Symfony\Component\Console\Input\InputInterface; | 
| 9 | 8 | use Symfony\Component\Console\Output\OutputInterface; | 
| 10 | 9 | use Symfony\Component\Console\Input\InputOption; | 
| 11 | - | |
| 12 | 10 | use Behat\Behat\Console\Processor\InitProcessor as BaseProcessor; | 
| 13 | 11 | |
| 14 | 12 | /** | 
| @@ -832,7 +832,7 @@ discard block | ||
| 832 | 832 | * - fieldset[data-name] table | 
| 833 | 833 | * - table caption | 
| 834 | 834 | * | 
| 835 | - * @return Behat\Mink\Element\NodeElement | |
| 835 | + * @return \Behat\Mink\Element\NodeElement|null | |
| 836 | 836 | */ | 
| 837 | 837 | protected function getTable($selector) | 
| 838 | 838 |      { | 
| @@ -1063,6 +1063,7 @@ discard block | ||
| 1063 | 1063 | |
| 1064 | 1064 | /** | 
| 1065 | 1065 | * We have to catch exceptions and log somehow else otherwise behat falls over | 
| 1066 | + * @param \WebDriver\Exception $e | |
| 1066 | 1067 | */ | 
| 1067 | 1068 | protected function logException($e) | 
| 1068 | 1069 |      { | 
| @@ -6,12 +6,8 @@ | ||
| 6 | 6 | use Behat\Behat\Context\Step; | 
| 7 | 7 | use Behat\Behat\Event\StepEvent; | 
| 8 | 8 | use Behat\Behat\Event\ScenarioEvent; | 
| 9 | - | |
| 10 | 9 | use Behat\Mink\Driver\Selenium2Driver; | 
| 11 | 10 | |
| 12 | -use Behat\Gherkin\Node\PyStringNode; | |
| 13 | -use Behat\Gherkin\Node\TableNode; | |
| 14 | - | |
| 15 | 11 | // PHPUnit | 
| 16 | 12 | require_once BASE_PATH . '/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php'; | 
| 17 | 13 | |
| @@ -2,14 +2,9 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\BehatExtension\Context; | 
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\ClosuredContextInterface; | |
| 6 | -use Behat\Behat\Context\TranslatedContextInterface; | |
| 7 | 5 | use Behat\Behat\Context\BehatContext; | 
| 8 | 6 | use Behat\Behat\Context\Step; | 
| 9 | -use Behat\Behat\Event\FeatureEvent; | |
| 10 | 7 | use Behat\Behat\Event\ScenarioEvent; | 
| 11 | -use Behat\Behat\Exception\PendingException; | |
| 12 | -use Behat\Gherkin\Node\PyStringNode; | |
| 13 | 8 | use Behat\Gherkin\Node\TableNode; | 
| 14 | 9 | use Symfony\Component\DomCrawler\Crawler; | 
| 15 | 10 | |
| @@ -599,6 +599,10 @@ | ||
| 599 | 599 | return $data; | 
| 600 | 600 | } | 
| 601 | 601 | |
| 602 | + /** | |
| 603 | + * @param string $class | |
| 604 | + * @param string $identifier | |
| 605 | + */ | |
| 602 | 606 | protected function prepareAsset($class, $identifier, $data = null) | 
| 603 | 607 |      { | 
| 604 | 608 |          if (!$data) { | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Behat\Behat\Context\Initializer\InitializerInterface; | 
| 6 | 6 | use Behat\Behat\Context\ContextInterface; | 
| 7 | - | |
| 8 | 7 | use SilverStripe\BehatExtension\Context\SilverStripeAwareContextInterface; | 
| 9 | 8 | |
| 10 | 9 | /* | 
| @@ -152,7 +152,7 @@ | ||
| 152 | 152 | * When using the "data-title" attribute, ensure not to include double quotes. | 
| 153 | 153 | * | 
| 154 | 154 | * @param String $region Region name or CSS selector | 
| 155 | - * @return MinkElement|null | |
| 155 | + * @return \Behat\Mink\Element\NodeElement | |
| 156 | 156 | */ | 
| 157 | 157 | public function getRegionObj($region) | 
| 158 | 158 |      { | 
| @@ -3,20 +3,14 @@ | ||
| 3 | 3 | namespace SilverStripe\BehatExtension\Context; | 
| 4 | 4 | |
| 5 | 5 | use Behat\Behat\Context\Step; | 
| 6 | -use Behat\Behat\Event\FeatureEvent; | |
| 7 | 6 | use Behat\Behat\Event\ScenarioEvent; | 
| 8 | -use Behat\Behat\Event\SuiteEvent; | |
| 9 | -use Behat\Gherkin\Node\PyStringNode; | |
| 10 | 7 | use Behat\MinkExtension\Context\MinkContext; | 
| 11 | 8 | use Behat\Mink\Driver\GoutteDriver; | 
| 12 | 9 | use Behat\Mink\Driver\Selenium2Driver; | 
| 13 | 10 | use Behat\Mink\Exception\UnsupportedDriverActionException; | 
| 14 | 11 | use Behat\Mink\Exception\ElementNotFoundException; | 
| 15 | - | |
| 16 | 12 | use SilverStripe\BehatExtension\Context\SilverStripeAwareContextInterface; | 
| 17 | 13 | |
| 18 | -use Symfony\Component\Yaml\Yaml; | |
| 19 | - | |
| 20 | 14 | // Mink etc. | 
| 21 | 15 | require_once 'vendor/autoload.php'; | 
| 22 | 16 | |
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Behat\Behat\Context\Initializer\InitializerInterface; | 
| 6 | 6 | use Behat\Behat\Context\ContextInterface; | 
| 7 | - | |
| 8 | 7 | use SilverStripe\BehatExtension\Context\SilverStripeAwareContextInterface; | 
| 9 | 8 | |
| 10 | 9 | /* |