Merge branch 'master' into 1.0

findbrok · Nov 5, 2016 · 9f042be · 9f042be
2 parents 25d1c3b + 37e915f
commit 9f042be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,7 @@
+preset: laravel
+
+disabled:
+    - concat_without_spaces
+
+enabled:
+    - concat_with_spaces
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "laravel/framework": "5.0.*|5.1.*|5.2.*",
+        "laravel/framework": "5.0 - 5.3",
         "findbrok/php-watson-api-bridge": "1.0.*"
     },
     "require-dev": {

diff --git a/src/AbstractTranslator.php b/src/AbstractTranslator.php
@@ -166,7 +166,7 @@ public function usingModel($modelName = '')
         //Set the model id
         $this->modelId = ($modelName == '') ?
                          config('watson-translate.models.default') :
-                         config('watson-translate.models.'.$modelName);
+                         config('watson-translate.models.' . $modelName);
         //return the translator
         return $this;
     }

diff --git a/src/Translator.php b/src/Translator.php
@@ -125,7 +125,7 @@ public function getModelDetails()
     {
         //Send request to Watson
         $this->results = $this->makeBridge()
-                              ->get('v2/models/'.$this->getModelId())
+                              ->get('v2/models/' . $this->getModelId())
                               ->getBody()
                               ->getContents();
         //Return translator object

diff --git a/src/WatsonTranslateServiceProvider.php b/src/WatsonTranslateServiceProvider.php
@@ -31,7 +31,7 @@ public function boot()
     {
         //Publish config file
         $this->publishes([
-            __DIR__.'/config/watson-translate.php' => config_path('watson-translate.php'),
+            __DIR__ . '/config/watson-translate.php' => config_path('watson-translate.php'),
         ], 'config');
     }
 
@@ -43,7 +43,7 @@ public function boot()
     public function register()
     {
         //Merge config file
-        $this->mergeConfigFrom(__DIR__.'/config/watson-translate.php', 'watson-translate');
+        $this->mergeConfigFrom(__DIR__ . '/config/watson-translate.php', 'watson-translate');
         //Register Bindings
         $this->registerBinding();
         //Add Facades to the Translator service