From 1b98c1622169b2cc43f76c13c3e6b173f79988d6 Mon Sep 17 00:00:00 2001 From: Sandor Lengyel Date: Mon, 25 May 2020 15:09:34 +0300 Subject: [PATCH 1/5] allow higher versions of illuminate/support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e35b40f..55d6f80 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "license": "MIT", "require": { "php": ">=5.3.0", - "illuminate/support": "~5.1" + "illuminate/support": "^5.1|^6.0|^7.0" }, "autoload": { "classmap": [ From bbf7bbb0d61691343dfdb92fb0a066d17f6528c4 Mon Sep 17 00:00:00 2001 From: Sandor Lengyel Date: Mon, 25 May 2020 15:16:53 +0300 Subject: [PATCH 2/5] adjusted service provider --- composer.json | 2 +- .../LangImportExportServiceProvider.php | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 55d6f80..09a7193 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "license": "MIT", "require": { "php": ">=5.3.0", - "illuminate/support": "^5.1|^6.0|^7.0" + "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0" }, "autoload": { "classmap": [ diff --git a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php index 8f0380f..c495a2c 100644 --- a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php +++ b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php @@ -3,7 +3,6 @@ namespace UFirst\LangImportExport; use Illuminate\Support\ServiceProvider; -use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; use UFirst\LangImportExport\Console\ExportToCsvCommand; use UFirst\LangImportExport\Console\ImportFromCsvCommand; @@ -17,18 +16,6 @@ class LangImportExportServiceProvider extends ServiceProvider { */ protected $defer = true; - /** - * Bootstrap the application events. - * - * @return void - */ - public function boot(DispatcherContract $events) - { - parent::boot($events); - $this->registerExportToCsvCommand(); - $this->registerImportFromCsvCommand(); - } - /** * Register the service provider. * @@ -36,6 +23,8 @@ public function boot(DispatcherContract $events) */ public function register() { + $this->registerExportToCsvCommand(); + $this->registerImportFromCsvCommand(); require __DIR__.'/../../bindings.php'; } From fab5153392509d226d1aae4f9250a90f621e2e8c Mon Sep 17 00:00:00 2001 From: Sandor Lengyel Date: Mon, 25 May 2020 15:26:14 +0300 Subject: [PATCH 3/5] uprade --- .../LangImportExportServiceProvider.php | 34 ++++++------------- src/bindings.php | 8 ----- 2 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 src/bindings.php diff --git a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php index c495a2c..897ac86 100644 --- a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php +++ b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php @@ -6,7 +6,7 @@ use UFirst\LangImportExport\Console\ExportToCsvCommand; use UFirst\LangImportExport\Console\ImportFromCsvCommand; - +use UFirst\LangImportExport\LangListService; class LangImportExportServiceProvider extends ServiceProvider { /** @@ -14,7 +14,7 @@ class LangImportExportServiceProvider extends ServiceProvider { * * @var bool */ - protected $defer = true; + protected $defer = false; /** * Register the service provider. @@ -23,9 +23,15 @@ class LangImportExportServiceProvider extends ServiceProvider { */ public function register() { - $this->registerExportToCsvCommand(); - $this->registerImportFromCsvCommand(); - require __DIR__.'/../../bindings.php'; + if ($this->app->runningInConsole()) { + $this->commands([ + ExportToCsvCommand::class, + ImportFromCsvCommand::class + ]); + $this->app->singleton(LangListService::class, function ($app) { + return new LangListService(); + }); + } } /** @@ -40,22 +46,4 @@ public function provides() ]; } - private function registerExportToCsvCommand() { - $this->app['lang-export.csv'] = $this->app->share(function($app) - { - return new ExportToCsvCommand(); - }); - - $this->commands('lang-export.csv'); - } - - private function registerImportFromCsvCommand() { - $this->app['lang-import.csv'] = $this->app->share(function($app) - { - return new ImportFromCsvCommand(); - }); - - $this->commands('lang-import.csv'); - } - } diff --git a/src/bindings.php b/src/bindings.php deleted file mode 100644 index a80750c..0000000 --- a/src/bindings.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Mon, 25 May 2020 15:38:09 +0300 Subject: [PATCH 4/5] Arr::dot and command handle() --- src/UFirst/LangImportExport/Console/ExportToCsvCommand.php | 4 ++-- src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php | 2 +- .../LangImportExport/LangImportExportServiceProvider.php | 2 +- src/UFirst/LangImportExport/LangListService.php | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/UFirst/LangImportExport/Console/ExportToCsvCommand.php b/src/UFirst/LangImportExport/Console/ExportToCsvCommand.php index 0b4236a..1ef4539 100644 --- a/src/UFirst/LangImportExport/Console/ExportToCsvCommand.php +++ b/src/UFirst/LangImportExport/Console/ExportToCsvCommand.php @@ -55,7 +55,7 @@ protected function getOptions() * * @return void */ - public function fire() + public function handle() { $locale = $this->argument('locale'); $group = $this->argument('group'); @@ -73,7 +73,7 @@ public function fire() // Write CSV lintes foreach ($strings as $key => $value) { - fputcsv($out, array($key, $value), $delimiter, $enclosure); + fputcsv($out, array($key, is_array($value) ? implode(',', $value) : $value), $delimiter, $enclosure); } fclose($out); diff --git a/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php b/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php index be4bda1..fa68f8b 100644 --- a/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php +++ b/src/UFirst/LangImportExport/Console/ImportFromCsvCommand.php @@ -56,7 +56,7 @@ protected function getOptions() * * @return void */ - public function fire() + public function handle() { $locale = $this->argument('locale'); $group = $this->argument('group'); diff --git a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php index 897ac86..867dbdc 100644 --- a/src/UFirst/LangImportExport/LangImportExportServiceProvider.php +++ b/src/UFirst/LangImportExport/LangImportExportServiceProvider.php @@ -28,7 +28,7 @@ public function register() ExportToCsvCommand::class, ImportFromCsvCommand::class ]); - $this->app->singleton(LangListService::class, function ($app) { + $this->app->singleton('LangImportExportLangListService', function ($app) { return new LangListService(); }); } diff --git a/src/UFirst/LangImportExport/LangListService.php b/src/UFirst/LangImportExport/LangListService.php index 38972cf..0cf5296 100644 --- a/src/UFirst/LangImportExport/LangListService.php +++ b/src/UFirst/LangImportExport/LangListService.php @@ -1,6 +1,7 @@ load($locale, $group); - $translations_with_prefix = array_dot(array($group => $translations)); + $translations_with_prefix = Arr::dot(array($group => $translations)); return $translations_with_prefix; } From d74caf99a5049e22d1e331725d403259260b215a Mon Sep 17 00:00:00 2001 From: Sandor Lengyel Date: Tue, 26 May 2020 10:34:32 +0300 Subject: [PATCH 5/5] Arr:set instead of arr_set --- src/UFirst/LangImportExport/LangListService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UFirst/LangImportExport/LangListService.php b/src/UFirst/LangImportExport/LangListService.php index 0cf5296..a8533cc 100644 --- a/src/UFirst/LangImportExport/LangListService.php +++ b/src/UFirst/LangImportExport/LangListService.php @@ -16,7 +16,7 @@ public function loadLangList($locale, $group) { public function writeLangList($locale, $group, $new_translations) { $translations = Lang::getLoader()->load($locale, $group); foreach($new_translations as $key => $value) { - array_set($translations, $key, $value); + Arr::set($translations, $key, $value); } $header = "