From 8263fa41dd7b95f0e115ea29ee61ca35c18b37f8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 30 Jan 2017 17:29:05 +0100
Subject: [PATCH] Rewrote currency and export/import job service provider

---
 app/Providers/CurrencyServiceProvider.php  | 18 ++++++++--------
 app/Providers/ExportJobServiceProvider.php | 24 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php
index d95532e072..bfdf535c70 100644
--- a/app/Providers/CurrencyServiceProvider.php
+++ b/app/Providers/CurrencyServiceProvider.php
@@ -14,7 +14,8 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Providers;
 
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Currency\CurrencyRepository;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
@@ -43,16 +44,15 @@ class CurrencyServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->bind(
-            'FireflyIII\Repositories\Currency\CurrencyRepositoryInterface',
-            function (Application $app, array $arguments) {
-                if (!isset($arguments[0]) && $app->auth->check()) {
-                    return app('FireflyIII\Repositories\Currency\CurrencyRepository', [auth()->user()]);
-                }
-                if (!isset($arguments[0]) && !$app->auth->check()) {
-                    throw new FireflyException('There is no user present.');
+            CurrencyRepositoryInterface::class,
+            function (Application $app) {
+                /** @var CurrencyRepository $repository */
+                $repository = app(CurrencyRepository::class);
+                if ($app->auth->check()) {
+                    $repository->setUser(auth()->user());
                 }
 
-                return app('FireflyIII\Repositories\Currency\CurrencyRepository', $arguments);
+                return $repository;
             }
         );
     }
diff --git a/app/Providers/ExportJobServiceProvider.php b/app/Providers/ExportJobServiceProvider.php
index 220a678623..7c12925df1 100644
--- a/app/Providers/ExportJobServiceProvider.php
+++ b/app/Providers/ExportJobServiceProvider.php
@@ -15,6 +15,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Providers;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\ExportJob\ExportJobRepository;
+use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
@@ -33,8 +35,7 @@ class ExportJobServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->exportJob();
-        $this->importJob();
+
 
     }
 
@@ -45,7 +46,8 @@ class ExportJobServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        //
+        $this->exportJob();
+        $this->importJob();
     }
 
     /**
@@ -53,18 +55,16 @@ class ExportJobServiceProvider extends ServiceProvider
      */
     private function exportJob()
     {
-
         $this->app->bind(
-            'FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface',
-            function (Application $app, array $arguments) {
-                if (!isset($arguments[0]) && $app->auth->check()) {
-                    return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', [auth()->user()]);
-                }
-                if (!isset($arguments[0]) && !$app->auth->check()) {
-                    throw new FireflyException('There is no user present.');
+            ExportJobRepositoryInterface::class,
+            function (Application $app) {
+                /** @var ExportJobRepository $repository */
+                $repository = app(ExportJobRepository::class);
+                if ($app->auth->check()) {
+                    $repository->setUser(auth()->user());
                 }
 
-                return app('FireflyIII\Repositories\ExportJob\ExportJobRepository', $arguments);
+                return $repository;
             }
         );
     }