@@ -104,6 +104,10 @@ |
||
| 104 | 104 | $step->getKeyword(), $text, $arguments, $step->getLine(), $step->getKeywordType()); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | + /** |
|
| 108 | + * @param string $string |
|
| 109 | + * @param string $env |
|
| 110 | + */ |
|
| 107 | 111 | private function replacePlaceholders($string, $var, $env) { |
| 108 | 112 | preg_match_all('/\${(?P<key>[^}]+)}/i', $string, $placeholders, PREG_SET_ORDER); |
| 109 | 113 | foreach ($placeholders as $placeholder) { |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use Behat\Testwork\Environment\Environment; |
| 10 | 10 | use Behat\Testwork\Tester\Setup\SuccessfulSetup; |
| 11 | 11 | use Behat\Testwork\Tester\Setup\SuccessfulTeardown; |
| 12 | -use Behat\Behat\Tester\ServiceContainer\TesterExtension; |
|
| 13 | 12 | |
| 14 | 13 | /** |
| 15 | 14 | * Tester executing step tests in the runtime. |
@@ -3,21 +3,13 @@ |
||
| 3 | 3 | |
| 4 | 4 | namespace Ciandt\Behat\PlaceholdersExtension\Tester; |
| 5 | 5 | |
| 6 | -use Behat\Behat\Tester\OutlineTester; |
|
| 7 | -use Behat\Behat\Tester\ScenarioTester; |
|
| 8 | -use Behat\Gherkin\Node\OutlineNode; |
|
| 9 | 6 | use Behat\Testwork\Environment\Environment; |
| 10 | -use Behat\Testwork\Environment\EnvironmentManager; |
|
| 11 | -use Behat\Testwork\Tester\Result\IntegerTestResult; |
|
| 12 | 7 | use Behat\Testwork\Tester\Result\TestResult; |
| 13 | -use Behat\Testwork\Tester\Result\TestResults; |
|
| 14 | -use Behat\Testwork\Tester\Result\TestWithSetupResult; |
|
| 15 | 8 | use Behat\Testwork\Tester\Setup\SuccessfulSetup; |
| 16 | 9 | use Behat\Testwork\Tester\Setup\SuccessfulTeardown; |
| 17 | 10 | use Behat\Testwork\Tester\SpecificationTester; |
| 18 | 11 | use Behat\Gherkin\Node\FeatureNode; |
| 19 | 12 | use Behat\Gherkin\Node\ScenarioNode; |
| 20 | -use Behat\Gherkin\Node\StepNode; |
|
| 21 | 13 | use Ciandt\Behat\PlaceholdersExtension\Config\ConfigsRepository; |
| 22 | 14 | |
| 23 | 15 | /** |
@@ -132,6 +132,9 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
| 135 | + /** |
|
| 136 | + * @param string[] $variants |
|
| 137 | + */ |
|
| 135 | 138 | private function forkScenario(ScenarioNode $scenario, $variants, $configTag) |
| 136 | 139 | { |
| 137 | 140 | $scenarios = array(); |
@@ -155,6 +158,9 @@ discard block |
||
| 155 | 158 | return $scenarios; |
| 156 | 159 | } |
| 157 | 160 | |
| 161 | + /** |
|
| 162 | + * @param StepNode[] $steps |
|
| 163 | + */ |
|
| 158 | 164 | private function injectParametersOnSteps($steps, $variant, $configTag) |
| 159 | 165 | { |
| 160 | 166 | $injectedSteps = array(); |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | private function forkScenario(ScenarioNode $scenario, $variants, $configTag) |
| 136 | 136 | { |
| 137 | 137 | $scenarios = array(); |
| 138 | - $nonVariantTags = array_filter($scenario->getTags(), function ($val) { |
|
| 138 | + $nonVariantTags = array_filter($scenario->getTags(), function($val) { |
|
| 139 | 139 | if (!in_array($val, $this->variantTags)) { |
| 140 | 140 | return true; |
| 141 | 141 | } |
@@ -2,10 +2,8 @@ discard block |
||
| 2 | 2 | namespace Ciandt\Behat\PlaceholdersExtension\ServiceContainer; |
| 3 | 3 | |
| 4 | 4 | use Ciandt\Behat\PlaceholdersExtension\Config\ConfigsRepository; |
| 5 | -use Ciandt\Behat\PlaceholdersExtension\Tester\PerVariantScenarioTester; |
|
| 6 | 5 | use Ciandt\Behat\PlaceholdersExtension\Tester\PlaceholdersReplacer; |
| 7 | 6 | use Behat\Testwork\Cli\ServiceContainer\CliExtension; |
| 8 | -use Behat\Testwork\EventDispatcher\ServiceContainer\EventDispatcherExtension; |
|
| 9 | 7 | use Behat\Testwork\ServiceContainer\Extension; |
| 10 | 8 | use Behat\Testwork\ServiceContainer\ExtensionManager; |
| 11 | 9 | use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; |
@@ -13,7 +11,6 @@ discard block |
||
| 13 | 11 | use Symfony\Component\DependencyInjection\Definition; |
| 14 | 12 | use Symfony\Component\DependencyInjection\Reference; |
| 15 | 13 | use Behat\Behat\Tester\ServiceContainer\TesterExtension; |
| 16 | -use Behat\Testwork\Environment\ServiceContainer\EnvironmentExtension; |
|
| 17 | 14 | |
| 18 | 15 | final class PlaceholdersExtension implements Extension |
| 19 | 16 | { |
@@ -32,7 +32,6 @@ |
||
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * |
| 35 | - * @param type $config_files |
|
| 36 | 35 | * @todo user %paths.base% value |
| 37 | 36 | */ |
| 38 | 37 | private function loadConfigFiles($configs_mapping){ |