Merge branch 'release/3.3.5'

2025-10-12 15:35:15 +00:00 · 2015-03-29 08:43:54 +02:00
parent dca395a018 6e3f6abc67
commit d5c39d54d8
98 changed files with 204 additions and 250 deletions
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -7,6 +7,7 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
 use Redirect;
@@ -124,7 +125,7 @@ class AccountController extends Controller

        // move to repository:
        $set   = Auth::user()->accounts()->with(
-            ['accountmeta' => function ($query) {
+            ['accountmeta' => function (HasMany $query) {
                $query->where('name', 'accountRole');
            }]
        )->accountTypeIn($types)->take($size)->offset($offset)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -5,6 +5,7 @@ use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 use Illuminate\Http\Request;
+use Illuminate\Mail\Message;
 use Mail;
 use Session;

@@ -73,7 +74,7 @@ class AuthController extends Controller

        // send email.
        Mail::send(
-            'emails.registered', [], function ($message) use ($email) {
+            'emails.registered', [], function (Message $message) use ($email) {
            $message->to($email, $email)->subject('Welcome to Firefly III!');
        }
        );
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -157,8 +157,6 @@ class BillController extends Controller
    public function store(BillFormRequest $request, BillRepositoryInterface $repository)
    {

-        var_dump($request->all());
-
        $billData = [
            'name'               => $request->get('name'),
            'match'              => $request->get('match'),
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -170,6 +170,10 @@ class BudgetController extends Controller

        Session::flash('success', 'New budget "' . $budget->name . '" stored!');

+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('budgets.create')->withInput();
+        }
+
        return Redirect::route('budgets.index');

    }
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -6,7 +6,6 @@ use Carbon\Carbon;
 use DB;
 use Exception;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
--- a/app/Http/Controllers/HelpController.php
+++ b/app/Http/Controllers/HelpController.php
@@ -2,7 +2,6 @@

 use Cache;
 use ErrorException;
-use FireflyIII\Http\Requests;
 use League\CommonMark\CommonMarkConverter;
 use Response;
 use Route;
@@ -33,7 +32,7 @@ class HelpController extends Controller
            return Response::json($content);
        }

-        if ($this->_inCache($route)) {
+        if ($this->inCache($route)) {
            $content = [
                'text'  => Cache::get('help.' . $route . '.text'),
                'title' => Cache::get('help.' . $route . '.title'),
@@ -41,7 +40,7 @@ class HelpController extends Controller

            return Response::json($content);
        }
-        $content = $this->_getFromGithub($route);
+        $content = $this->getFromGithub($route);


        Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week.
@@ -56,7 +55,7 @@ class HelpController extends Controller
     *
     * @return bool
     */
-    protected function _inCache($route)
+    protected function inCache($route)
    {
        return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text');
    }
@@ -66,7 +65,7 @@ class HelpController extends Controller
     *
     * @return array
     */
-    protected function _getFromGithub($route)
+    protected function getFromGithub($route)
    {
        $uri     = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md';
        $content = [
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -3,15 +3,14 @@
 use Amount;
 use Auth;
 use DB;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Input;
 use Preferences;
 use Response;
 use Session;
-use Config;
-use FireflyIII\Models\TransactionType;
+
 /**
 * Class JsonController
 *
@@ -91,7 +90,6 @@ class JsonController extends Controller
                        $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count();
                        if ($count != 0) {
                            $journal         = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first();
-                            $paid['items'][] = $journal->description;
                            $currentAmount   = 0;
                            foreach ($journal->transactions as $t) {
                                if (floatval($t->amount) > 0) {
@@ -182,16 +180,17 @@ class JsonController extends Controller
    public function transactionJournals($what)
    {
        $descriptions = [];
-            $dbType   = TransactionType::whereType($what)->first();
-            $journals = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
-                ->orderBy('id','DESC')->take(50)
-                ->get();
-            foreach($journals as $j) {
-                $descriptions[] = $j->description;
-            }
+        $dbType       = TransactionType::whereType($what)->first();
+        $journals     = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)
+                            ->orderBy('id', 'DESC')->take(50)
+                            ->get();
+        foreach ($journals as $j) {
+            $descriptions[] = $j->description;
+        }

        $descriptions = array_unique($descriptions);
        sort($descriptions);
+
        return Response::json($descriptions);


--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -7,7 +7,6 @@ use Config;
 use ExpandedForm;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;

 use Auth;
-use FireflyIII\Http\Requests;
 use Input;
 use Preferences;
 use Redirect;
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -45,7 +45,7 @@ class ProfileController extends Controller

            return Redirect::route('change-password');
        }
-        $result = $this->_validatePassword($request->get('current_password'), $request->get('new_password'), $request->get('new_password_confirmation'));
+        $result = $this->validatePassword($request->get('current_password'), $request->get('new_password'), $request->get('new_password_confirmation'));
        if (!($result === true)) {
            Session::flash('error', $result);

@@ -70,7 +70,7 @@ class ProfileController extends Controller
     *
     * @return string|bool
     */
-    protected function _validatePassword($old, $new1, $new2)
+    protected function validatePassword($old, $new1, $new2)
    {
        if (strlen($new1) == 0 || strlen($new2) == 0) {
            return 'Do fill in a password!';
--- a/app/Http/Controllers/RelatedController.php
+++ b/app/Http/Controllers/RelatedController.php
@@ -1,7 +1,6 @@
 <?php namespace FireflyIII\Http\Controllers;

 use Auth;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
--- a/app/Http/Controllers/ReminderController.php
+++ b/app/Http/Controllers/ReminderController.php
@@ -3,7 +3,6 @@
 use Auth;
 use Carbon\Carbon;
 use FireflyIII\Helpers\Reminders\ReminderHelperInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Reminder;
 use Redirect;
 use Session;
@@ -83,7 +82,7 @@ class ReminderController extends Controller

        // inactive reminders
        $inactive = $reminders->filter(
-            function (Reminder $reminder) use ($today) {
+            function (Reminder $reminder) {
                if ($reminder->active === false) {
                    return $reminder;
                }
@@ -92,7 +91,7 @@ class ReminderController extends Controller

        // dismissed reminders
        $dismissed = $reminders->filter(
-            function (Reminder $reminder) use ($today) {
+            function (Reminder $reminder) {
                if ($reminder->notnow === true) {
                    return $reminder;
                }
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -5,7 +5,6 @@ use Carbon\Carbon;
 use Exception;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
-use FireflyIII\Http\Requests;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Database\Query\JoinClause;
@@ -382,8 +381,6 @@ class ReportController extends Controller
        $groupedIncomes  = $query->journalsByRevenueAccount($date, $end, $showSharedReports);
        $groupedExpenses = $query->journalsByExpenseAccount($date, $end, $showSharedReports);

-        //$groupedExpenses = $helper-> expensesGroupedByAccount($date, $end, 15);
-
        return view(
            'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')
        );
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,6 +1,5 @@
 <?php namespace FireflyIII\Http\Controllers;

-use FireflyIII\Http\Requests;
 use FireflyIII\Support\Search\SearchInterface;
 use Input;

--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -2,6 +2,7 @@

 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;

 /**
 * Class Authenticate
@@ -37,7 +38,7 @@ class Authenticate
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
    {
        if ($this->auth->guest()) {
            if ($request->ajax()) {
--- a/app/Http/Middleware/PiggyBanks.php
+++ b/app/Http/Middleware/PiggyBanks.php
@@ -7,9 +7,9 @@ use Carbon\Carbon;
 use Closure;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
-use FireflyIII\Models\Reminder;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\Query\JoinClause;
+use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Navigation;
 use Session;
@@ -48,7 +48,7 @@ class PiggyBanks
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
    {
        if ($this->auth->check() && !$request->isXmlHttpRequest()) {
            // get piggy banks without a repetition:
@@ -91,7 +91,6 @@ class PiggyBanks
                    $start = clone $piggyBank->startdate;
                    $end   = clone $piggyBank->targetdate;
                    $max   = clone $piggyBank->targetdate;
-                    $index = 0;

                    // first loop: start date to target date.
                    // then, continue looping until end is > today
@@ -127,7 +126,6 @@ class PiggyBanks
                    $repetition->targetdate    = is_null($piggyBank->targetdate) ? null : $piggyBank->targetdate;
                    $repetition->currentamount = 0;
                    // it might exist, catch:
-                    //$repetition->save();

                    // then, loop from original target up to now.
                }
@@ -138,4 +136,4 @@ class PiggyBanks

        return $next($request);
    }
-}
+}
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -6,6 +6,7 @@ namespace FireflyIII\Http\Middleware;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use Navigation;
 use Preferences;
 use Session;
@@ -44,7 +45,7 @@ class Range
     *
     * @return mixed
     */
-    public function handle($request, Closure $theNext)
+    public function handle(Request $request, Closure $theNext)
    {
        if ($this->auth->check()) {

@@ -84,4 +85,4 @@ class Range

    }

-}
+}
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -3,6 +3,7 @@
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;

 /**
 * Class RedirectIfAuthenticated
@@ -38,7 +39,7 @@ class RedirectIfAuthenticated
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
    {
        if ($this->auth->check()) {
            return new RedirectResponse(url('/'));
--- a/app/Http/Middleware/Reminders.php
+++ b/app/Http/Middleware/Reminders.php
@@ -8,6 +8,7 @@ use Closure;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Reminder;
 use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Http\Request;
 use View;

 /**
@@ -43,7 +44,7 @@ class Reminders
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
    {
        if ($this->auth->check() && !$request->isXmlHttpRequest()) {
            // do reminders stuff.
@@ -87,4 +88,4 @@ class Reminders

        return $next($request);
    }
-}
+}
--- a/app/Http/Middleware/ReplaceTestVars.php
+++ b/app/Http/Middleware/ReplaceTestVars.php
@@ -4,15 +4,15 @@ namespace FireflyIII\Http\Middleware;

 use Closure;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\Middleware;
+use Illuminate\Http\Request;
 use Log;

 /**
 * Class ReplaceTestVars
 *
- * @package App\Http\Middleware
+ * @package FireflyIII\Http\Middleware
 */
-class ReplaceTestVars implements Middleware
+class ReplaceTestVars
 {
    /**
     * The application implementation.
@@ -40,7 +40,7 @@ class ReplaceTestVars implements Middleware
     *
     * @return mixed
     */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
    {
        if ('testing' === $this->app->environment() && $request->has('_token')) {
            $input           = $request->all();
@@ -53,4 +53,4 @@ class ReplaceTestVars implements Middleware
        return $next($request);
    }

-}
+}
--- a/app/Http/Requests/BillFormRequest.php
+++ b/app/Http/Requests/BillFormRequest.php
@@ -46,4 +46,4 @@ class BillFormRequest extends Request

        return $rules;
    }
-}
+}
--- a/app/Http/Requests/BudgetFormRequest.php
+++ b/app/Http/Requests/BudgetFormRequest.php
@@ -37,4 +37,4 @@ class BudgetFormRequest extends Request
            'name' => $nameRule,
        ];
    }
-}
+}
--- a/app/Http/Requests/CategoryFormRequest.php
+++ b/app/Http/Requests/CategoryFormRequest.php
@@ -37,4 +37,4 @@ class CategoryFormRequest extends Request
            'name' => $nameRule,
        ];
    }
-}
+}
--- a/app/Http/Requests/CurrencyFormRequest.php
+++ b/app/Http/Requests/CurrencyFormRequest.php
@@ -42,4 +42,4 @@ class CurrencyFormRequest extends Request

        return $rules;
    }
