Merge branch 'develop' into issues/509

# Conflicts:
#	public/js/ff/transactions/list.js

app/Http/Controllers/AccountController.php

@@ -101,13 +101,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param Request                    $request
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
      * @return View
      */
-    public function delete(Request $request, AccountRepositoryInterface $repository, Account $account)
+    public function delete(AccountRepositoryInterface $repository, Account $account)
     {
         $typeName    = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);

app/Http/Controllers/Admin/UpdateController.php

@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Admin;
 
+use FireflyConfig;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -30,7 +31,6 @@ use FireflyIII\Services\Github\Object\Release;
 use FireflyIII\Services\Github\Request\UpdateRequest;
 use Illuminate\Http\Request;
 use Log;
-use Preferences;
 use Response;
 use Session;
 
@@ -67,7 +67,7 @@ class UpdateController extends Controller
     {
         $subTitle     = trans('firefly.update_check_title');
         $subTitleIcon = 'fa-star';
-        $permission   = app('preferences')->get('permission_update_check', -1);
+        $permission   = app('fireflyconfig')->get('permission_update_check', -1);
         $selected     = $permission->data;
         $options      = [
             '-1' => trans('firefly.updates_ask_me_later'),
@@ -86,9 +86,9 @@ class UpdateController extends Controller
     public function post(Request $request)
     {
         $checkForUpdates = intval($request->get('check_for_updates'));
-        Preferences::set('permission_update_check', $checkForUpdates);
+        FireflyConfig::set('permission_update_check', $checkForUpdates);
+        FireflyConfig::set('last_update_check', time());
         Session::flash('success', strval(trans('firefly.configuration_updated')));
-        Preferences::mark();
 
         return redirect(route('admin.update-check'));
     }
@@ -99,17 +99,19 @@ class UpdateController extends Controller
     public function updateCheck()
     {
         $current = config('firefly.version');
-        $request = new UpdateRequest();
+        /** @var UpdateRequest $request */
+        $request = app(UpdateRequest::class);
         $check   = -2;
+        $first   = new Release(['id' => '0', 'title' => '0', 'updated' => '2017-01-01', 'content' => '']);
+        $string  = '';
         try {
             $request->call();
             $releases = $request->getReleases();
             // first entry should be the latest entry:
             /** @var Release $first */
-            $first  = reset($releases);
-            $string = '';
-            $check  = version_compare($current, $first->getTitle());
-            Preferences::set('last_update_check', time());
+            $first = reset($releases);
+            $check = version_compare($current, $first->getTitle());
+            FireflyConfig::set('last_update_check', time());
         } catch (FireflyException $e) {
             Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
         }
@@ -119,7 +121,12 @@ class UpdateController extends Controller
 
         if ($check === -1) {
             // there is a new FF version!
-            $string = strval(trans('firefly.update_new_version_alert', ['your_version' => $current, 'new_version' => $first->getTitle()]));
+            $string = strval(
+                trans(
+                    'firefly.update_new_version_alert',
+                    ['your_version' => $current, 'new_version' => $first->getTitle(), 'date' => $first->getUpdated()->formatLocalized($this->monthAndDayFormat)]
+                )
+            );
         }
         if ($check === 0) {
             // you are running the current version!

app/Http/Controllers/AttachmentController.php

@@ -59,12 +59,11 @@ class AttachmentController extends Controller
     }
 
     /**
-     * @param Request    $request
      * @param Attachment $attachment
      *
      * @return View
      */
-    public function delete(Request $request, Attachment $attachment)
+    public function delete(Attachment $attachment)
     {
         $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
 

app/Http/Controllers/Auth/LoginController.php

@@ -64,7 +64,7 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void
+     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
      *
      * @throws \Illuminate\Validation\ValidationException
      */
@@ -102,7 +102,7 @@ class LoginController extends Controller
      * @param Request   $request
      * @param CookieJar $cookieJar
      *
-     * @return $this
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function logout(Request $request, CookieJar $cookieJar)
     {

app/Http/Controllers/BillController.php

@@ -91,12 +91,11 @@ class BillController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param Bill    $bill
+     * @param Bill $bill
      *
      * @return View
      */
-    public function delete(Request $request, Bill $bill)
+    public function delete(Bill $bill)
     {
         // put previous url in session
         $this->rememberPreviousUri('bills.delete.uri');
@@ -194,7 +193,7 @@ class BillController extends Controller
             }
         );
         // paginate bills
-        $bills= new LengthAwarePaginator($collection, $total, $pageSize, $page);
+        $bills = new LengthAwarePaginator($collection, $total, $pageSize, $page);
         $bills->setPath(route('bills.index'));
 
         return view('bills.index', compact('bills'));

app/Http/Controllers/BudgetController.php

@@ -118,12 +118,11 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param Budget  $budget
+     * @param Budget $budget
      *
      * @return View
      */
-    public function delete(Request $request, Budget $budget)
+    public function delete(Budget $budget)
     {
         $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]);
 

app/Http/Controllers/CategoryController.php

@@ -80,12 +80,11 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param Request  $request
      * @param Category $category
      *
      * @return View
      */
-    public function delete(Request $request, Category $category)
+    public function delete(Category $category)
     {
         $subTitle = trans('firefly.delete_category', ['name' => $category->name]);
 

app/Http/Controllers/HomeController.php

@@ -25,6 +25,8 @@ namespace FireflyIII\Http\Controllers;
 use Artisan;
 use Carbon\Carbon;
 use DB;
+use Exception;
+use FireflyIII\Events\RequestedVersionCheckStatus;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Middleware\IsDemoUser;
@@ -38,7 +40,6 @@ use Illuminate\Support\Collection;
 use Log;
 use Monolog\Handler\RotatingFileHandler;
 use Preferences;
-use ReflectionException;
 use Response;
 use Route as RouteFacade;
 use View;
@@ -185,7 +186,7 @@ class HomeController extends Controller
         Log::debug('Call twig:clean...');
         try {
             Artisan::call('twig:clean');
-        } catch (ReflectionException $e) {
+        } catch (Exception $e) {
             // dont care
         }
         Log::debug('Call view:clear...');
@@ -234,6 +235,9 @@ class HomeController extends Controller
             $transactions[] = [$set, $account];
         }
 
+        // fire check update event:
+        event(new RequestedVersionCheckStatus(auth()->user()));
+
         return view(
             'index',
             compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount', 'start', 'end', 'today')

app/Http/Controllers/Import/PrerequisitesController.php

@@ -60,7 +60,7 @@ class PrerequisitesController extends Controller
      *
      * @param string $bank
      *
-     * @return \Illuminate\Http\RedirectResponse|null
+     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse
      *
      * @throws FireflyException
      */

app/Http/Controllers/Import/StatusController.php

@@ -108,8 +108,6 @@ class StatusController extends Controller
             $result['running'] = true;
         }
 
-        // TODO cannot handle 'error'
-
         return Response::json($result);
     }
 }

app/Http/Controllers/Json/AutoCompleteController.php

@@ -29,7 +29,6 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use Log;
 use Response;
 
 /**

app/Http/Controllers/Json/IntroController.php

@@ -46,6 +46,7 @@ class IntroController
         $specificSteps = $this->getSpecificSteps($route, $specificPage);
         if (0 === count($specificSteps)) {
             Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage));
+
             return Response::json($steps);
         }
         if ($this->hasOutroStep($route)) {

app/Http/Controllers/Popup/ReportController.php

@@ -238,7 +238,7 @@ class ReportController extends Controller
     private function parseAttributes(array $attributes): array
     {
         $attributes['location'] = $attributes['location'] ?? '';
-        $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get','',[]));
+        $attributes['accounts'] = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));
         try {
             $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate']);
         } catch (InvalidArgumentException $e) {

app/Http/Controllers/PreferencesController.php

@@ -26,8 +26,8 @@ use FireflyIII\Http\Requests\TokenFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Illuminate\Http\Request;
 use Google2FA;
+use Illuminate\Http\Request;
 use Preferences;
 use Session;
 use View;

app/Http/Controllers/Report/ExpenseController.php

@@ -231,7 +231,7 @@ class ExpenseController extends Controller
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($expense->pluck('id')->toArray());
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         $combined = $this->combineAccounts($expense);
         $all      = new Collection;

app/Http/Controllers/Transaction/SplitController.php

@@ -59,12 +59,10 @@ class SplitController extends Controller
 
     /** @var CurrencyRepositoryInterface */
     private $currencies;
-
-    /** @var JournalTaskerInterface */
-    private $tasker;
-
     /** @var JournalRepositoryInterface */
     private $repository;
+    /** @var JournalTaskerInterface */
+    private $tasker;
 
     /**
      *
@@ -81,7 +79,7 @@ class SplitController extends Controller
                 $this->tasker      = app(JournalTaskerInterface::class);
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->currencies  = app(CurrencyRepositoryInterface::class);
-                $this->repository = app(JournalRepositoryInterface::class);
+                $this->repository  = app(JournalRepositoryInterface::class);
                 app('view')->share('mainTitleIcon', 'fa-share-alt');
                 app('view')->share('title', trans('firefly.split-transactions'));
 
@@ -145,8 +143,8 @@ class SplitController extends Controller
     }
 
     /**
-     * @param SplitJournalFormRequest    $request
-     * @param TransactionJournal         $journal
+     * @param SplitJournalFormRequest $request
+     * @param TransactionJournal      $journal
      *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */