ciandt-dev / behat-placeholders-extension

src/Ciandt/Behat/PlaceholdersExtension/Config/ConfigsRepository.php

Doc Comments -1 removed lines

@@ -32,7 +32,6 @@
 
   /**
      * 
-     * @param type $config_files
      * @todo user %paths.base% value
      */
     private function loadConfigFiles($configs_mapping){

Indentation +4 added lines, -4 removed lines

@@ -31,10 +31,10 @@
   
 
   /**
-     * 
-     * @param type $config_files
-     * @todo user %paths.base% value
-     */
+   * 
+   * @param type $config_files
+   * @todo user %paths.base% value
+   */
     private function loadConfigFiles($configs_mapping){
       $placeholder_maps = array();
       foreach ($configs_mapping as $tag => $file_path){

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
    * @return string[]
    * @todo read configs and also bring alternative @config:section tags
    */
-  public function getTags(){
+  public function getTags() {
     return array_keys($this->configs);
   }
   
@@ -35,26 +35,26 @@ 
      * @param type $config_files
      * @todo user %paths.base% value
      */
-    private function loadConfigFiles($configs_mapping){
+    private function loadConfigFiles($configs_mapping) {
       $placeholder_maps = array();
-      foreach ($configs_mapping as $tag => $file_path){
+      foreach ($configs_mapping as $tag => $file_path) {
         $placeholder_maps[$tag]['config'] = Yaml::parse(file_get_contents($file_path));
         $placeholder_maps[$tag]['path'] = $file_path;
       }
       $this->configs = $placeholder_maps;
     }
     
-    public function getConfigSection($tag, $section){
+    public function getConfigSection($tag, $section) {
       if ($this->hasTag($tag)) return $this->configs[$tag]['config'][$section];
       return NULL;
     }
     
-    public function getFilePath($tag){
+    public function getFilePath($tag) {
       if ($this->hasTag($tag)) return $this->configs[$tag]['path'];
       return NULL;
     }
     
-    public function hasTag($tag){
+    public function hasTag($tag) {
         if (key_exists($tag, $this->configs)) return true;
         else return false;
     }

Braces +11 added lines, -4 removed lines

@@ -45,17 +45,24 @@
     }
     
     public function getConfigSection($tag, $section){
-      if ($this->hasTag($tag)) return $this->configs[$tag]['config'][$section];
+      if ($this->hasTag($tag)) {
+        return $this->configs[$tag]['config'][$section];
+      }
       return NULL;
     }
     
     public function getFilePath($tag){
-      if ($this->hasTag($tag)) return $this->configs[$tag]['path'];
+      if ($this->hasTag($tag)) {
+        return $this->configs[$tag]['path'];
+      }
       return NULL;
     }
     
     public function hasTag($tag){
-        if (key_exists($tag, $this->configs)) return true;
-        else return false;
+        if (key_exists($tag, $this->configs)) {
+          return true;
+        } else {
+          return false;
+        }
     }
 }

src/Ciandt/Behat/PlaceholdersExtension/Tester/PlaceholdersReplacer.php

Doc Comments +4 added lines

@@ -104,6 +104,10 @@
                 $step->getKeyword(), $text, $arguments, $step->getLine(), $step->getKeywordType());
     }
 
+    /**
+     * @param string $string
+     * @param string $env
+     */
     private function replacePlaceholders($string, $var, $env) {
         preg_match_all('/\${(?P<key>[^}]+)}/i', $string, $placeholders, PREG_SET_ORDER);
         foreach ($placeholders as $placeholder) {

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
             $this->configSection = 'default';
             $this->placeholders = $this->configsRepo->getConfigSection($step->configTag, $this->configSection)['placeholders'];
             $this->configPath = $this->configsRepo->getFilePath($step->configTag);
-            if ($step->variant){
+            if ($step->variant) {
               $this->variant = $step->variant;
             }
             
@@ -122,21 +122,21 @@ 
         $variant = $this->variant;
         $environment = $this->environment;
         
-        $keys = array('$'.$variant,'$'.$environment,$placeholderKey);
+        $keys = array('$' . $variant, '$' . $environment, $placeholderKey);
         $treePosition = "$configPath>$section>placeholders";
         
         return $this->recursivePlaceholderSearch($keys, $values, $treePosition);
     }
 
     private function recursivePlaceholderSearch($keys, $values, $treePosition) {
-        if (empty($keys) || !is_array($values) ){
+        if (empty($keys) || !is_array($values)) {
           return $values;
         }
         $key = array_pop($keys);
-        if (key_exists($key, $values)){
-          return $this->recursivePlaceholderSearch($keys,$values[$key],"$treePosition>$key");
-        } elseif (key_exists('$default', $values)){
-          return $this->recursivePlaceholderSearch($keys,$values['$default'],$treePosition.'>$default');
+        if (key_exists($key, $values)) {
+          return $this->recursivePlaceholderSearch($keys, $values[$key], "$treePosition>$key");
+        } elseif (key_exists('$default', $values)) {
+          return $this->recursivePlaceholderSearch($keys, $values['$default'], $treePosition . '>$default');
         } else {
           throw new \Exception("no placeholder is defined on $treePosition>[$key or \$default]");
         }

src/Ciandt/Behat/PlaceholdersExtension/Tester/ScenarioBranchingFeatureTester.php

Doc Comments +6 added lines

@@ -120,6 +120,9 @@ 
   }
 
 
+  /**
+   * @param string[] $variants
+   */
   private function forkScenario(ScenarioNode $scenario, $variants, $configTag) {
     $scenarios = array();
     $nonVariantTags = array_filter($scenario->getTags(), function ($val) {
@@ -141,6 +144,9 @@ 
     return $scenarios;
   }
 
+  /**
+   * @param StepNode[] $steps
+   */
   private function injectParametersOnSteps($steps, $variant, $configTag) {
     $injectedSteps = array();
     foreach ($steps as $step) {

Unused Use Statements -8 removed lines

@@ -3,21 +3,13 @@
 
 namespace Ciandt\Behat\PlaceholdersExtension\Tester;
 
-use Behat\Behat\Tester\OutlineTester;
-use Behat\Behat\Tester\ScenarioTester;
-use Behat\Gherkin\Node\OutlineNode;
 use Behat\Testwork\Environment\Environment;
-use Behat\Testwork\Environment\EnvironmentManager;
-use Behat\Testwork\Tester\Result\IntegerTestResult;
 use Behat\Testwork\Tester\Result\TestResult;
-use Behat\Testwork\Tester\Result\TestResults;
-use Behat\Testwork\Tester\Result\TestWithSetupResult;
 use Behat\Testwork\Tester\Setup\SuccessfulSetup;
 use Behat\Testwork\Tester\Setup\SuccessfulTeardown;
 use Behat\Testwork\Tester\SpecificationTester;
 use Behat\Gherkin\Node\FeatureNode;
 use Behat\Gherkin\Node\ScenarioNode;
-use Behat\Gherkin\Node\StepNode;
 use Ciandt\Behat\PlaceholdersExtension\Config\ConfigsRepository;
 
 /**

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
    *
    * @param SpecificationTester $baseTester
    */
-  public function __construct(SpecificationTester $baseTester, $variantTags, ConfigsRepository $configsRepo ) {
+  public function __construct(SpecificationTester $baseTester, $variantTags, ConfigsRepository $configsRepo) {
     $this->baseTester = $baseTester;
     $this->variantTags = $variantTags;
     $this->configsRepo = $configsRepo;
@@ -79,11 +79,11 @@ 
     foreach ($feature->getScenarios() as $scenario) {
       $configTag = $this->getScenarioConfigTag($scenario);
       $scenarioVariants = array_intersect($scenario->getTags(), $this->variantTags);
-      if (count($scenarioVariants) == 1){
+      if (count($scenarioVariants) == 1) {
         $injectedScenario = new ScenarioNode(
           $scenario->getTitle(),
           $scenario->getTags(),
-          $this->injectParametersOnSteps($scenario->getSteps(), end($scenarioVariants),$configTag),
+          $this->injectParametersOnSteps($scenario->getSteps(), end($scenarioVariants), $configTag),
           $scenario->getKeyword(),
           $scenario->getLine());
         $scenarios[] = $injectedScenario;
@@ -101,12 +101,12 @@ 
     );
   }
   
-  private function getScenarioConfigTag(ScenarioNode $scenario){
+  private function getScenarioConfigTag(ScenarioNode $scenario) {
     $availableTags = $this->configsRepo->getTags();
-    $configTags = array_intersect($scenario->getTags(),$availableTags );
+    $configTags = array_intersect($scenario->getTags(), $availableTags);
     
     if (count($configTags) > 1) {
-      throw new \Exception ("Scenario {$scenario->getTitle()}"
+      throw new \Exception("Scenario {$scenario->getTitle()}"
       . " should have only ONE of the following Placeholder"
         . " File Tags: " . implode(',', $availableTags));
     }
@@ -122,7 +122,7 @@ 
 
   private function forkScenario(ScenarioNode $scenario, $variants, $configTag) {
     $scenarios = array();
-    $nonVariantTags = array_filter($scenario->getTags(), function ($val) {
+    $nonVariantTags = array_filter($scenario->getTags(), function($val) {
       if (!in_array($val, $this->variantTags))
         return TRUE;
     }

Braces +9 added lines, -9 removed lines

@@ -68,8 +68,7 @@ 
     $variantTags = $this->variantTags;
     if ($variantTags) {
       return $tester->test($env, $this->reconstructFeature($feature), $skip);
-    }
-    else {
+    } else {
       return $tester->test($env, $feature, $skip);
     }
   }
@@ -87,11 +86,9 @@ 
           $scenario->getKeyword(),
           $scenario->getLine());
         $scenarios[] = $injectedScenario;
-      }
-      elseif (count($scenarioVariants) > 1) {
+      } elseif (count($scenarioVariants) > 1) {
         $scenarios = array_merge($scenarios, $this->forkScenario($scenario, $scenarioVariants, $configTag));
-      }
-      else {
+      } else {
         $scenarios[] = $scenario;
       }
     }
@@ -123,8 +120,9 @@ 
   private function forkScenario(ScenarioNode $scenario, $variants, $configTag) {
     $scenarios = array();
     $nonVariantTags = array_filter($scenario->getTags(), function ($val) {
-      if (!in_array($val, $this->variantTags))
-        return TRUE;
+      if (!in_array($val, $this->variantTags)) {
+              return TRUE;
+      }
     }
     );
     foreach ($variants as $variant) {
@@ -146,7 +144,9 @@ 
     foreach ($steps as $step) {
       $newStep = clone $step;
       $newStep->variant = $variant;
-      if ($configTag) $newStep->configTag = $configTag;
+      if ($configTag) {
+        $newStep->configTag = $configTag;
+      }
       $injectedSteps[] = $newStep;
     }
     return $injectedSteps;

src/Ciandt/Behat/PlaceholdersExtension/ServiceContainer/PlaceholdersExtension.php

Spacing +3 added lines, -3 removed lines

@@ -73,9 +73,9 @@ 
      */
     public function load(ContainerBuilder $container, array $config) {
         $this->loadPlaceholdersController($container);
-        $this->loadScenarioForkingFeatureTester($container,$config['variant_tags']);
+        $this->loadScenarioForkingFeatureTester($container, $config['variant_tags']);
         $this->loadConfigsRepository($container, $config['config_files']);
-        $this->loadStepTester($container, $config['variant_tags'],'default');
+        $this->loadStepTester($container, $config['variant_tags'], 'default');
     }
     
     
@@ -125,7 +125,7 @@ 
      *
      * @param ContainerBuilder $container
      */
-    protected function loadStepTester(ContainerBuilder $container, $variantTags,$environment)
+    protected function loadStepTester(ContainerBuilder $container, $variantTags, $environment)
     {
         $definition = new Definition('Ciandt\Behat\PlaceholdersExtension\Tester\PlaceholdersReplacer', array(
             new Reference(TesterExtension::STEP_TESTER_ID),