-}
+}
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -3,9 +3,8 @@
 namespace FireflyIII\Http\Requests;

 use Auth;
-use FireflyIII\Models\Account;
 use Input;
-
+use Exception;
 /**
 * Class JournalFormRequest
 *
@@ -24,6 +23,7 @@ class JournalFormRequest extends Request

    /**
     * @return array
+     * @throws Exception
     */
    public function rules()
    {
@@ -62,7 +62,7 @@ class JournalFormRequest extends Request
                $rules['category']        = 'between:1,255';
                break;
            default:
-                die('Cannot handle ' . $what);
+                throw new Exception('Cannot handle ' . $what);
                break;
        }

@@ -70,4 +70,4 @@ class JournalFormRequest extends Request


    }
-}
+}
--- a/app/Http/Requests/PiggyBankFormRequest.php
+++ b/app/Http/Requests/PiggyBankFormRequest.php
@@ -4,7 +4,6 @@ namespace FireflyIII\Http\Requests;

 use Auth;
 use Carbon\Carbon;
-use FireflyIII\Models\Account;
 use Input;
 use Navigation;

@@ -66,4 +65,4 @@ class PiggyBankFormRequest extends Request

        return $rules;
    }
-}
+}
--- a/app/Http/Requests/ProfileFormRequest.php
+++ b/app/Http/Requests/ProfileFormRequest.php
@@ -3,7 +3,6 @@
 namespace FireflyIII\Http\Requests;

 use Auth;
-use FireflyIII\Models\Account;

 /**
 * Class ProfileFormRequest
@@ -32,4 +31,4 @@ class ProfileFormRequest extends Request
            'new_password_confirmation' => 'required',
        ];
    }
-}
+}