@@ -53,7 +53,7 @@ |
||
| 53 | 53 | $this->info('Migration successfully created!'); |
| 54 | 54 | } else { |
| 55 | 55 | $this->error( |
| 56 | - 'Couldn\'t create migration.'.PHP_EOL.' Check the write permissions |
|
| 56 | + 'Couldn\'t create migration.' . PHP_EOL . ' Check the write permissions |
|
| 57 | 57 | within the database/migrations directory.' |
| 58 | 58 | ); |
| 59 | 59 | } |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | ); |
| 45 | 45 | |
| 46 | 46 | // Register blade directives |
| 47 | - Blade::directive('t', function ($expression) { |
|
| 47 | + Blade::directive('t', function($expression) { |
|
| 48 | 48 | return "<?php echo e(t({$expression})); ?>"; |
| 49 | 49 | }); |
| 50 | 50 | |
| 51 | - $this->app['events']->listen('locale.changed', function ($locale) { |
|
| 51 | + $this->app['events']->listen('locale.changed', function($locale) { |
|
| 52 | 52 | $this->app['multilang']->setLocale($locale); |
| 53 | 53 | }); |
| 54 | 54 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $configPath = __DIR__ . '/../config/config.php'; |
| 73 | 73 | $this->mergeConfigFrom($configPath, 'debugbar'); |
| 74 | 74 | |
| 75 | - $this->app->singleton('multilang', function ($app) { |
|
| 75 | + $this->app->singleton('multilang', function($app) { |
|
| 76 | 76 | $environment = $app->environment(); |
| 77 | 77 | $config = $app['config']->get('multilang'); |
| 78 | 78 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | ); |
| 85 | 85 | |
| 86 | 86 | if ($multilang->autoSaveIsAllowed()) { |
| 87 | - $app->terminating(function () use ($multilang) { |
|
| 87 | + $app->terminating(function() use ($multilang) { |
|
| 88 | 88 | return $multilang->saveTexts(); |
| 89 | 89 | }); |
| 90 | 90 | } |
@@ -95,13 +95,13 @@ discard block |
||
| 95 | 95 | $this->app->alias('multilang', 'Longman\LaravelMultiLang\MultiLang'); |
| 96 | 96 | |
| 97 | 97 | $this->app['command.multilang.migration'] = $this->app->share( |
| 98 | - function () { |
|
| 98 | + function() { |
|
| 99 | 99 | return new MigrationCommand(); |
| 100 | 100 | } |
| 101 | 101 | ); |
| 102 | 102 | |
| 103 | 103 | $this->app['command.multilang.texts'] = $this->app->share( |
| 104 | - function () { |
|
| 104 | + function() { |
|
| 105 | 105 | return new TextsCommand(); |
| 106 | 106 | } |
| 107 | 107 | ); |
@@ -24,10 +24,10 @@ |
||
| 24 | 24 | $options['scope'] = $request->scope; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - $texts = Text::where(function ($q) use ($options) { |
|
| 27 | + $texts = Text::where(function($q) use ($options) { |
|
| 28 | 28 | foreach ($options as $k => $v) { |
| 29 | 29 | if ($k == 'keyword') { |
| 30 | - $q->where(function ($query) use ($v) { |
|
| 30 | + $q->where(function($query) use ($v) { |
|
| 31 | 31 | $query->where('key', 'LIKE', '%' . $v . '%')->orWhere('value', 'LIKE', '%' . $v . '%'); |
| 32 | 32 | }); |
| 33 | 33 | } else { |
@@ -28,16 +28,15 @@ |
||
| 28 | 28 | /** |
| 29 | 29 | * Create a new MultiLang instance. |
| 30 | 30 | * |
| 31 | - * @param string $environment |
|
| 32 | - * @param array $config |
|
| 33 | - * @param \Illuminate\Cache\CacheManager $cache |
|
| 34 | - * @param \Illuminate\Database\DatabaseManager $db |
|
| 35 | 31 | */ |
| 36 | 32 | public function __construct(array $data) |
| 37 | 33 | { |
| 38 | 34 | $this->data = $data; |
| 39 | 35 | } |
| 40 | 36 | |
| 37 | + /** |
|
| 38 | + * @param string $key |
|
| 39 | + */ |
|
| 41 | 40 | public function get($key = null, $default = null) |
| 42 | 41 | { |
| 43 | 42 | $array = $this->data; |
@@ -12,9 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | use Illuminate\Cache\CacheManager as Cache; |
| 14 | 14 | use Illuminate\Database\DatabaseManager as Database; |
| 15 | -use Illuminate\Http\Request; |
|
| 16 | -use Illuminate\Support\Collection; |
|
| 17 | -use InvalidArgumentException; |
|
| 18 | 15 | use Longman\LaravelMultiLang\Config; |
| 19 | 16 | |
| 20 | 17 | class Repository |
@@ -59,8 +59,7 @@ discard block |
||
| 59 | 59 | /** |
| 60 | 60 | * Create a new MultiLang instance. |
| 61 | 61 | * |
| 62 | - * @param string $environment |
|
| 63 | - * @param array $config |
|
| 62 | + * @param Config $config |
|
| 64 | 63 | * @param \Illuminate\Cache\CacheManager $cache |
| 65 | 64 | * @param \Illuminate\Database\DatabaseManager $db |
| 66 | 65 | */ |
@@ -149,6 +148,9 @@ discard block |
||
| 149 | 148 | } |
| 150 | 149 | |
| 151 | 150 | |
| 151 | + /** |
|
| 152 | + * @return string |
|
| 153 | + */ |
|
| 152 | 154 | protected function getTableName() |
| 153 | 155 | { |
| 154 | 156 | $table = $this->config->get('db.texts_table', 'texts'); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | /** |
| 172 | 172 | * Get texts |
| 173 | 173 | * |
| 174 | - * @return array |
|
| 174 | + * @return null|string |
|
| 175 | 175 | */ |
| 176 | 176 | public function getRedirectUrl(Request $request) |
| 177 | 177 | { |
@@ -207,6 +207,9 @@ discard block |
||
| 207 | 207 | return null; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | + /** |
|
| 211 | + * @return string |
|
| 212 | + */ |
|
| 210 | 213 | public function detectLocale(Request $request) |
| 211 | 214 | { |
| 212 | 215 | $locale = $request->segment(1); |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Illuminate\Cache\CacheManager as Cache; |
| 15 | 15 | use Illuminate\Database\DatabaseManager as Database; |
| 16 | 16 | use Illuminate\Http\Request; |
| 17 | -use Illuminate\Routing\Router; |
|
| 18 | 17 | use InvalidArgumentException; |
| 19 | 18 | use Longman\LaravelMultiLang\Config; |
| 20 | 19 | use Longman\LaravelMultiLang\Repository; |
@@ -230,7 +230,7 @@ |
||
| 230 | 230 | foreach ($locales as $locale => $val) { |
| 231 | 231 | $router->group([ |
| 232 | 232 | 'prefix' => $locale, |
| 233 | - 'as' => $locale.'.', |
|
| 233 | + 'as' => $locale . '.', |
|
| 234 | 234 | ], $callback); |
| 235 | 235 | } |
| 236 | 236 | |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | |
| 31 | 31 | public function getQualifiedLocalizableColumn() |
| 32 | 32 | { |
| 33 | - return $this->getTable().'.'.$this->getLocalizableColumn(); |
|
| 33 | + return $this->getTable() . '.' . $this->getLocalizableColumn(); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | { |
| 37 | 37 | $wheres = $builder->getQuery()->wheres; |
| 38 | 38 | $column = $this->getLocalizableColumn($builder); |
| 39 | - foreach($wheres as $where) { |
|
| 39 | + foreach ($wheres as $where) { |
|
| 40 | 40 | if ($where['column'] == $column) { |
| 41 | 41 | return true; |
| 42 | 42 | } |