@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * Copied logic from Core.php, because it needs to be executed prior to {@link SilverStripeAwareInitializer}. |
59 | 59 | * |
60 | 60 | * @param String Absolute start path to search upwards from |
61 | - * @return Boolean Absolute path to environment file |
|
61 | + * @return string|null Absolute path to environment file |
|
62 | 62 | */ |
63 | 63 | protected function findEnvironmentConfigFile($path) { |
64 | 64 | $envPath = null; |
@@ -85,6 +85,7 @@ discard block |
||
85 | 85 | * |
86 | 86 | * @param String Absolute start path to search upwards from |
87 | 87 | * @param Array Map of paths to host names |
88 | + * @param string $path |
|
88 | 89 | * @return String URL |
89 | 90 | */ |
90 | 91 | protected function findBaseUrlFromMapping($path, $mapping) { |
@@ -28,7 +28,7 @@ |
||
28 | 28 | /** |
29 | 29 | * Sets bundle namespace to use for guessing. |
30 | 30 | * |
31 | - * @param string $namespace |
|
31 | + * @param string $namespaceBase |
|
32 | 32 | */ |
33 | 33 | public function setNamespaceBase($namespaceBase) |
34 | 34 | { |
@@ -121,6 +121,8 @@ |
||
121 | 121 | |
122 | 122 | /** |
123 | 123 | * @When /^I log in with "(?<username>[^"]*)" and "(?<password>[^"]*)"$/ |
124 | + * @param string $email |
|
125 | + * @param string $password |
|
124 | 126 | */ |
125 | 127 | public function stepILogInWith($email, $password) |
126 | 128 | { |
@@ -21,14 +21,16 @@ |
||
21 | 21 | /** |
22 | 22 | * Sets SilverStripe instance. |
23 | 23 | * |
24 | - * @param String $database_name Temp database name |
|
24 | + * @param String $databaseName Temp database name |
|
25 | + * @return void |
|
25 | 26 | */ |
26 | 27 | public function setDatabase($databaseName); |
27 | 28 | |
28 | 29 | /** |
29 | 30 | * Marks steps as AJAX steps for special treatment |
30 | 31 | * |
31 | - * @param array $ajax_steps Array of step name parts to match |
|
32 | + * @param array $ajaxSteps Array of step name parts to match |
|
33 | + * @return void |
|
32 | 34 | */ |
33 | 35 | public function setAjaxSteps($ajaxSteps); |
34 | 36 | } |
@@ -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 | /* |