Some generic code refactoring.

This commit is contained in:
James Cole
2019-06-21 19:10:02 +02:00
parent fb1af395f9
commit 2d3d7f7720
67 changed files with 920 additions and 603 deletions

View File

@@ -29,8 +29,8 @@ use FireflyIII\Helpers\Attachments\AttachmentHelper;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Helpers\Chart\MetaPieChart;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\FiscalHelper;
use FireflyIII\Helpers\FiscalHelperInterface;
use FireflyIII\Helpers\Fiscal\FiscalHelper;
use FireflyIII\Helpers\Fiscal\FiscalHelperInterface;
use FireflyIII\Helpers\Help\Help;
use FireflyIII\Helpers\Help\HelpInterface;
use FireflyIII\Helpers\Report\BalanceReportHelper;

View File

@@ -24,8 +24,6 @@ namespace FireflyIII\Providers;
use FireflyIII\Helpers\Collector\GroupCollector;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Collector\GroupSumCollector;
use FireflyIII\Helpers\Collector\GroupSumCollectorInterface;
use FireflyIII\Repositories\Journal\JournalRepository;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;
@@ -54,7 +52,6 @@ class JournalServiceProvider extends ServiceProvider
$this->registerRepository();
$this->registerGroupRepository();
$this->registerGroupCollector();
$this->registerSumCollector();
}
/**
@@ -113,23 +110,4 @@ class JournalServiceProvider extends ServiceProvider
}
);
}
/**
* Register sum collector.
*/
private function registerSumCollector(): void
{
$this->app->bind(
GroupSumCollectorInterface::class,
function (Application $app) {
/** @var GroupSumCollector $collector */
$collector = app(GroupSumCollector::class);
if ($app->auth->check()) {
$collector->setUser(auth()->user());
}
return $collector;
}
);
}
}