yak0d3 / Mirza_Yandex_Translator

src/Mirza.php

Spacing +37 added lines, -37 removed lines

@@ -16,7 +16,7 @@ 
 

 use Exception;

 

-class Mirza{

+class Mirza {

     /**

      * The variable that will contain the MirzaClient instance

      *

@@ -29,7 +29,7 @@ 
      * 

      * @param MirzaClient $MirzaClient

      */

-    public function __construct(MirzaClient $MirzaClient){

+    public function __construct(MirzaClient $MirzaClient) {

         $this->client = $MirzaClient;

     }

     /**

@@ -39,8 +39,8 @@ 
      * @param string $lang

      * @return string

      */

-    public function translate(string $text,string $lang){

-        return $this->client->translate($text,$lang);

+    public function translate(string $text, string $lang) {

+        return $this->client->translate($text, $lang);

     }

     /**

      * Translates an array of text to the given language

@@ -54,19 +54,19 @@ 
      * @return string

      * @throws Exception if the target language is not supported

      */

-    public function translateArray(array $textArray, string $lang, $assoc = false){

-        if(!$this->isSupportedLang($lang)){

+    public function translateArray(array $textArray, string $lang, $assoc = false) {

+        if (!$this->isSupportedLang($lang)) {

             throw new Exception('The target language is not supported. Run getSupportedLanguages() to get the list of supported languages.');

         }

         $keys = array_keys($textArray);

         $translated = array();

 

         $index = 0;

-        if($assoc) $this->isAssoc($textArray);

-        foreach($textArray as $key => $text){

+        if ($assoc) $this->isAssoc($textArray);

+        foreach ($textArray as $key => $text) {

             $translated[$key] = [

                 'originalText' => $text,

-                'translatedText' => $this->client->translate($text,$lang) 

+                'translatedText' => $this->client->translate($text, $lang) 

             ];

             $index++;

         }

@@ -82,23 +82,23 @@ 
      * @return string

      * @throws Exception if one or more target languages are not supported

      */

-    public function translateTo(string $text, array $langs){

+    public function translateTo(string $text, array $langs) {

         $notSupported = array();

-        foreach($langs as $lang){

-            if(!$this->isSupportedLang($lang)){

+        foreach ($langs as $lang) {

+            if (!$this->isSupportedLang($lang)) {

                 array_push($notSupported, $lang);

             }

         }

-        if(count($notSupported) > 0){

+        if (count($notSupported) > 0) {

             throw new Exception('The following languages are not supported: '.implode("\n", $notSupported));

         }

         $textLang = $this->detectLanguage($text);

-        $translatedText = ['originalText' => $text, 'originalLanguage' => $textLang,'text' => array()];

-        foreach($langs as $lang){

-            try{

-                $translatedText['text'][$lang] = $this->client->translate($text,$lang);

+        $translatedText = ['originalText' => $text, 'originalLanguage' => $textLang, 'text' => array()];

+        foreach ($langs as $lang) {

+            try {

+                $translatedText['text'][$lang] = $this->client->translate($text, $lang);

             }

-            catch(Exception $e){

+            catch (Exception $e) {

                 $translatedText['text'][$lang] = '';

             }

         }

@@ -115,12 +115,12 @@ 
      * @return string

      * @throws Exception if the language name is not found

      */

-    public function detectLanguage(string $text,$langName = false){

+    public function detectLanguage(string $text, $langName = false) {

         $langCode = $this->client->detectLanguage($text);

-        if($langName){

+        if ($langName) {

             $allLanguages = $this->client->getLanguages();

 

-            if(array_key_exists($langCode,$allLanguages))

+            if (array_key_exists($langCode, $allLanguages))

                 return $allLanguages->$langCode;

             else

                 throw new Exception('Language name could not be found.');

@@ -133,7 +133,7 @@ 
      *

      * @return string

      */

-    public function getSupportedLanguages(){

+    public function getSupportedLanguages() {

         return json_encode($this->client->getLanguages());

     }

     /**

@@ -143,17 +143,17 @@ 
      * @param string $text

      * @return string

      */

-    public function translateToAll(string $text){

+    public function translateToAll(string $text) {

         $langs = $this->client->getLanguages(true);

         $textLang = $this->detectLanguage($text);

-        $translatedText = ['originalText' => $text, 'originalLanguage' => $textLang,'text' => array()];

+        $translatedText = ['originalText' => $text, 'originalLanguage' => $textLang, 'text' => array()];

         unset($langs[array_search($textLang, $langs)]);

         

-        foreach($langs as $lang){

-            try{

-                $translatedText['text'][$lang] = $this->client->translate($text,$lang);

+        foreach ($langs as $lang) {

+            try {

+                $translatedText['text'][$lang] = $this->client->translate($text, $lang);

             }

-            catch(Exception $e){

+            catch (Exception $e) {

                 $translatedText['text'][$lang] = '';

             }

         }

@@ -167,7 +167,7 @@ 
      * @param string $fontsize

      * @return string

      */

-    public function yandex_rights(string $color = "#fff", string $fontsize = "14px"){

+    public function yandex_rights(string $color = "#fff", string $fontsize = "14px") {

         $copyrights = "Powered by Yandex.Translate";

 

         return "<a href='https://translate.yandex.com/' target='_blank' style='font-size:$fontsize;color:$color;'>".$copyrights."</a>";

@@ -177,12 +177,12 @@ 
      *

      * @return string

      */

-    public function languages_select(){

+    public function languages_select() {

         $select = '<select>';

         $option = '<option value="_lang_code_">_lang_name_</option>';

-        foreach($this->client->supportedLanguages as $langCode => $langName){

-            $optionTemp = str_replace('_lang_code_',$langCode);

-            $optionTemp = str_replace('_lang_name_',$langName);

+        foreach ($this->client->supportedLanguages as $langCode => $langName) {

+            $optionTemp = str_replace('_lang_code_', $langCode);

+            $optionTemp = str_replace('_lang_name_', $langName);

             $select .= $optionTemp;

         }

         $select .= '</select>';

@@ -195,8 +195,8 @@ 
      * @return boolean

      * @throws Exception if the array given is not associative

      */

-    private function isAssoc(array $array){

-        if(array() == $array || array_keys($array) === range(0, count($array) - 1)){

+    private function isAssoc(array $array) {

+        if (array() == $array || array_keys($array) === range(0, count($array) - 1)) {

             throw new Exception('Argument 1 given to translateArray is a sequential array, an associative array is expected.');

         }

         return true;

@@ -207,8 +207,8 @@ 
      * @param string $lang

      * @return boolean

      */

-    private function isSupportedLang(string $lang){

-        if(!in_array($lang,json_decode(json_encode($this->client->supportedLanguages),true)))

+    private function isSupportedLang(string $lang) {

+        if (!in_array($lang, json_decode(json_encode($this->client->supportedLanguages), true)))

             return false;

         else

             return true;

Braces +17 added lines, -15 removed lines

@@ -62,7 +62,9 @@ 
         $translated = array();

 

         $index = 0;

-        if($assoc) $this->isAssoc($textArray);

+        if($assoc) {

+            $this->isAssoc($textArray);

+        }

         foreach($textArray as $key => $text){

             $translated[$key] = [

                 'originalText' => $text,

@@ -97,8 +99,7 @@ 
         foreach($langs as $lang){

             try{

                 $translatedText['text'][$lang] = $this->client->translate($text,$lang);

-            }

-            catch(Exception $e){

+            } catch(Exception $e){

                 $translatedText['text'][$lang] = '';

             }

         }

@@ -120,13 +121,14 @@ 
         if($langName){

             $allLanguages = $this->client->getLanguages();

 

-            if(array_key_exists($langCode,$allLanguages))

-                return $allLanguages->$langCode;

-            else

-                throw new Exception('Language name could not be found.');

+            if(array_key_exists($langCode,$allLanguages)) {

+                            return $allLanguages->$langCode;

+            } else {

+                            throw new Exception('Language name could not be found.');

+            }

+        } else {

+                    return $langCode;

         }

-        else

-            return $langCode;

     }

     /**

      * Returns the list of all supported languages

@@ -152,8 +154,7 @@ 
         foreach($langs as $lang){

             try{

                 $translatedText['text'][$lang] = $this->client->translate($text,$lang);

-            }

-            catch(Exception $e){

+            } catch(Exception $e){

                 $translatedText['text'][$lang] = '';

             }

         }

@@ -208,10 +209,11 @@ 
      * @return boolean

      */

     private function isSupportedLang(string $lang){

-        if(!in_array($lang,json_decode(json_encode($this->client->supportedLanguages),true)))

-            return false;

-        else

-            return true;

+        if(!in_array($lang,json_decode(json_encode($this->client->supportedLanguages),true))) {

+                    return false;

+        } else {

+                    return true;

+        }

     }

 

     

src/MirzaServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     {
 
         $this->publishes([
-			__DIR__.'/../config/mirza.php' => config_path('mirza.php'),
+            __DIR__.'/../config/mirza.php' => config_path('mirza.php'),
         ]);
         Blade::directive('translate', function ($expression){
             $expression = explode(',', $expression);

Spacing +7 added lines, -7 removed lines

@@ -18,18 +18,18 @@ 
         $this->publishes([
 			__DIR__.'/../config/mirza.php' => config_path('mirza.php'),
         ]);
-        Blade::directive('translate', function ($expression){
+        Blade::directive('translate', function($expression) {
             $expression = explode(',', $expression);
             $text = $expression[0];
             $lang = $expression[1];
 
             return "<?php echo Mirza::translate($text, $lang); ?>";
         });
-        Blade::directive('langselect', function (){
+        Blade::directive('langselect', function() {
             return "<?php echo Mirza::languages_select(); ?>";
         });
-        Blade::directive('yandex_rights',function($expression){
-            $expression = explode(',',$expression);
+        Blade::directive('yandex_rights', function($expression) {
+            $expression = explode(',', $expression);
             $color = $expression[0];
             $fontsize = $expression[1];
 
@@ -48,15 +48,15 @@ 
             __DIR__.'/../config/mirza.php', 'mirza'
         );
 
-        \App::singleton('MirzaClient',function(){
+        \App::singleton('MirzaClient', function() {
             return new MirzaClient(config('mirza.secret'));
         });
-        \App::bind('Mirza',function(){
+        \App::bind('Mirza', function() {
             $client = resolve('MirzaClient');
             return new Mirza($client);
         });
 
-        \App::alias('Mirza','yak0d3\Mirza_Yandex_Translator\MirzaFacade');
+        \App::alias('Mirza', 'yak0d3\Mirza_Yandex_Translator\MirzaFacade');
 
     }
 }

src/MirzaClient.php

Spacing +22 added lines, -22 removed lines

@@ -14,7 +14,7 @@ 
 

 use Exception;

 

-class MirzaClient{

+class MirzaClient {

     /**

      * Yandex Translation API Key Variable

      * Publish the configuration using `php artisan vendor:publish`, 

@@ -29,7 +29,7 @@ 
      * @var string

      */

     public $supportedLanguages;

-    public function __construct($key){

+    public function __construct($key) {

         $this->isValidKey($key);

         $this->key = $key;

         $this->supportedLanguages = $this->getLanguages(true);

@@ -41,14 +41,14 @@ 
      * @return boolean

      * @throws Exception if the key is invalid

      */

-    private function isValidKey($key){

+    private function isValidKey($key) {

         $ch = curl_init();

-        curl_setopt($ch, CURLOPT_URL,"https://translate.yandex.net/api/v1.5/tr.json/detect");

+        curl_setopt($ch, CURLOPT_URL, "https://translate.yandex.net/api/v1.5/tr.json/detect");

         curl_setopt($ch, CURLOPT_POST, true);

         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);

         curl_setopt($ch, CURLOPT_HEADER, true);

         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

-        curl_setopt($ch, CURLOPT_POSTFIELDS,"text=YTranslator&key=".$key);

+        curl_setopt($ch, CURLOPT_POSTFIELDS, "text=YTranslator&key=".$key);

         $response = curl_exec($ch);

         $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);

         curl_close($ch);

@@ -73,7 +73,7 @@ 
                 $errorMsg = 'An unexpected error has occured while trying to verify the API Key.';

                 break;

         }

-        if(!$goodKey){

+        if (!$goodKey) {

             throw new \Exception($errorMsg." Key: ".$key);

         }

         

@@ -87,18 +87,18 @@ 
      * @return string

      * @throws Exception if the string could not be translated

      */

-    public function translate($text, $lang, $format = 'plain'){

+    public function translate($text, $lang, $format = 'plain') {

             

         $ch = curl_init();

-        curl_setopt($ch, CURLOPT_URL,"https://translate.yandex.net/api/v1.5/tr.json/translate");

+        curl_setopt($ch, CURLOPT_URL, "https://translate.yandex.net/api/v1.5/tr.json/translate");

         curl_setopt($ch, CURLOPT_POST, true);

-        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, true);

-        curl_setopt($ch, CURLOPT_POSTFIELDS,"text=".urlencode($text)."&lang=".$lang."&format=".$format."&key=".$this->key);

+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);

+        curl_setopt($ch, CURLOPT_POSTFIELDS, "text=".urlencode($text)."&lang=".$lang."&format=".$format."&key=".$this->key);

         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

 

         $response = json_decode(curl_exec($ch));

         curl_close($ch);

-        if(array_key_exists('text',$response))

+        if (array_key_exists('text', $response))

             return $response->text[0];

         else

             throw new Exception('This text could not be translated: the string you entered or the language code are maybe invalid. Run getSupportedLanguages() to get the list of supported languages.');

@@ -110,18 +110,18 @@ 
      * @return string

      * @throws Exception if it couldn't detect the language

      */

-    public function detectLanguage($text){

+    public function detectLanguage($text) {

         $ch = curl_init();

-        curl_setopt($ch, CURLOPT_URL,"https://translate.yandex.net/api/v1.5/tr.json/detect");

+        curl_setopt($ch, CURLOPT_URL, "https://translate.yandex.net/api/v1.5/tr.json/detect");

         curl_setopt($ch, CURLOPT_POST, true);

-        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, true);

-        curl_setopt($ch, CURLOPT_POSTFIELDS,"text=".urlencode($text)."&key=".$this->key);

+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);

+        curl_setopt($ch, CURLOPT_POSTFIELDS, "text=".urlencode($text)."&key=".$this->key);

         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

 

         $response = json_decode(curl_exec($ch));

         curl_close($ch);

         

-        if(array_key_exists("lang",$response) && $response->lang != null)

+        if (array_key_exists("lang", $response) && $response->lang != null)

             return $response->lang;

         else

             throw new Exception('Could not get the language code: the entered string may not be valid.');

@@ -134,18 +134,18 @@ 
      * @return string

      * @throws Exception if an unknown error occures while trying to fetch the list of supported languages

      */

-    public function getLanguages($codes = false){

+    public function getLanguages($codes = false) {

         $ch = curl_init();

-        curl_setopt($ch, CURLOPT_URL,"https://translate.yandex.net/api/v1.5/tr.json/getLangs");

+        curl_setopt($ch, CURLOPT_URL, "https://translate.yandex.net/api/v1.5/tr.json/getLangs");

         curl_setopt($ch, CURLOPT_POST, true);

-        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, true);

-        curl_setopt($ch, CURLOPT_POSTFIELDS,"ui=en&key=".$this->key);

+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);

+        curl_setopt($ch, CURLOPT_POSTFIELDS, "ui=en&key=".$this->key);

         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

 

         $response = json_decode(curl_exec($ch));

         curl_close($ch);

-        if(array_key_exists("langs",$response))

-            return $codes ? array_keys(json_decode(json_encode($response->langs),true)) : $response->langs;

+        if (array_key_exists("langs", $response))

+            return $codes ? array_keys(json_decode(json_encode($response->langs), true)) : $response->langs;

         else

             throw new Exception('An unknown error has occured while trying to fetch the list of supported languages.');

     }

Braces +15 added lines, -12 removed lines

@@ -98,10 +98,11 @@ 
 

         $response = json_decode(curl_exec($ch));

         curl_close($ch);

-        if(array_key_exists('text',$response))

-            return $response->text[0];

-        else

-            throw new Exception('This text could not be translated: the string you entered or the language code are maybe invalid. Run getSupportedLanguages() to get the list of supported languages.');

+        if(array_key_exists('text',$response)) {

+                    return $response->text[0];

+        } else {

+                    throw new Exception('This text could not be translated: the string you entered or the language code are maybe invalid. Run getSupportedLanguages() to get the list of supported languages.');

+        }

     }

     /**

      * Detects the language of a given text and returns the language code.

@@ -121,10 +122,11 @@ 
         $response = json_decode(curl_exec($ch));

         curl_close($ch);

         

-        if(array_key_exists("lang",$response) && $response->lang != null)

-            return $response->lang;

-        else

-            throw new Exception('Could not get the language code: the entered string may not be valid.');

+        if(array_key_exists("lang",$response) && $response->lang != null) {

+                    return $response->lang;

+        } else {

+                    throw new Exception('Could not get the language code: the entered string may not be valid.');

+        }

     }

     /**

      * Returns the list of supported languages

@@ -144,10 +146,11 @@ 
 

         $response = json_decode(curl_exec($ch));

         curl_close($ch);

-        if(array_key_exists("langs",$response))

-            return $codes ? array_keys(json_decode(json_encode($response->langs),true)) : $response->langs;

-        else

-            throw new Exception('An unknown error has occured while trying to fetch the list of supported languages.');

+        if(array_key_exists("langs",$response)) {

+                    return $codes ? array_keys(json_decode(json_encode($response->langs),true)) : $response->langs;

+        } else {

+                    throw new Exception('An unknown error has occured while trying to fetch the list of supported languages.');

+        }

     }

 

 }