only load repository when model exists

bitsoflove · Mar 17, 2017 · 517af9d · 517af9d
1 parent 5bd9845
commit 517af9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -20,6 +20,10 @@ public function __construct(LoaderInterface $loader, $locale)
     private function initializeDependencies()
     {
         try {
+            if(! class_exists('\Anomaly\Streams\Platform\Model\Translations\TranslationsTranslationsEntryModel')) {
+                throw new \Exception("TranslationsTranslationsEntryModel has not been compiled yet. Execute php artisan streams:compile");
+            }
+
             $this->moduleTranslationsRepo = app(ModuleTranslationsRepository::class);
         } catch(\Exception $e) {
             // this might happen when streams:compile hasn't been executed yet
@@ -30,6 +34,12 @@ private function initializeDependencies()
     public function get($key, array $replace = [], $locale = null, $fallback = true)
     {
         try {
+
+            // fallback to default behaviour if the translations model hasn't been compiled yet
+            if(! class_exists('\Anomaly\Streams\Platform\Model\Translations\TranslationsTranslationsEntryModel')) {
+                return parent::get($key, $replace, $locale, $fallback);
+            }
+
             if (empty($locale)) {
                 $locale = app()->getLocale();
             }

diff --git a/src/Translator/TranslatorServiceProvider.php b/src/Translator/TranslatorServiceProvider.php
@@ -1,7 +1,6 @@
 <?php
 namespace Bitsoflove\TranslationsModule\Translator;
 
-use Bitsoflove\TranslationsModule\TranslationsModule;
 use Bitsoflove\TranslationsModule\Translator\Translator as BolTranslator;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Translation\TranslationServiceProvider;