Some cleaning up [skip ci]

This commit is contained in:
James Cole 2016-04-26 14:56:42 +02:00
parent dfbe6e5b6e
commit edf9dbc6e8
3 changed files with 4 additions and 16 deletions

View File

@ -53,16 +53,4 @@ class Kernel extends ConsoleKernel
UpgradeFireflyInstructions::class,
VerifyDatabase::class,
];
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*
*/
protected function schedule(Schedule $schedule)
{
}
}

View File

@ -62,6 +62,7 @@ class CsvExporter extends BasicExporter implements ExporterInterface
$rows = [];
// add header:
/** @var Entry $first */
$first = $this->getEntries()->first();
$rows[] = array_keys(get_object_vars($first));

View File

@ -2,7 +2,6 @@
namespace FireflyIII\Providers;
use Auth;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
@ -34,10 +33,10 @@ class JournalServiceProvider extends ServiceProvider
$this->app->bind(
'FireflyIII\Repositories\Journal\JournalRepositoryInterface',
function (Application $app, array $arguments) {
if (!isset($arguments[0]) && Auth::check()) {
return app('FireflyIII\Repositories\Journal\JournalRepository', [Auth::user()]);
if (!isset($arguments[0]) && $app->auth->check()) {
return app('FireflyIII\Repositories\Journal\JournalRepository', [$app->auth->user()]);
} else {
if (!isset($arguments[0]) && !Auth::check()) {
if (!isset($arguments[0]) && !$app->auth->check()) {
throw new FireflyException('There is no user present.');
}
}