Merge pull request #14 from tectonic/feature/scoped-services

Change singletons to scoped for Octane

Author: kirkbushell

README.md

@@ -10,6 +10,11 @@ Install via composer:
 
     composer require tectonic/laravel-localisation
 
+Publish the configuration
+
+```shell
+php artisan vendor:publish --provider="Tectonic\LaravelLocalisation\ServiceProvider"
+```
 ## Documentation
 
 You can view the rest of the documentation here: (https://github.com/tectonic/laravel-localisation/wiki)

config/localisation.php

@@ -4,5 +4,12 @@
     /**
      * Define the model you wish to use for any translation features.
      */
-    'model' => \Tectonic\LaravelLocalisation\Database\Translation::class
+    'model' => \Tectonic\LaravelLocalisation\Database\Translation::class,
+
+    /**
+     * Define your custom transformers that will be used to transform the data.
+     */
+    'transformers' => [
+        //
+    ]
 ];

src/ServiceProvider.php

@@ -34,7 +34,7 @@ public function boot()
      */
     private function registerTranslationRepository()
     {
-        $this->app->singleton(TranslationRepository::class, function($app) {
+        $this->app->scoped(TranslationRepository::class, function($app) {
             $model = $app['config']->get('localisation.model');
 
             return new EloquentTranslationRepository(new $model);
@@ -47,7 +47,7 @@ private function registerTranslationRepository()
      */
     private function registerModelTransformer()
     {
-        $this->app->singleton(ModelTransformer::class, function($app) {
+        $this->app->scoped(ModelTransformer::class, function($app) {
             $modelTransformer = new ModelTransformer;
             $modelTransformer->setTranslationRepository($app->make(TranslationRepository::class));
 
@@ -61,7 +61,7 @@ private function registerModelTransformer()
      */
     private function registerCollectionTransformer()
     {
-        $this->app->singleton(CollectionTransformer::class, function($app) {
+        $this->app->scoped(CollectionTransformer::class, function($app) {
             $collectionTransformer = new CollectionTransformer;
             $collectionTransformer->setTranslationRepository($app->make(TranslationRepository::class));
 
@@ -74,13 +74,17 @@ private function registerCollectionTransformer()
      */
     private function registerTranslator()
     {
-        $this->app->singleton('localisation.translator', function($app) {
+        $this->app->scoped('localisation.translator', function($app) {
             $translatorEngine = new Engine;
-
+            
             $translatorEngine->registerTransformer(
                 $app->make(ModelTransformer::class),
                 $app->make(CollectionTransformer::class),
-                $app->make(PaginationTransformer::class)
+                $app->make(PaginationTransformer::class),
+                ...array_map(
+                    fn ($transformer) => $app->make($transformer),
+                    $app['config']->get('localisation.transformers', [])
+                )
             );
 
             return $translatorEngine;