byKolev / MultilingualExtension

src/Context/RawMultilingualContext.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
         $session = $this->getSession();
         $element = $session->getPage()->find(
             'xpath',
-            $session->getSelectorsHandler()->selectorToXpath('xpath', '//*[contains(text(),"' . $text . '")]'));
+            $session->getSelectorsHandler()->selectorToXpath('xpath', '//*[contains(text(),"'.$text.'")]'));
 
         if (null === $element) {
             throw new \InvalidArgumentException(sprintf('Cannot find text: "%s"', $text));
@@ -61,21 +61,21 @@ 
 
     public function assertValueInInput($value, $input) {
 
-        if (substr($input,0,1) != "#") {
-            $input = "#" . $input;
+        if (substr($input, 0, 1) != "#") {
+            $input = "#".$input;
         }
         $session = $this->getSession();
         $element = $session->getPage()->find('css', $input);
         $text = "";
 
-        if(isset($element)) {
+        if (isset($element)) {
             $text = $element->getValue();
         }
         else {
             throw new \Exception(sprintf("Element is null"));
         }
 
-        if($text === $value) {
+        if ($text === $value) {
             return true;
         }
         else {
@@ -107,12 +107,12 @@ 
 
         $html = $this->getSession()->getDriver()->getContent();
         $text = $this->validateTextForSearchInSource($text);
-        $regex = '/' . $text . '/';
+        $regex = '/'.$text.'/';
 
         preg_match($regex, $html, $results);
 
         if ($results == null) {
-            throw new \Exception('The searched text ' . $text . ' was not found in the source of the page.');
+            throw new \Exception('The searched text '.$text.' was not found in the source of the page.');
         }
 
         return true;
@@ -131,7 +131,7 @@ 
 
         $session = $this->getSession();
         $element = $session->getPage()->find('region', $region)->find('xpath', $session->getSelectorsHandler()->selectorToXpath('xpath',
-            '//*[contains(text(),"' . $text . '")]'));
+            '//*[contains(text(),"'.$text.'")]'));
 
         if (null === $element) {
             throw new \InvalidArgumentException(sprintf('Cannot find text: "%s"', $text));
@@ -144,7 +144,7 @@ 
 
         $session = $this->getSession();
         $element = $session->getPage()->find('region', $region)->find('xpath', $session->getSelectorsHandler()->selectorToXpath('xpath',
-            '//*[contains(text(),"' . $text . '")]'));
+            '//*[contains(text(),"'.$text.'")]'));
 
         if (null === $element) {
             throw new \InvalidArgumentException(sprintf('Cannot find text: "%s"', $text));

Braces +3 added lines, -6 removed lines

@@ -70,15 +70,13 @@ 
 
         if(isset($element)) {
             $text = $element->getValue();
-        }
-        else {
+        } else {
             throw new \Exception(sprintf("Element is null"));
         }
 
         if($text === $value) {
             return true;
-        }
-        else {
+        } else {
             throw new \Exception(sprintf('Value of input : "%s" does not match the text "%s"', $text, $value));
         }
     }
@@ -92,8 +90,7 @@ 
                 $this->iShouldSeeInTheSourceOfThePage($text);
                 $isTextFound = true;
                 break;
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 sleep(1);
             }
         }

src/Context/MultilingualContext.php

Spacing +12 added lines, -12 removed lines

@@ -46,13 +46,13 @@ 
         $file_path = $base_path.$this->multilingual_parameters['translations'];
         $yaml = file_get_contents($file_path);
         $yaml_parse_array_check = Yaml::parse($yaml);
-        if(is_array($yaml_parse_array_check)) {
+        if (is_array($yaml_parse_array_check)) {
             $this->translations = $yaml_parse_array_check;
         }
     }
 
     public function initializeMultilanguage() {
-        if(isset($this->multilingual_parameters['translations'])) {
+        if (isset($this->multilingual_parameters['translations'])) {
             $this->parseTranslationFile();
         }
         $this->parseLanguageCodes();
@@ -76,13 +76,13 @@ 
         $current_url = $this->getSession()->getCurrentUrl();
         $base_url = $this->getMinkParameter('base_url');
         $base_url_length = strlen($base_url);
-        $clean_url_language_code = substr($current_url,$base_url_length,2);
-        $not_clean_url_language_code = substr($current_url,$base_url_length+3,2);
+        $clean_url_language_code = substr($current_url, $base_url_length, 2);
+        $not_clean_url_language_code = substr($current_url, $base_url_length + 3, 2);
 
-        if(in_array($clean_url_language_code,$this->languages_iso_codes)) {
+        if (in_array($clean_url_language_code, $this->languages_iso_codes)) {
             return $clean_url_language_code;
         }
-        else if (in_array($not_clean_url_language_code,$this->languages_iso_codes)){
+        else if (in_array($not_clean_url_language_code, $this->languages_iso_codes)) {
             return $not_clean_url_language_code;
         }
         else return $this->multilingual_parameters['default_language'];
@@ -97,14 +97,14 @@ 
 
     public function localizeTarget($target) {
         $translations = $this->multilingual_parameters['translations'];
-        if(isset($this->translations[$target][$this->multilingual_parameters['default_language']])){
+        if (isset($this->translations[$target][$this->multilingual_parameters['default_language']])) {
             $target = $this->translations[$target][$this->languageDetection()];
             return $target;
         }
         elseif (isset($this->translations[$target])) {
             return $target;
         }
-        else throw new \Exception ("The text '$target'' is not defined in '$translations' translation file.");
+        else throw new \Exception("The text '$target'' is not defined in '$translations' translation file.");
     }
 
     /**
@@ -114,7 +114,7 @@ 
     public function localizeField($field) {
         $re = "/(?:[-])(".$this->multilingual_parameters['default_language'].")(?:[-])/";
         $language = "-".$this->languageDetection()."-";
-        $field = preg_replace($re, $language,$field);
+        $field = preg_replace($re, $language, $field);
         return $field;
     }
 
@@ -203,7 +203,7 @@ 
      *
      * @When /^I wait for localized text "([^"]*)" to appear with max time "([^"]+)"(?: seconds)?$/
      */
-    public function iWaitForLocalizedTextToAppearWithMaxTime($target, $maxExecutionTime){
+    public function iWaitForLocalizedTextToAppearWithMaxTime($target, $maxExecutionTime) {
         $target = $this->localizeTarget($target);
         $this->iWaitForTextToAppearWithMaxTime($target, $maxExecutionTime);
     }
@@ -227,7 +227,7 @@ 
      * @Given I click localized :link in the :rowText row
      * @Then I (should )see the localized :link in the :rowText row
      */
-    public function assertLocalizedClickInTableRow($link, $rowText){
+    public function assertLocalizedClickInTableRow($link, $rowText) {
         $link = $this->localizeTarget($link);
         $page = $this->getSession()->getPage();
         if ($link_element = $this->getTableRow($page, $rowText)->findLink($link)) {
@@ -256,7 +256,7 @@ 
      *
      * @When /^I click on the localized text "([^"]*)" in the "(?P<region>[^"]*)"(?:| region)$/
      */
-    public function iClickOnTheLocalizedTextInRegion($text, $region){
+    public function iClickOnTheLocalizedTextInRegion($text, $region) {
         $text = $this->localizeTarget($text);
         $this->iClickOnTheTextInRegion($text, $region);
     }

Braces +6 added lines, -6 removed lines

@@ -81,11 +81,11 @@ 
 
         if(in_array($clean_url_language_code,$this->languages_iso_codes)) {
             return $clean_url_language_code;
-        }
-        else if (in_array($not_clean_url_language_code,$this->languages_iso_codes)){
+        } else if (in_array($not_clean_url_language_code,$this->languages_iso_codes)){
             return $not_clean_url_language_code;
+        } else {
+            return $this->multilingual_parameters['default_language'];
         }
-        else return $this->multilingual_parameters['default_language'];
     }
 
     /**
@@ -100,11 +100,11 @@ 
         if(isset($this->translations[$target][$this->multilingual_parameters['default_language']])){
             $target = $this->translations[$target][$this->languageDetection()];
             return $target;
-        }
-        elseif (isset($this->translations[$target])) {
+        } elseif (isset($this->translations[$target])) {
             return $target;
+        } else {
+            throw new \Exception ("The text '$target'' is not defined in '$translations' translation file.");
         }
-        else throw new \Exception ("The text '$target'' is not defined in '$translations' translation file.");
     }
 
     /**