Merge pull request #5 from nstack-io/develop

Develop

Author: Casperhr

README.md

@@ -15,26 +15,38 @@ To install this package you will need:
 
 * PHP 7.1+
 
-Run 
+Run
 
 `composer require nstack/laravel-sdk`
 
 or setup in composer.json
 
 `nstack/laravel-sdk: 1.0.x`
 
+In `config/app.php` (Laravel) or `bootstrap/app.php` (Lumen) you should replace Laravel's translation service provider
+
+```php
+Illuminate\Translation\TranslationServiceProvider::class,
+```
+
+by the one included in this package:
+
+```php
+NStack\ServiceProvider::class
+```
 
 Setup in config/app.php
 
 ```php
 
-'providers' => 
+'providers' =>
 [
     ....
+    // Illuminate\Translation\TranslationServiceProvider::class
     NStack\ServiceProvider::class
 ]
 
-'aliases' => 
+'aliases' =>
 [
     ....
     'NStack'       => NStack\Facade::class,
@@ -57,12 +69,20 @@ You can now call via facade, eg:
 \NStack::getContinentsClient()->index()
 ````
 
-or via globa func
+or via global function
 
 ```php
 nstack()->getContinentsClient()->index()
 ```
 
+
+or via integration with `trans()` [helper](https://laravel.com/docs/5.8/helpers#method-trans)
+
+```php
+echo trans('messages.welcome');
+```
+
+
 All the basic fuctionality can be found in the php-sdk
 
 ## Features
@@ -72,7 +92,9 @@ All the basic fuctionality can be found in the php-sdk
 
 [Link here](https://github.com/nstack-io/php-sdk)
 
+All PHP functionality can be found
 
+[Link](https://github.com/nstack-io/php-sdk)
 
 ## 🏆 Credits
 

composer.json

@@ -16,8 +16,8 @@
     ],
     "require": {
         "php": "^7.1",
-        "nstack/php-sdk": "1.0.x",
-        "laravel/framework": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*"
+        "nstack/php-sdk": "1.0.*",
+	"illuminate/translation": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.7",
@@ -33,4 +33,4 @@
             "src/Helpers.php"
         ]
     }
-}
+}

config/nstack.php

@@ -5,4 +5,8 @@
     'master_key'     => null,
     'base_url'       => 'https://nstack.io',
     'version'        => 'v2',
-];
+    'platform'       => 'backend',
+    'cacheTime'      => 600,
+    'maxNetworkRetries' => 3,
+    'retryNetworkAfterSec' => 10,
+];

src/ServiceProvider.php

@@ -2,12 +2,14 @@
 
 namespace NStack;
 
-use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
+use Illuminate\Support\Str;
+use Illuminate\Translation\TranslationServiceProvider;
+use NStack\Translation\NStackLoader;
 
 /**
  * Class ServiceProvider.
  */
-class ServiceProvider extends IlluminateServiceProvider
+class ServiceProvider extends TranslationServiceProvider
 {
     /**
      * boot
@@ -16,7 +18,9 @@ class ServiceProvider extends IlluminateServiceProvider
      */
     public function boot()
     {
-        $this->publishGroups();
+        if (!Str::contains($this->app->version(), 'Lumen')) {
+            $this->publishGroups();
+        }
     }
 
     /**
@@ -28,6 +32,7 @@ public function register()
     {
         $this->registerManager();
         $this->setupBindings();
+        parent::register();
     }
 
     /**
@@ -55,6 +60,17 @@ protected function setupBindings()
         });
     }
 
+    /**
+     * {@inheritDoc}
+     * @see \Illuminate\Translation\TranslationServiceProvider::registerLoader()
+     */
+    protected function registerLoader()
+    {
+        $this->app->singleton('translation.loader', function ($app) {
+            return new NStackLoader($app['files'], $app['path.lang'], $app->get('nstack'));
+        });
+    }
+
     /**
      * Register assets manager.
      *
@@ -71,4 +87,4 @@ public function registerManager()
             return new NStack($config);
         });
     }
-}
+}