@@ -203,9 +203,9 @@ |
||
203 | 203 | $ruleGroup->rules()->whereNotNull('deleted_at')->update(['order' => 0]); |
204 | 204 | |
205 | 205 | $set = $ruleGroup->rules() |
206 | - ->orderBy('order', 'ASC') |
|
207 | - ->orderBy('updated_at', 'DESC') |
|
208 | - ->get(); |
|
206 | + ->orderBy('order', 'ASC') |
|
207 | + ->orderBy('updated_at', 'DESC') |
|
208 | + ->get(); |
|
209 | 209 | $count = 1; |
210 | 210 | /** @var Rule $entry */ |
211 | 211 | foreach ($set as $entry) { |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Repositories\Rule; |
24 | 24 | |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | { |
218 | 218 | $ruleGroup->rules()->whereNotNull('deleted_at')->update(['order' => 0]); |
219 | 219 | |
220 | - $set = $ruleGroup->rules() |
|
220 | + $set = $ruleGroup->rules() |
|
221 | 221 | ->orderBy('order', 'ASC') |
222 | 222 | ->orderBy('updated_at', 'DESC') |
223 | 223 | ->get(); |
@@ -170,11 +170,11 @@ |
||
170 | 170 | { |
171 | 171 | // Find all rules belonging to this rulegroup |
172 | 172 | $rules = $this->ruleGroup->rules() |
173 | - ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') |
|
174 | - ->where('rule_triggers.trigger_type', 'user_action') |
|
175 | - ->where('rule_triggers.trigger_value', 'store-journal') |
|
176 | - ->where('rules.active', 1) |
|
177 | - ->get(['rules.*']); |
|
173 | + ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') |
|
174 | + ->where('rule_triggers.trigger_type', 'user_action') |
|
175 | + ->where('rule_triggers.trigger_value', 'store-journal') |
|
176 | + ->where('rules.active', 1) |
|
177 | + ->get(['rules.*']); |
|
178 | 178 | |
179 | 179 | // Create a list of processors for these rules |
180 | 180 | return array_map( |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Jobs; |
24 | 24 | |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | // Create a list of processors for these rules |
183 | 183 | return array_map( |
184 | - function ($rule) { |
|
184 | + function($rule) { |
|
185 | 185 | return Processor::make($rule); |
186 | 186 | }, |
187 | 187 | $rules->all() |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $collector = app(JournalCollectorInterface::class); |
107 | 107 | $collector->setAccounts($accounts)->setRange($start, $end); |
108 | 108 | $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
109 | - ->withOpposingAccount(); |
|
109 | + ->withOpposingAccount(); |
|
110 | 110 | $transactions = $collector->getJournals(); |
111 | 111 | $transactions = $transactions->filter( |
112 | 112 | function (Transaction $transaction) { |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $collector = app(JournalCollectorInterface::class); |
149 | 149 | $collector->setAccounts($accounts)->setRange($start, $end); |
150 | 150 | $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) |
151 | - ->withOpposingAccount(); |
|
151 | + ->withOpposingAccount(); |
|
152 | 152 | $transactions = $collector->getJournals(); |
153 | 153 | $transactions = $transactions->filter( |
154 | 154 | function (Transaction $transaction) { |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Repositories\Account; |
24 | 24 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | ->withOpposingAccount(); |
116 | 116 | $transactions = $collector->getJournals(); |
117 | 117 | $transactions = $transactions->filter( |
118 | - function (Transaction $transaction) { |
|
118 | + function(Transaction $transaction) { |
|
119 | 119 | // return negative amounts only. |
120 | 120 | if (bccomp($transaction->transaction_amount, '0') === -1) { |
121 | 121 | return $transaction; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | return false; |
125 | 125 | } |
126 | 126 | ); |
127 | - $expenses = $this->groupByOpposing($transactions); |
|
127 | + $expenses = $this->groupByOpposing($transactions); |
|
128 | 128 | |
129 | 129 | // sort the result |
130 | 130 | // Obtain a list of columns |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | ->withOpposingAccount(); |
158 | 158 | $transactions = $collector->getJournals(); |
159 | 159 | $transactions = $transactions->filter( |
160 | - function (Transaction $transaction) { |
|
160 | + function(Transaction $transaction) { |
|
161 | 161 | // return positive amounts only. |
162 | 162 | if (1 === bccomp($transaction->transaction_amount, '0')) { |
163 | 163 | return $transaction; |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | return false; |
167 | 167 | } |
168 | 168 | ); |
169 | - $income = $this->groupByOpposing($transactions); |
|
169 | + $income = $this->groupByOpposing($transactions); |
|
170 | 170 | |
171 | 171 | // sort the result |
172 | 172 | // Obtain a list of columns |
@@ -236,7 +236,7 @@ |
||
236 | 236 | /** @var JournalCollectorInterface $collector */ |
237 | 237 | $collector = app(JournalCollectorInterface::class); |
238 | 238 | $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
239 | - ->setBudgets($budgets)->withOpposingAccount(); |
|
239 | + ->setBudgets($budgets)->withOpposingAccount(); |
|
240 | 240 | $collector->removeFilter(TransferFilter::class); |
241 | 241 | |
242 | 242 | $collector->addFilter(OpposingAccountFilter::class); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Http\Controllers\Chart; |
24 | 24 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | parent::__construct(); |
59 | 59 | $this->middleware( |
60 | - function ($request, $next) { |
|
60 | + function($request, $next) { |
|
61 | 61 | $this->generator = app(GeneratorInterface::class); |
62 | 62 | $this->budgetRepository = app(BudgetRepositoryInterface::class); |
63 | 63 | |
@@ -140,13 +140,13 @@ discard block |
||
140 | 140 | |
141 | 141 | // prep chart data: |
142 | 142 | foreach ($budgets as $budget) { |
143 | - $chartData[$budget->id] = [ |
|
143 | + $chartData[$budget->id] = [ |
|
144 | 144 | 'label' => (string)trans('firefly.spent_in_specific_budget', ['budget' => $budget->name]), |
145 | 145 | 'type' => 'bar', |
146 | 146 | 'yAxisID' => 'y-axis-0', |
147 | 147 | 'entries' => [], |
148 | 148 | ]; |
149 | - $chartData[$budget->id . '-sum'] = [ |
|
149 | + $chartData[$budget->id . '-sum'] = [ |
|
150 | 150 | 'label' => (string)trans('firefly.sum_of_expenses_in_budget', ['budget' => $budget->name]), |
151 | 151 | 'type' => 'line', |
152 | 152 | 'fill' => false, |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | private function filterBudgetLimits(Collection $budgetLimits, Budget $budget, Carbon $start, Carbon $end): Collection |
211 | 211 | { |
212 | 212 | $set = $budgetLimits->filter( |
213 | - function (BudgetLimit $budgetLimit) use ($budget, $start, $end) { |
|
213 | + function(BudgetLimit $budgetLimit) use ($budget, $start, $end) { |
|
214 | 214 | if ($budgetLimit->budget_id === $budget->id |
215 | 215 | && $budgetLimit->start_date->lte($start) // start of budget limit is on or before start |
216 | 216 | && $budgetLimit->end_date->gte($end) // end of budget limit is on or after end |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | /** @var JournalCollectorInterface $collector */ |
276 | 276 | $collector = app(JournalCollectorInterface::class); |
277 | 277 | $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
278 | - ->setCategories($categories)->withOpposingAccount(); |
|
278 | + ->setCategories($categories)->withOpposingAccount(); |
|
279 | 279 | $collector->removeFilter(TransferFilter::class); |
280 | 280 | |
281 | 281 | $collector->addFilter(OpposingAccountFilter::class); |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | /** @var JournalCollectorInterface $collector */ |
300 | 300 | $collector = app(JournalCollectorInterface::class); |
301 | 301 | $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) |
302 | - ->setCategories($categories)->withOpposingAccount(); |
|
302 | + ->setCategories($categories)->withOpposingAccount(); |
|
303 | 303 | |
304 | 304 | $collector->addFilter(OpposingAccountFilter::class); |
305 | 305 | $collector->addFilter(NegativeAmountFilter::class); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Http\Controllers\Chart; |
24 | 24 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | parent::__construct(); |
56 | 56 | $this->middleware( |
57 | - function ($request, $next) { |
|
57 | + function($request, $next) { |
|
58 | 58 | $this->generator = app(GeneratorInterface::class); |
59 | 59 | |
60 | 60 | return $next($request); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | // prep chart data: |
184 | 184 | foreach ($categories as $category) { |
185 | - $chartData[$category->id . '-in'] = [ |
|
185 | + $chartData[$category->id . '-in'] = [ |
|
186 | 186 | 'label' => $category->name . ' (' . strtolower((string)trans('firefly.income')) . ')', |
187 | 187 | 'type' => 'bar', |
188 | 188 | 'yAxisID' => 'y-axis-0', |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | 'entries' => [], |
196 | 196 | ]; |
197 | 197 | // total in, total out: |
198 | - $chartData[$category->id . '-total-in'] = [ |
|
198 | + $chartData[$category->id . '-total-in'] = [ |
|
199 | 199 | 'label' => $category->name . ' (' . strtolower((string)trans('firefly.sum_of_income')) . ')', |
200 | 200 | 'type' => 'line', |
201 | 201 | 'fill' => false, |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | /** @var JournalCollectorInterface $collector */ |
307 | 307 | $collector = app(JournalCollectorInterface::class); |
308 | 308 | $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
309 | - ->setTags($tags)->withOpposingAccount(); |
|
309 | + ->setTags($tags)->withOpposingAccount(); |
|
310 | 310 | $collector->removeFilter(TransferFilter::class); |
311 | 311 | |
312 | 312 | $collector->addFilter(OpposingAccountFilter::class); |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | /** @var JournalCollectorInterface $collector */ |
331 | 331 | $collector = app(JournalCollectorInterface::class); |
332 | 332 | $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) |
333 | - ->setTags($tags)->withOpposingAccount(); |
|
333 | + ->setTags($tags)->withOpposingAccount(); |
|
334 | 334 | |
335 | 335 | $collector->addFilter(OpposingAccountFilter::class); |
336 | 336 | $collector->addFilter(NegativeAmountFilter::class); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Http\Controllers\Chart; |
24 | 24 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | // prep chart data: |
178 | 178 | foreach ($tags as $tag) { |
179 | - $chartData[$tag->id . '-in'] = [ |
|
179 | + $chartData[$tag->id . '-in'] = [ |
|
180 | 180 | 'label' => $tag->tag . ' (' . strtolower((string)trans('firefly.income')) . ')', |
181 | 181 | 'type' => 'bar', |
182 | 182 | 'yAxisID' => 'y-axis-0', |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | 'entries' => [], |
190 | 190 | ]; |
191 | 191 | // total in, total out: |
192 | - $chartData[$tag->id . '-total-in'] = [ |
|
192 | + $chartData[$tag->id . '-total-in'] = [ |
|
193 | 193 | 'label' => $tag->tag . ' (' . strtolower((string)trans('firefly.sum_of_income')) . ')', |
194 | 194 | 'type' => 'line', |
195 | 195 | 'fill' => false, |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | /** @var JournalCollectorInterface $collector */ |
169 | 169 | $collector = app(JournalCollectorInterface::class); |
170 | 170 | $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) |
171 | - ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
|
172 | - ->setCategories($this->categories)->withOpposingAccount(); |
|
171 | + ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) |
|
172 | + ->setCategories($this->categories)->withOpposingAccount(); |
|
173 | 173 | $collector->removeFilter(TransferFilter::class); |
174 | 174 | |
175 | 175 | $collector->addFilter(OpposingAccountFilter::class); |
@@ -193,8 +193,8 @@ discard block |
||
193 | 193 | /** @var JournalCollectorInterface $collector */ |
194 | 194 | $collector = app(JournalCollectorInterface::class); |
195 | 195 | $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) |
196 | - ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) |
|
197 | - ->setCategories($this->categories)->withOpposingAccount(); |
|
196 | + ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) |
|
197 | + ->setCategories($this->categories)->withOpposingAccount(); |
|
198 | 198 | |
199 | 199 | $collector->addFilter(OpposingAccountFilter::class); |
200 | 200 | $collector->addFilter(NegativeAmountFilter::class); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Generator\Report\Category; |
24 | 24 |
@@ -157,8 +157,8 @@ |
||
157 | 157 | /** @var JournalCollectorInterface $collector */ |
158 | 158 | $collector = app(JournalCollectorInterface::class); |
159 | 159 | $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) |
160 | - ->setTypes([TransactionType::WITHDRAWAL]) |
|
161 | - ->setBudgets($this->budgets)->withOpposingAccount(); |
|
160 | + ->setTypes([TransactionType::WITHDRAWAL]) |
|
161 | + ->setBudgets($this->budgets)->withOpposingAccount(); |
|
162 | 162 | $collector->removeFilter(TransferFilter::class); |
163 | 163 | |
164 | 164 | $collector->addFilter(OpposingAccountFilter::class); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | * You should have received a copy of the GNU General Public License |
19 | 19 | * along with Firefly III. If not, see <http://www.gnu.org/licenses/>. |
20 | 20 | */ |
21 | -declare(strict_types=1); |
|
21 | +declare(strict_types = 1); |
|
22 | 22 | |
23 | 23 | namespace FireflyIII\Generator\Report\Budget; |
24 | 24 |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -declare(strict_types=1); |
|
2 | +declare(strict_types = 1); |
|
3 | 3 | |
4 | 4 | /** |
5 | 5 | * UseEncryption.php |