Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.

Commit 9f042be

Browse files
committed
Merge branch 'master' into 1.0
2 parents 25d1c3b + 37e915f commit 9f042be

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

.styleci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
preset: laravel
2+
3+
disabled:
4+
- concat_without_spaces
5+
6+
enabled:
7+
- concat_with_spaces

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": ">=5.5.0",
14-
"laravel/framework": "5.0.*|5.1.*|5.2.*",
14+
"laravel/framework": "5.0 - 5.3",
1515
"findbrok/php-watson-api-bridge": "1.0.*"
1616
},
1717
"require-dev": {

src/AbstractTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function usingModel($modelName = '')
166166
//Set the model id
167167
$this->modelId = ($modelName == '') ?
168168
config('watson-translate.models.default') :
169-
config('watson-translate.models.'.$modelName);
169+
config('watson-translate.models.' . $modelName);
170170
//return the translator
171171
return $this;
172172
}

src/Translator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function getModelDetails()
125125
{
126126
//Send request to Watson
127127
$this->results = $this->makeBridge()
128-
->get('v2/models/'.$this->getModelId())
128+
->get('v2/models/' . $this->getModelId())
129129
->getBody()
130130
->getContents();
131131
//Return translator object

src/WatsonTranslateServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function boot()
3131
{
3232
//Publish config file
3333
$this->publishes([
34-
__DIR__.'/config/watson-translate.php' => config_path('watson-translate.php'),
34+
__DIR__ . '/config/watson-translate.php' => config_path('watson-translate.php'),
3535
], 'config');
3636
}
3737

@@ -43,7 +43,7 @@ public function boot()
4343
public function register()
4444
{
4545
//Merge config file
46-
$this->mergeConfigFrom(__DIR__.'/config/watson-translate.php', 'watson-translate');
46+
$this->mergeConfigFrom(__DIR__ . '/config/watson-translate.php', 'watson-translate');
4747
//Register Bindings
4848
$this->registerBinding();
4949
//Add Facades to the Translator service

0 commit comments

Comments
 (0)