Big bunch of code to improve test coverage.

app/Http/Controllers/Category/CreateController.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * CreateController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Http\Controllers\Category;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\CategoryFormRequest;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Http\Request;
+
+/**
+ * Class CreateController
+ */
+class CreateController extends Controller
+{
+    /** @var CategoryRepositoryInterface The category repository */
+    private $repository;
+
+    /**
+     * CategoryController constructor.
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
+                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                $this->repository = app(CategoryRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+    /**
+     * Create category.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function create(Request $request)
+    {
+        if (true !== session('categories.create.fromStore')) {
+            $this->rememberPreviousUri('categories.create.uri');
+        }
+        $request->session()->forget('categories.create.fromStore');
+        $subTitle = (string)trans('firefly.create_new_category');
+
+        return view('categories.create', compact('subTitle'));
+    }
+
+
+    /**
+     * Store new category.
+     *
+     * @param CategoryFormRequest $request
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function store(CategoryFormRequest $request)
+    {
+        $data     = $request->getCategoryData();
+        $category = $this->repository->store($data);
+
+        $request->session()->flash('success', (string)trans('firefly.stored_category', ['name' => $category->name]));
+        app('preferences')->mark();
+
+        $redirect = redirect(route('categories.index'));
+        if (1 === (int)$request->get('create_another')) {
+            // @codeCoverageIgnoreStart
+            $request->session()->put('categories.create.fromStore', true);
+
+            $redirect = redirect(route('categories.create'))->withInput();
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $redirect;
+    }
+}

app/Http/Controllers/Category/DeleteController.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * DeleteController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Http\Controllers\Category;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Http\Request;
+
+/**
+ * Class DeleteController
+ */
+class DeleteController extends Controller
+{
+    /** @var CategoryRepositoryInterface The category repository */
+    private $repository;
+
+    /**
+     * CategoryController constructor.
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
+                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                $this->repository = app(CategoryRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * Delete a category.
+     *
+     * @param Category $category
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function delete(Category $category)
+    {
+        $subTitle = (string)trans('firefly.delete_category', ['name' => $category->name]);
+
+        // put previous url in session
+        $this->rememberPreviousUri('categories.delete.uri');
+
+        return view('categories.delete', compact('category', 'subTitle'));
+    }
+
+    /**
+     * Destroy a category.
+     *
+     * @param Request  $request
+     * @param Category $category
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function destroy(Request $request, Category $category)
+    {
+        $name = $category->name;
+        $this->repository->destroy($category);
+
+        $request->session()->flash('success', (string)trans('firefly.deleted_category', ['name' => $name]));
+        app('preferences')->mark();
+
+        return redirect($this->getPreviousUri('categories.delete.uri'));
+    }
+}

app/Http/Controllers/Category/EditController.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * EditController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Http\Controllers\Category;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\CategoryFormRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Http\Request;
+
+/**
+ * Class EditController
+ */
+class EditController extends Controller
+{
+
+    /** @var CategoryRepositoryInterface The category repository */
+    private $repository;
+
+    /**
+     * CategoryController constructor.
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
+                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                $this->repository = app(CategoryRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+    /**
+     * Edit a category.
+     *
+     * @param Request  $request
+     * @param Category $category
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function edit(Request $request, Category $category)
+    {
+        $subTitle = (string)trans('firefly.edit_category', ['name' => $category->name]);
+
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (true !== session('categories.edit.fromUpdate')) {
+            $this->rememberPreviousUri('categories.edit.uri');
+        }
+        $request->session()->forget('categories.edit.fromUpdate');
+
+        return view('categories.edit', compact('category', 'subTitle'));
+    }
+
+    /**
+     * Update category.
+     *
+     * @param CategoryFormRequest         $request
+     * @param Category                    $category
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function update(CategoryFormRequest $request, Category $category)
+    {
+        $data = $request->getCategoryData();
+        $this->repository->update($category, $data);
+
+        $request->session()->flash('success', (string)trans('firefly.updated_category', ['name' => $category->name]));
+        app('preferences')->mark();
+
+        $redirect = redirect($this->getPreviousUri('categories.edit.uri'));
+
+        if (1 === (int)$request->get('return_to_edit')) {
+            // @codeCoverageIgnoreStart
+            $request->session()->put('categories.edit.fromUpdate', true);
+
+            $redirect = redirect(route('categories.edit', [$category->id]));
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $redirect;
+    }
+}

app/Http/Controllers/Category/IndexController.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * IndexController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Http\Controllers\Category;
+
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+
+/**
+ * Class IndexController
+ */
+class IndexController extends Controller
+{
+    /** @var CategoryRepositoryInterface The category repository */
+    private $repository;
+
+    /**
+     * CategoryController constructor.
+     * @codeCoverageIgnore
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware(
+            function ($request, $next) {
+                app('view')->share('title', (string)trans('firefly.categories'));
+                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                $this->repository = app(CategoryRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+
+    /**
+     * Show all categories.
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index(Request $request)
+    {
+        $page       = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
+        $pageSize   = (int)app('preferences')->get('listPageSize', 50)->data;
+        $collection = $this->repository->getCategories();
+        $total      = $collection->count();
+        $collection = $collection->slice(($page - 1) * $pageSize, $pageSize);
+
+        $collection->each(
+            function (Category $category) {
+                $category->lastActivity = $this->repository->lastUseDate($category, new Collection);
+            }
+        );
+
+        // paginate categories
+        $categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
+        $categories->setPath(route('categories.index'));
+
+        return view('categories.index', compact('categories'));
+    }
+
+}

app/Http/Controllers/Category/NoCategoryController.php

@@ -46,6 +46,7 @@ class NoCategoryController extends Controller
 
     /**
      * CategoryController constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {

app/Http/Controllers/Category/ShowController.php

@@ -47,6 +47,7 @@ class ShowController extends Controller
 
     /**
      * CategoryController constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -85,7 +86,8 @@ class ShowController extends Controller
         $subTitleIcon = 'fa-bar-chart';
         $page         = (int)$request->get('page');
         $pageSize     = (int)app('preferences')->get('listPageSize', 50)->data;
-        $periods      = $this->getCategoryPeriodOverview($category, $end);
+        $oldest       = $this->repository->firstUseDate($category) ?? Carbon::create()->startOfYear();
+        $periods      = $this->getCategoryPeriodOverview($category, $oldest, $end);
         $path         = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $subTitle     = trans(
             'firefly.journals_in_period_for_category',

app/Http/Controllers/CategoryController.php

@@ -55,168 +55,11 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * Create category.
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function create(Request $request)
-    {
-        if (true !== session('categories.create.fromStore')) {
-            $this->rememberPreviousUri('categories.create.uri');
-        }
-        $request->session()->forget('categories.create.fromStore');
-        $subTitle = (string)trans('firefly.create_new_category');
-
-        return view('categories.create', compact('subTitle'));
-    }
-
-    /**
-     * Delete a category.
-     *
-     * @param Category $category
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function delete(Category $category)
-    {
-        $subTitle = (string)trans('firefly.delete_category', ['name' => $category->name]);
-
-        // put previous url in session
-        $this->rememberPreviousUri('categories.delete.uri');
-
-        return view('categories.delete', compact('category', 'subTitle'));
-    }
-
-    /**
-     * Destroy a category.
-     *
-     * @param Request  $request
-     * @param Category $category
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function destroy(Request $request, Category $category)
-    {
-        $name = $category->name;
-        $this->repository->destroy($category);
-
-        $request->session()->flash('success', (string)trans('firefly.deleted_category', ['name' => $name]));
-        app('preferences')->mark();
-
-        return redirect($this->getPreviousUri('categories.delete.uri'));
-    }
-
-    /**
-     * Edit a category.
-     *
-     * @param Request  $request
-     * @param Category $category
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function edit(Request $request, Category $category)
-    {
-        $subTitle = (string)trans('firefly.edit_category', ['name' => $category->name]);
-
-        // put previous url in session if not redirect from store (not "return_to_edit").
-        if (true !== session('categories.edit.fromUpdate')) {
-            $this->rememberPreviousUri('categories.edit.uri');
-        }
-        $request->session()->forget('categories.edit.fromUpdate');
-
-        return view('categories.edit', compact('category', 'subTitle'));
-    }
-
-    /**
-     * Show all categories.
-     *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function index(Request $request)
-    {
-        $page       = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
-        $pageSize   = (int)app('preferences')->get('listPageSize', 50)->data;
-        $collection = $this->repository->getCategories();
-        $total      = $collection->count();
-        $collection = $collection->slice(($page - 1) * $pageSize, $pageSize);
-
-        $collection->each(
-            function (Category $category) {
-                $category->lastActivity = $this->repository->lastUseDate($category, new Collection);
-            }
-        );
-
-        // paginate categories
-        $categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
-        $categories->setPath(route('categories.index'));
-
-        return view('categories.index', compact('categories'));
-    }
 
 
-    /**
-     * Store new category.
-     *
-     * @param CategoryFormRequest         $request
-     * @param CategoryRepositoryInterface $repository
-     *
-     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository)
-    {
-        $data     = $request->getCategoryData();
-        $category = $repository->store($data);
-
-        $request->session()->flash('success', (string)trans('firefly.stored_category', ['name' => $category->name]));
-        app('preferences')->mark();
-
-        $redirect = redirect(route('categories.index'));
-        if (1 === (int)$request->get('create_another')) {
-            // @codeCoverageIgnoreStart
-            $request->session()->put('categories.create.fromStore', true);
-
-            $redirect = redirect(route('categories.create'))->withInput();
-            // @codeCoverageIgnoreEnd
-        }
-
-        return $redirect;
-    }
 
 
-    /**
-     * Update category.
-     *
-     * @param CategoryFormRequest         $request
-     * @param CategoryRepositoryInterface $repository
-     * @param Category                    $category
-     *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     */
-    public function update(CategoryFormRequest $request, CategoryRepositoryInterface $repository, Category $category)
-    {
-        $data = $request->getCategoryData();
-        $repository->update($category, $data);
 
-        $request->session()->flash('success', (string)trans('firefly.updated_category', ['name' => $category->name]));
-        app('preferences')->mark();
-
-        $redirect = redirect($this->getPreviousUri('categories.edit.uri'));
-
-        if (1 === (int)$request->get('return_to_edit')) {
-            // @codeCoverageIgnoreStart
-            $request->session()->put('categories.edit.fromUpdate', true);
-
-            $redirect = redirect(route('categories.edit', [$category->id]));
-            // @codeCoverageIgnoreEnd
-        }
-
-        return $redirect;
-    }
 
 
 }

app/Http/Controllers/Chart/AccountController.php

@@ -62,6 +62,7 @@ class AccountController extends Controller
 
     /**
      * AccountController constructor.
+     * @codeCoverageIgnore 
      */
     public function __construct()
     {
@@ -341,9 +342,8 @@ class AccountController extends Controller
 
         Log::debug('Frontpage preference set is ', $frontPage->data);
         if (0 === count($frontPage->data)) {
-            $frontPage->data = $defaultSet;
+            app('preferences')->set('frontPageAccounts', $defaultSet);
             Log::debug('frontpage set is empty!');
-            $frontPage->save();
         }
         $accounts = $repository->getAccountsById($frontPage->data);
 

app/Http/Controllers/Chart/BillController.php

@@ -42,6 +42,7 @@ class BillController extends Controller
 
     /**
      * BillController constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {