byKolev / MultilingualExtension

src/Context/MultilingualContext.php

Braces +6 added lines, -6 removed lines

@@ -84,11 +84,11 @@ 
         $not_clean_url_language_code = substr($current_url,$base_url_length+3,2);
         if(in_array($clean_url_language_code,$this->languages_iso_codes) && substr($current_url,$base_url_length+2,1) == "/") {
             return $clean_url_language_code;
-        }
-        else if (in_array($not_clean_url_language_code,$this->languages_iso_codes) && substr($current_url,$base_url_length+5,1) == "/"){
+        } else if (in_array($not_clean_url_language_code,$this->languages_iso_codes) && substr($current_url,$base_url_length+5,1) == "/"){
             return $not_clean_url_language_code;
+        } else {
+            return $this->multilingual_parameters['default_language'];
         }
-        else return $this->multilingual_parameters['default_language'];
     }
 
     /**
@@ -103,11 +103,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.");
     }
 
     /**

src/Context/RawMultilingualContext.php

Braces +3 added lines, -6 removed lines

@@ -68,15 +68,13 @@ 
         $element = $session->getPage()->find('css', $input);
         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));
         }
     }
@@ -90,8 +88,7 @@ 
                 $this->iShouldSeeInTheSourceOfThePage($text);
                 $isTextFound = true;
                 break;
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 sleep(1);
             }
         }