edno / codeception-gherkin-param

src/GherkinParam.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
    *
    * @param string $param
    *
-   * @return \mixed|null Returns parameter's value if exists, else parameter's name
+   * @return null|string Returns parameter's value if exists, else parameter's name
    */
   final protected function getValueFromParam(string $param)
   {

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
           elseif (preg_match(self::$regEx['array'], $variable)) {
             try {
               $values[] = $this->getValueFromArray($variable);
-            } catch(RuntimeException $e) {
+            } catch (RuntimeException $e) {
               if ($this->throwException) throw new GherkinParamException();
               if ($this->nullable) $values[] = null;
             }
@@ -121,7 +121,7 @@ 
           else {
             try {
               $values[] = Fixtures::get($variable);
-            } catch(RuntimeException $e) {
+            } catch (RuntimeException $e) {
               if ($this->throwException) throw new GherkinParamException();
               if ($this->nullable) $values[] = null;
             }
@@ -136,7 +136,7 @@ 
         // due to the default behavior when `search` and `replace` arrays size mismatch
         $param = $this->mapParametersToValues($matches, $values, $param);
 
-      } catch(GherkinParamException $e) {
+      } catch (GherkinParamException $e) {
         // only active if throwException setting is true
         throw new ExtensionException($this, "Incorrect parameter name ${param}, or not initialized");
       }
@@ -159,7 +159,7 @@ 
   final private function mapParametersToValues(array $matches, array $values, string $param)
   {
     //TODO: move count() into separate variable [performance]
-    for ($i=0; $i<count($matches); $i++) {
+    for ($i = 0; $i < count($matches); $i++) {
       $search = $matches[$i];
       if (\is_string($search)) { // if null then skip
         if (isset($values[$i])) {
@@ -272,7 +272,7 @@ 
         $prop = new ReflectionProperty(get_class($arg), 'table');
         $prop->setAccessible(true);
         $table = $prop->getValue($arg);
-        foreach($table as $i => $row) {
+        foreach ($table as $i => $row) {
           foreach ($row as $j => $cell) {
             $val = $this->getValueFromParam($cell);
             $table[$i][$j] = $val ? $val : null; // issue TableNode does not support `null` values in table

Braces +30 added lines, -10 removed lines

@@ -113,8 +113,12 @@ 
             try {
               $values[] = $this->getValueFromArray($variable);
             } catch(RuntimeException $e) {
-              if ($this->throwException) throw new GherkinParamException();
-              if ($this->nullable) $values[] = null;
+              if ($this->throwException) {
+                throw new GherkinParamException();
+              }
+              if ($this->nullable) {
+                $values[] = null;
+              }
             }
           } 
           // normal case
@@ -122,13 +126,19 @@ 
             try {
               $values[] = Fixtures::get($variable);
             } catch(RuntimeException $e) {
-              if ($this->throwException) throw new GherkinParamException();
-              if ($this->nullable) $values[] = null;
+              if ($this->throwException) {
+                throw new GherkinParamException();
+              }
+              if ($this->nullable) {
+                $values[] = null;
+              }
             }
           }
           // if machting value return is not found (null)
           if (is_null(end($values))) {
-            if ($this->throwException) throw new GherkinParamException();
+            if ($this->throwException) {
+              throw new GherkinParamException();
+            }
           }
         }
 
@@ -166,18 +176,28 @@ 
           $replacement = $values[$i];
           if (\is_array($replacement)) { 
             // case of replacement is an array (case of config param), ie param does not exists
-            if ($this->throwException) throw new GherkinParamException();
-            if ($this->nullable) $param = null;
+            if ($this->throwException) {
+              throw new GherkinParamException();
+            }
+            if ($this->nullable) {
+              $param = null;
+            }
             break;
           }
           //TODO: replace str_replace by strtr (performance)
           $param = \str_replace($search, $replacement, $param);
         } else {
-          if ($this->throwException) throw new GherkinParamException();
-          if ($this->nullable) $param = null;
+          if ($this->throwException) {
+            throw new GherkinParamException();
+          }
+          if ($this->nullable) {
+            $param = null;
+          }
         }
       } else {
-        if ($this->nullable) $param = null;
+        if ($this->nullable) {
+          $param = null;
+        }
         break;
       }
     }