From 999a7481e446576e8fb8508e36b2e4b57e4d595e Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 9 Dec 2014 06:37:36 +0100 Subject: [PATCH 01/92] Removed references to the field "migrated". --- app/database/seeds/DefaultUserSeeder.php | 12 +++--------- app/lib/FireflyIII/Database/User.php | 1 - app/models/User.php | 1 - app/tests/factories/User.php | 1 - 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/database/seeds/DefaultUserSeeder.php b/app/database/seeds/DefaultUserSeeder.php index 0e4c292529..f61caf90fa 100644 --- a/app/database/seeds/DefaultUserSeeder.php +++ b/app/database/seeds/DefaultUserSeeder.php @@ -10,15 +10,9 @@ class DefaultUserSeeder extends Seeder DB::table('users')->delete(); if (App::environment() == 'testing') { - User::create( - ['email' => 'thegrumpydictator@gmail.com', 'password' => 'james', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); - User::create( - ['email' => 'acceptance@example.com', 'password' => 'acceptance', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); - User::create( - ['email' => 'functional@example.com', 'password' => 'functional', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); + User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james', 'reset' => null, 'remember_token' => null]); + User::create(['email' => 'acceptance@example.com', 'password' => 'acceptance', 'reset' => null, 'remember_token' => null]); + User::create(['email' => 'functional@example.com', 'password' => 'functional', 'reset' => null, 'remember_token' => null]); } } diff --git a/app/lib/FireflyIII/Database/User.php b/app/lib/FireflyIII/Database/User.php index e33ef42f4c..a3992d2f90 100644 --- a/app/lib/FireflyIII/Database/User.php +++ b/app/lib/FireflyIII/Database/User.php @@ -40,7 +40,6 @@ class User { $user = new \User; $user->email = isset($data['email']) ? $data['email'] : null; - $user->migrated = 0; $user->reset = \Str::random(32); $user->password = \Hash::make(\Str::random(12)); diff --git a/app/models/User.php b/app/models/User.php index 761d5e5de4..1d5ac84bde 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -15,7 +15,6 @@ class User extends Eloquent implements UserInterface, RemindableInterface public static $rules = [ 'email' => 'required|email|unique:users,email', - 'migrated' => 'required|boolean', 'password' => 'required|between:60,60', 'reset' => 'between:32,32', ]; diff --git a/app/tests/factories/User.php b/app/tests/factories/User.php index c7a74e8e82..92efe04843 100644 --- a/app/tests/factories/User.php +++ b/app/tests/factories/User.php @@ -2,7 +2,6 @@ League\FactoryMuffin\Facade::define( 'User', [ 'email' => 'email', - 'migrated' => 1, 'password' => 'empty' ] ); From 9c83c18137a711e2ed5a8c54bb3bc9f8bd89c459 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 9 Dec 2014 18:24:53 +0100 Subject: [PATCH 02/92] Fixed some query-heavy things in the report controller. --- app/controllers/ReportController.php | 63 +-------- app/lib/FireflyIII/Report/Report.php | 128 ++++++++++++++---- app/lib/FireflyIII/Report/ReportInterface.php | 19 ++- 3 files changed, 120 insertions(+), 90 deletions(-) diff --git a/app/controllers/ReportController.php b/app/controllers/ReportController.php index 1bb335e453..81ff131fdd 100644 --- a/app/controllers/ReportController.php +++ b/app/controllers/ReportController.php @@ -245,74 +245,21 @@ class ReportController extends BaseController } catch (Exception $e) { App::abort(500); } - $date = new Carbon('01-01-' . $year); + $date = new Carbon('01-01-' . $year); + $end = clone $date; + $end->endOfYear(); $title = 'Reports'; $subTitle = $year; $subTitleIcon = 'fa-bar-chart'; $mainTitleIcon = 'fa-line-chart'; $balances = $this->_reports->yearBalanceReport($date); - $groupedIncomes = $this->_reports->groupByRevenue($date, 'income'); - $groupedExpenses = $this->_reports->groupByRevenue($date, 'expense'); - + $groupedIncomes = $this->_reports->revenueGroupedByAccount($date, $end, 15); + $groupedExpenses = $this->_reports->expensesGroupedByAccount($date, $end, 15); return View::make( 'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon') ); - - - /* - * For this year, get: - * - the sum of all expenses. - * - the sum of all incomes - * - per month, the sum of all expenses - * - per month, the sum of all incomes - * - 2x for shared and not-shared alike. - * - * - balance difference for all accounts. - */ - - $accounts = $accountRepository->getAssetAccounts(); - - // get some sums going - $summary = []; - - $end = clone $date; - $end->endOfYear(); - while ($date < $end) { - $month = $date->format('F'); - - $income = 0; - $incomeShared = 0; - $expense = 0; - $expenseShared = 0; - - foreach ($accounts as $account) { - if ($account->accountRole == 'sharedExpense') { - $incomeShared += $reportRepository->getIncomeByMonth($account, $date); - $expenseShared += $reportRepository->getExpenseByMonth($account, $date); - } else { - $income += $reportRepository->getIncomeByMonth($account, $date); - $expense += $reportRepository->getExpenseByMonth($account, $date); - } - } - - $summary[] = [ - 'month' => $month, - 'income' => $income, - 'expense' => $expense, - 'incomeShared' => $incomeShared, - 'expenseShared' => $expenseShared, - ]; - $date->addMonth(); - } - - - // draw some charts etc. - return View::make('reports.year', compact('summary', 'date'))->with('title', 'Reports')->with('mainTitleIcon', 'fa-line-chart')->with('subTitle', $year) - ->with( - 'subTitleIcon', 'fa-bar-chart' - )->with('year', $year); } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Report/Report.php b/app/lib/FireflyIII/Report/Report.php index ebbf8ce990..d1e6c2a6e4 100644 --- a/app/lib/FireflyIII/Report/Report.php +++ b/app/lib/FireflyIII/Report/Report.php @@ -4,6 +4,7 @@ namespace FireflyIII\Report; use Carbon\Carbon; use FireflyIII\Database\Account as AccountRepository; +use Illuminate\Support\Collection; /** * Class Report @@ -25,35 +26,45 @@ class Report implements ReportInterface } /** - * @param Carbon $date - * @param string $direction + * @param Carbon $start + * @param Carbon $end + * @param int $limit * - * @return mixed + * @return Collection */ - public function groupByRevenue(Carbon $date, $direction = 'income') + public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15) { - $operator = $direction == 'income' ? '<' : '>'; - $type = $direction == 'income' ? 'Deposit' : 'Withdrawal'; - $order = $direction == 'income' ? 'ASC' : 'DESC'; - $start = clone $date; - $end = clone $date; - $start->startOfYear(); - $end->endOfYear(); - - // TODO remove shared accounts return \TransactionJournal:: - leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id') - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id') - ->where('transaction_types.type', '=', $type) - ->where('transactions.amount', $operator, 0) - ->before($end) - ->after($start) - ->groupBy('accounts.id') + leftJoin( + 'transactions as t_from', function ($join) { + $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0); + } + ) + ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') + ->leftJoin( + 'account_meta as acm_from', function ($join) { + $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); + } + ) + ->leftJoin( + 'transactions as t_to', function ($join) { + $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); + } + ) + ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') + ->leftJoin( + 'account_meta as acm_to', function ($join) { + $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); + } + ) + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->where('transaction_types.type', 'Withdrawal') + ->where('acm_from.data', '!=', '"sharedExpense"') + ->before($end)->after($start) ->where('transaction_journals.user_id', \Auth::user()->id) - ->orderBy('sum', $order) - ->take(10) - ->get(['accounts.name', 'transactions.account_id', \DB::Raw('SUM(`transactions`.`amount`) as `sum`')]); + ->groupBy('account_id')->orderBy('sum', 'DESC')->limit(15) + ->get(['t_to.account_id as account_id', 'ac_to.name as name', \DB::Raw('SUM(t_to.amount) as `sum`')]); + } @@ -95,6 +106,49 @@ class Report implements ReportInterface return $years; } + /** + * @param Carbon $start + * @param Carbon $end + * @param int $limit + * + * @return Collection + */ + public function revenueGroupedByAccount(Carbon $start, Carbon $end, $limit = 15) + { + return \TransactionJournal:: + leftJoin( + 'transactions as t_from', function ($join) { + $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0); + } + ) + ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') + ->leftJoin( + 'account_meta as acm_from', function ($join) { + $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); + } + ) + ->leftJoin( + 'transactions as t_to', function ($join) { + $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); + } + ) + ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') + ->leftJoin( + 'account_meta as acm_to', function ($join) { + $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); + } + ) + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->where('transaction_types.type', 'Deposit') + ->where('acm_to.data', '!=', '"sharedExpense"') + ->before($end)->after($start) + ->where('transaction_journals.user_id', \Auth::user()->id) + ->groupBy('account_id')->orderBy('sum')->limit(15) + ->get(['t_from.account_id as account_id', 'ac_from.name as name', \DB::Raw('SUM(t_from.amount) as `sum`')]); + + + } + /** * @param Carbon $date * @@ -102,10 +156,28 @@ class Report implements ReportInterface */ public function yearBalanceReport(Carbon $date) { - $start = clone $date; - $end = clone $date; - // TODO filter accounts, no shared accounts. - $accounts = $this->_accounts->getAssetAccounts(); + $start = clone $date; + $end = clone $date; + $sharedAccounts = []; + $sharedCollection = \Auth::user()->accounts() + ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') + ->where('account_meta.name', '=', 'accountRole') + ->where('account_meta.data', '=', json_encode('sharedExpense')) + ->get(['accounts.id']); + + foreach ($sharedCollection as $account) { + $sharedAccounts[] = $account->id; + } + + $accounts = $this->_accounts->getAssetAccounts()->filter( + function (\Account $account) use ($sharedAccounts) { + if (!in_array($account->id, $sharedAccounts)) { + return $account; + } + + return null; + } + ); $report = []; $start->startOfYear(); $end->endOfYear(); diff --git a/app/lib/FireflyIII/Report/ReportInterface.php b/app/lib/FireflyIII/Report/ReportInterface.php index 20f201b579..4605beb75d 100644 --- a/app/lib/FireflyIII/Report/ReportInterface.php +++ b/app/lib/FireflyIII/Report/ReportInterface.php @@ -3,6 +3,7 @@ namespace FireflyIII\Report; use Carbon\Carbon; +use Illuminate\Support\Collection; /** * Interface ReportInterface @@ -12,12 +13,22 @@ use Carbon\Carbon; interface ReportInterface { /** - * @param Carbon $date - * @param string $direction + * @param Carbon $start + * @param Carbon $end + * @param int $limit * - * @return mixed + * @return Collection */ - public function groupByRevenue(Carbon $date, $direction = 'income'); + public function revenueGroupedByAccount(Carbon $start, Carbon $end, $limit = 15); + + /** + * @param Carbon $start + * @param Carbon $end + * @param int $limit + * + * @return Collection + */ + public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15); /** * @param Carbon $start From d054f9b92f9ffd8eb7455c7b19fb0833acffe6a4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 10 Dec 2014 19:15:14 +0100 Subject: [PATCH 03/92] Added composer.lock. --- .gitignore | 1 - composer.lock | 4174 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4174 insertions(+), 1 deletion(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index d0be83396b..7a425f757c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /bootstrap/compiled.php /vendor composer.phar -composer.lock .env.*.php .env.php .DS_Store diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000000..b05ef34b6b --- /dev/null +++ b/composer.lock @@ -0,0 +1,4174 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "248937553255d85014e6ec3b32115848", + "packages": [ + { + "name": "classpreloader/classpreloader", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/mtdowling/ClassPreloader.git", + "reference": "2c9f3bcbab329570c57339895bd11b5dd3b00877" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mtdowling/ClassPreloader/zipball/2c9f3bcbab329570c57339895bd11b5dd3b00877", + "reference": "2c9f3bcbab329570c57339895bd11b5dd3b00877", + "shasum": "" + }, + "require": { + "nikic/php-parser": "~0.9", + "php": ">=5.3.3", + "symfony/console": "~2.1", + "symfony/filesystem": "~2.1", + "symfony/finder": "~2.1" + }, + "bin": [ + "classpreloader.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "ClassPreloader": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", + "keywords": [ + "autoload", + "class", + "preload" + ], + "time": "2014-03-12 00:05:31" + }, + { + "name": "d11wtq/boris", + "version": "v1.0.8", + "source": { + "type": "git", + "url": "https://github.com/d11wtq/boris.git", + "reference": "125dd4e5752639af7678a22ea597115646d89c6e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/d11wtq/boris/zipball/125dd4e5752639af7678a22ea597115646d89c6e", + "reference": "125dd4e5752639af7678a22ea597115646d89c6e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "suggest": { + "ext-pcntl": "*", + "ext-posix": "*", + "ext-readline": "*" + }, + "bin": [ + "bin/boris" + ], + "type": "library", + "autoload": { + "psr-0": { + "Boris": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "time": "2014-01-17 12:21:18" + }, + { + "name": "davejamesmiller/laravel-breadcrumbs", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", + "reference": "cfcdc58ceaa8bbafa403828b8d1279d65f62799f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/cfcdc58ceaa8bbafa403828b8d1279d65f62799f", + "reference": "cfcdc58ceaa8bbafa403828b8d1279d65f62799f", + "shasum": "" + }, + "require": { + "illuminate/support": "4.*|5.*", + "illuminate/view": "4.*|5.*", + "php": ">=5.3.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.0", + "phpunit/phpunit": "4.0.*", + "satooshi/php-coveralls": "~0.6.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "DaveJamesMiller\\Breadcrumbs": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT License" + ], + "authors": [ + { + "name": "Dave James Miller", + "email": "dave@davejamesmiller.com", + "homepage": "http://davejamesmiller.com/" + } + ], + "description": "A simple Laravel-style way to create breadcrumbs in Laravel 4+.", + "homepage": "https://github.com/davejamesmiller/laravel-breadcrumbs", + "keywords": [ + "laravel" + ], + "time": "2014-10-26 22:36:05" + }, + { + "name": "filp/whoops", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/filp/whoops.git", + "reference": "a85fab9a98f1f9b8ebcdbe71733f0d910e5b9adf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/filp/whoops/zipball/a85fab9a98f1f9b8ebcdbe71733f0d910e5b9adf", + "reference": "a85fab9a98f1f9b8ebcdbe71733f0d910e5b9adf", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-0": { + "Whoops": "src/" + }, + "classmap": [ + "src/deprecated" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "homepage": "https://github.com/filp", + "role": "Developer" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://github.com/filp/whoops", + "keywords": [ + "error", + "exception", + "handling", + "library", + "silex-provider", + "whoops", + "zf2" + ], + "time": "2014-10-26 09:05:09" + }, + { + "name": "grumpydictator/gchart", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/JC5/gchart.git", + "reference": "f56d503e18d823393a39971bd861580e20833799" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JC5/gchart/zipball/f56d503e18d823393a39971bd861580e20833799", + "reference": "f56d503e18d823393a39971bd861580e20833799", + "shasum": "" + }, + "require": { + "illuminate/support": "4.x", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Grumpydictator\\Gchart": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sander Dorigo", + "email": "thegrumpydictator@gmail.com", + "homepage": "https://github.com/JC5", + "role": "Developer" + } + ], + "description": "GChart is a small package that allows you to easily generate data for the Google Charts API.", + "time": "2014-05-02 12:26:09" + }, + { + "name": "ircmaxell/password-compat", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "type": "library", + "autoload": { + "files": [ + "lib/password.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" + } + ], + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", + "keywords": [ + "hashing", + "password" + ], + "time": "2014-11-20 16:49:30" + }, + { + "name": "jeremeamia/SuperClosure", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/jeremeamia/super_closure.git", + "reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/d05400085f7d4ae6f20ba30d36550836c0d061e8", + "reference": "d05400085f7d4ae6f20ba30d36550836c0d061e8", + "shasum": "" + }, + "require": { + "nikic/php-parser": "~0.9", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, + "type": "library", + "autoload": { + "psr-0": { + "Jeremeamia\\SuperClosure": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeremy Lindblom" + } + ], + "description": "Doing interesting things with closures like serialization.", + "homepage": "https://github.com/jeremeamia/super_closure", + "keywords": [ + "closure", + "function", + "parser", + "serializable", + "serialize", + "tokenizer" + ], + "time": "2013-10-09 04:20:00" + }, + { + "name": "laravel/framework", + "version": "v4.2.11", + "source": { + "type": "git", + "url": "https://github.com/laravel/framework.git", + "reference": "e29253c7f29e3b1ca716de7fe309b272e3ddf47d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/framework/zipball/e29253c7f29e3b1ca716de7fe309b272e3ddf47d", + "reference": "e29253c7f29e3b1ca716de7fe309b272e3ddf47d", + "shasum": "" + }, + "require": { + "classpreloader/classpreloader": "~1.0.2", + "d11wtq/boris": "~1.0", + "filp/whoops": "1.1.*", + "ircmaxell/password-compat": "~1.0", + "jeremeamia/superclosure": "~1.0.1", + "monolog/monolog": "~1.6", + "nesbot/carbon": "~1.0", + "patchwork/utf8": "1.1.*", + "php": ">=5.4.0", + "phpseclib/phpseclib": "0.3.*", + "predis/predis": "0.8.*", + "stack/builder": "~1.0", + "swiftmailer/swiftmailer": "~5.1", + "symfony/browser-kit": "2.5.*", + "symfony/console": "2.5.*", + "symfony/css-selector": "2.5.*", + "symfony/debug": "2.5.*", + "symfony/dom-crawler": "2.5.*", + "symfony/finder": "2.5.*", + "symfony/http-foundation": "2.5.*", + "symfony/http-kernel": "2.5.*", + "symfony/process": "2.5.*", + "symfony/routing": "2.5.*", + "symfony/security-core": "2.5.*", + "symfony/translation": "2.5.*" + }, + "replace": { + "illuminate/auth": "self.version", + "illuminate/cache": "self.version", + "illuminate/config": "self.version", + "illuminate/console": "self.version", + "illuminate/container": "self.version", + "illuminate/cookie": "self.version", + "illuminate/database": "self.version", + "illuminate/encryption": "self.version", + "illuminate/events": "self.version", + "illuminate/exception": "self.version", + "illuminate/filesystem": "self.version", + "illuminate/foundation": "self.version", + "illuminate/hashing": "self.version", + "illuminate/html": "self.version", + "illuminate/http": "self.version", + "illuminate/log": "self.version", + "illuminate/mail": "self.version", + "illuminate/pagination": "self.version", + "illuminate/queue": "self.version", + "illuminate/redis": "self.version", + "illuminate/remote": "self.version", + "illuminate/routing": "self.version", + "illuminate/session": "self.version", + "illuminate/support": "self.version", + "illuminate/translation": "self.version", + "illuminate/validation": "self.version", + "illuminate/view": "self.version", + "illuminate/workbench": "self.version" + }, + "require-dev": { + "aws/aws-sdk-php": "~2.6", + "iron-io/iron_mq": "~1.5", + "mockery/mockery": "~0.9", + "pda/pheanstalk": "~2.1", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "doctrine/dbal": "Allow renaming columns and dropping SQLite columns." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/Illuminate/Queue/IlluminateQueueClosure.php" + ], + "files": [ + "src/Illuminate/Support/helpers.php" + ], + "psr-0": { + "Illuminate": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "The Laravel Framework.", + "keywords": [ + "framework", + "laravel" + ], + "time": "2014-10-04 18:48:27" + }, + { + "name": "michelf/php-markdown", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/michelf/php-markdown.git", + "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", + "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-lib": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Michelf": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "http://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "http://daringfireball.net/" + } + ], + "description": "PHP Markdown", + "homepage": "http://michelf.ca/projects/php-markdown/", + "keywords": [ + "markdown" + ], + "time": "2014-05-05 02:43:50" + }, + { + "name": "monolog/monolog", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa", + "reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "provide": { + "psr/log-implementation": "1.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "~2.4, >2.4.8", + "doctrine/couchdb": "~1.0@dev", + "graylog2/gelf-php": "~1.0", + "phpunit/phpunit": "~3.7.0", + "raven/raven": "~0.5", + "ruflin/elastica": "0.90.*", + "videlalvaro/php-amqplib": "~2.4" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "raven/raven": "Allow sending log messages to a Sentry server", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "time": "2014-09-30 13:30:58" + }, + { + "name": "nesbot/carbon", + "version": "1.13.0", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "5cb6e71055f7b0b57956b73d324cc4de31278f42" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/5cb6e71055f7b0b57956b73d324cc4de31278f42", + "reference": "5cb6e71055f7b0b57956b73d324cc4de31278f42", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Carbon": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "http://nesbot.com" + } + ], + "description": "A simple API extension for DateTime.", + "homepage": "https://github.com/briannesbitt/Carbon", + "keywords": [ + "date", + "datetime", + "time" + ], + "time": "2014-09-26 02:52:02" + }, + { + "name": "nikic/php-parser", + "version": "v0.9.5", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb", + "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.9-dev" + } + }, + "autoload": { + "psr-0": { + "PHPParser": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2014-07-23 18:24:17" + }, + { + "name": "patchwork/utf8", + "version": "v1.1.26", + "source": { + "type": "git", + "url": "https://github.com/tchwork/utf8.git", + "reference": "6b8e46603b49ee87ad6bceb314da94cc04ffcdce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tchwork/utf8/zipball/6b8e46603b49ee87ad6bceb314da94cc04ffcdce", + "reference": "6b8e46603b49ee87ad6bceb314da94cc04ffcdce", + "shasum": "" + }, + "require": { + "lib-pcre": ">=7.3", + "php": ">=5.3.0" + }, + "suggest": { + "ext-iconv": "Use iconv for best performance", + "ext-intl": "Use Intl for best performance", + "ext-mbstring": "Use Mbstring for best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-0": { + "Patchwork": "class/", + "Normalizer": "class/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "(Apache-2.0 or GPL-2.0)" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + } + ], + "description": "Portable and performant UTF-8, Unicode and Grapheme Clusters for PHP", + "homepage": "https://github.com/tchwork/utf8", + "keywords": [ + "grapheme", + "i18n", + "unicode", + "utf-8", + "utf8" + ], + "time": "2014-11-08 10:13:25" + }, + { + "name": "phpseclib/phpseclib", + "version": "0.3.9", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1", + "reference": "c6e88ca6e81bc5a2d7161658e16a95b7ef8d6ad1", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "require-dev": { + "phing/phing": "2.7.*", + "phpunit/phpunit": "4.0.*", + "sami/sami": "1.*", + "squizlabs/php_codesniffer": "1.*" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.", + "pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 4.3.3." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.3-dev" + } + }, + "autoload": { + "psr-0": { + "Crypt": "phpseclib/", + "File": "phpseclib/", + "Math": "phpseclib/", + "Net": "phpseclib/", + "System": "phpseclib/" + }, + "files": [ + "phpseclib/Crypt/Random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "phpseclib/" + ], + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "time": "2014-11-10 03:08:59" + }, + { + "name": "predis/predis", + "version": "v0.8.7", + "source": { + "type": "git", + "url": "https://github.com/nrk/predis.git", + "reference": "4123fcd85d61354c6c9900db76c9597dbd129bf6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nrk/predis/zipball/4123fcd85d61354c6c9900db76c9597dbd129bf6", + "reference": "4123fcd85d61354c6c9900db76c9597dbd129bf6", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + }, + "type": "library", + "autoload": { + "psr-0": { + "Predis": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net" + } + ], + "description": "Flexible and feature-complete PHP client library for Redis", + "homepage": "http://github.com/nrk/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], + "time": "2014-08-01 09:43:10" + }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2012-12-21 11:40:51" + }, + { + "name": "stack/builder", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/stackphp/builder.git", + "reference": "c1f8a4693b55c563405024f708a76ef576c3b276" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stackphp/builder/zipball/c1f8a4693b55c563405024f708a76ef576c3b276", + "reference": "c1f8a4693b55c563405024f708a76ef576c3b276", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.1" + }, + "require-dev": { + "silex/silex": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Stack": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + } + ], + "description": "Builder for stack middlewares based on HttpKernelInterface.", + "keywords": [ + "stack" + ], + "time": "2014-11-23 20:37:11" + }, + { + "name": "swiftmailer/swiftmailer", + "version": "v5.3.1", + "source": { + "type": "git", + "url": "https://github.com/swiftmailer/swiftmailer.git", + "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", + "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "mockery/mockery": "~0.9.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.3-dev" + } + }, + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Corbyn" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ], + "time": "2014-12-05 14:17:14" + }, + { + "name": "symfony/browser-kit", + "version": "v2.5.8", + "target-dir": "Symfony/Component/BrowserKit", + "source": { + "type": "git", + "url": "https://github.com/symfony/BrowserKit.git", + "reference": "a4e87ee941bcf8c96ddac676d90762ed1cd6c5fa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/a4e87ee941bcf8c96ddac676d90762ed1cd6c5fa", + "reference": "a4e87ee941bcf8c96ddac676d90762ed1cd6c5fa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/dom-crawler": "~2.0" + }, + "require-dev": { + "symfony/css-selector": "~2.0", + "symfony/process": "~2.0" + }, + "suggest": { + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\BrowserKit\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/console", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "806e29280b4b9700693b32d055ce1b1a491dec39" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/806e29280b4b9700693b32d055ce1b1a491dec39", + "reference": "806e29280b4b9700693b32d055ce1b1a491dec39", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/css-selector", + "version": "v2.5.8", + "target-dir": "Symfony/Component/CssSelector", + "source": { + "type": "git", + "url": "https://github.com/symfony/CssSelector.git", + "reference": "8819e8e95f14a3544abd7225b0723b617075ca34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/CssSelector/zipball/8819e8e95f14a3544abd7225b0723b617075ca34", + "reference": "8819e8e95f14a3544abd7225b0723b617075ca34", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\CssSelector\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/debug", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Debug", + "source": { + "type": "git", + "url": "https://github.com/symfony/Debug.git", + "reference": "9d3d6734bde608ff7d671036101c3cd4277d1da7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Debug/zipball/9d3d6734bde608ff7d671036101c3cd4277d1da7", + "reference": "9d3d6734bde608ff7d671036101c3cd4277d1da7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/http-foundation": "~2.1", + "symfony/http-kernel": "~2.1" + }, + "suggest": { + "symfony/http-foundation": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Debug\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Debug Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/dom-crawler", + "version": "v2.5.8", + "target-dir": "Symfony/Component/DomCrawler", + "source": { + "type": "git", + "url": "https://github.com/symfony/DomCrawler.git", + "reference": "afbdb416ca0096d2d6be13c6fe42d20b52656076" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/afbdb416ca0096d2d6be13c6fe42d20b52656076", + "reference": "afbdb416ca0096d2d6be13c6fe42d20b52656076", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/css-selector": "~2.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\DomCrawler\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.6.1", + "target-dir": "Symfony/Component/EventDispatcher", + "source": { + "type": "git", + "url": "https://github.com/symfony/EventDispatcher.git", + "reference": "720fe9bca893df7ad1b4546649473b5afddf0216" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216", + "reference": "720fe9bca893df7ad1b4546649473b5afddf0216", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0", + "symfony/dependency-injection": "~2.6", + "symfony/expression-language": "~2.6", + "symfony/stopwatch": "~2.2" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/filesystem", + "version": "v2.6.1", + "target-dir": "Symfony/Component/Filesystem", + "source": { + "type": "git", + "url": "https://github.com/symfony/Filesystem.git", + "reference": "ff6efc95256cb33031933729e68b01d720b5436b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/ff6efc95256cb33031933729e68b01d720b5436b", + "reference": "ff6efc95256cb33031933729e68b01d720b5436b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/finder", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "e5487b9a23adc4be228ac550100d89c50f1ee8d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/e5487b9a23adc4be228ac550100d89c50f1ee8d5", + "reference": "e5487b9a23adc4be228ac550100d89c50f1ee8d5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/http-foundation", + "version": "v2.5.8", + "target-dir": "Symfony/Component/HttpFoundation", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpFoundation.git", + "reference": "44dfbeb4fa64582d46c7bd59e325245d0b2b9fff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/44dfbeb4fa64582d46c7bd59e325245d0b2b9fff", + "reference": "44dfbeb4fa64582d46c7bd59e325245d0b2b9fff", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/expression-language": "~2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "classmap": [ + "Symfony/Component/HttpFoundation/Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/http-kernel", + "version": "v2.5.8", + "target-dir": "Symfony/Component/HttpKernel", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpKernel.git", + "reference": "c16051a1f3d259f806115fd9897430ae162d19a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/c16051a1f3d259f806115fd9897430ae162d19a0", + "reference": "c16051a1f3d259f806115fd9897430ae162d19a0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "psr/log": "~1.0", + "symfony/debug": "~2.5", + "symfony/event-dispatcher": "~2.5", + "symfony/http-foundation": "~2.5" + }, + "require-dev": { + "symfony/browser-kit": "~2.2", + "symfony/class-loader": "~2.1", + "symfony/config": "~2.0", + "symfony/console": "~2.2", + "symfony/dependency-injection": "~2.0", + "symfony/expression-language": "~2.4", + "symfony/finder": "~2.0", + "symfony/process": "~2.0", + "symfony/routing": "~2.2", + "symfony/stopwatch": "~2.2", + "symfony/templating": "~2.2" + }, + "suggest": { + "symfony/browser-kit": "", + "symfony/class-loader": "", + "symfony/config": "", + "symfony/console": "", + "symfony/dependency-injection": "", + "symfony/finder": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpKernel\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony HttpKernel Component", + "homepage": "http://symfony.com", + "time": "2014-12-03 14:18:17" + }, + { + "name": "symfony/process", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Process", + "source": { + "type": "git", + "url": "https://github.com/symfony/Process.git", + "reference": "62c77d834c6cbf9cafa294a864aeba3a6c985af3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Process/zipball/62c77d834c6cbf9cafa294a864aeba3a6c985af3", + "reference": "62c77d834c6cbf9cafa294a864aeba3a6c985af3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Process\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Process Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/routing", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Routing", + "source": { + "type": "git", + "url": "https://github.com/symfony/Routing.git", + "reference": "9b7d9f6121e45243cc18e4ed682d8faa418d04bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Routing/zipball/9b7d9f6121e45243cc18e4ed682d8faa418d04bc", + "reference": "9b7d9f6121e45243cc18e4ed682d8faa418d04bc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "psr/log": "~1.0", + "symfony/config": "~2.2", + "symfony/expression-language": "~2.4", + "symfony/http-foundation": "~2.3", + "symfony/yaml": "~2.0" + }, + "suggest": { + "doctrine/annotations": "For using the annotation loader", + "symfony/config": "For using the all-in-one router or any loader", + "symfony/expression-language": "For using expression matching", + "symfony/yaml": "For using the YAML loader" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Routing\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Routing Component", + "homepage": "http://symfony.com", + "keywords": [ + "router", + "routing", + "uri", + "url" + ], + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/security-core", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Security/Core", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-core.git", + "reference": "d55c2b3abb03fe96a67b0f7ca99fbc848ef773a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-core/zipball/d55c2b3abb03fe96a67b0f7ca99fbc848ef773a7", + "reference": "d55c2b3abb03fe96a67b0f7ca99fbc848ef773a7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "ircmaxell/password-compat": "1.0.*", + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/expression-language": "~2.4", + "symfony/http-foundation": "~2.4", + "symfony/validator": "~2.5" + }, + "suggest": { + "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5", + "symfony/event-dispatcher": "", + "symfony/expression-language": "For using the expression voter", + "symfony/http-foundation": "", + "symfony/validator": "For using the user password constraint" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Security\\Core\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Security Component - Core Library", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "symfony/translation", + "version": "v2.5.8", + "target-dir": "Symfony/Component/Translation", + "source": { + "type": "git", + "url": "https://github.com/symfony/Translation.git", + "reference": "ab6e1580746c248c955a4c70a2a214fe780aa299" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Translation/zipball/ab6e1580746c248c955a4c70a2a214fe780aa299", + "reference": "ab6e1580746c248c955a4c70a2a214fe780aa299", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": "~2.0", + "symfony/intl": "~2.3", + "symfony/yaml": "~2.2" + }, + "suggest": { + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Translation\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Translation Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:15:53" + }, + { + "name": "watson/validating", + "version": "0.10.6", + "source": { + "type": "git", + "url": "https://github.com/dwightwatson/validating.git", + "reference": "673b165b4391942a7fae1e85a84f21b5f367f33f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/673b165b4391942a7fae1e85a84f21b5f367f33f", + "reference": "673b165b4391942a7fae1e85a84f21b5f367f33f", + "shasum": "" + }, + "require": { + "illuminate/database": "~4.2.6", + "illuminate/events": "~4.2.6", + "illuminate/support": "~4.2.6", + "illuminate/validation": "~4.2.6", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "4.1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Watson\\Validating\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dwight Watson", + "email": "dwight@studiousapp.com" + } + ], + "description": "Eloquent model validating trait.", + "keywords": [ + "eloquent", + "laravel", + "validation" + ], + "time": "2014-11-20 02:09:08" + } + ], + "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v1.8.4", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "410e98739c58ccd1b9ad2f49afd77a8d40144515" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/410e98739c58ccd1b9ad2f49afd77a8d40144515", + "reference": "410e98739c58ccd1b9ad2f49afd77a8d40144515", + "shasum": "" + }, + "require": { + "laravel/framework": "4.*|5.0.*", + "maximebf/debugbar": "~1.10.1", + "php": ">=5.3.0", + "symfony/finder": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "time": "2014-12-04 12:14:32" + }, + { + "name": "barryvdh/laravel-ide-helper", + "version": "v1.11.3", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-ide-helper.git", + "reference": "9a67d9132f0e2b9ed5d668aaa8a2ebc7d4dd6d49" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/9a67d9132f0e2b9ed5d668aaa8a2ebc7d4dd6d49", + "reference": "9a67d9132f0e2b9ed5d668aaa8a2ebc7d4dd6d49", + "shasum": "" + }, + "require": { + "illuminate/console": "4.x", + "illuminate/filesystem": "4.x", + "illuminate/support": "4.x", + "php": ">=5.3.0", + "phpdocumentor/reflection-docblock": "2.0.x", + "symfony/class-loader": "~2.3" + }, + "require-dev": { + "doctrine/dbal": "~2.3" + }, + "suggest": { + "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.11-dev" + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\LaravelIdeHelper\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", + "keywords": [ + "autocomplete", + "codeintel", + "helper", + "ide", + "laravel", + "netbeans", + "phpdoc", + "phpstorm", + "sublime" + ], + "time": "2014-08-26 08:54:34" + }, + { + "name": "codeception/c3", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Codeception/c3.git", + "reference": "9c144d5bd3a12a5e8359d38c582238c1f1253fdb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/c3/zipball/9c144d5bd3a12a5e8359d38c582238c1f1253fdb", + "reference": "9c144d5bd3a12a5e8359d38c582238c1f1253fdb", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Codeception\\c3\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk", + "email": "davert.php@resend.cc", + "homepage": "http://codegyre.com" + } + ], + "description": "CodeCoverage collector for Codeception", + "homepage": "http://codeception.com/", + "keywords": [ + "code coverage", + "codecoverage" + ], + "time": "2014-10-07 22:56:24" + }, + { + "name": "codeception/codeception", + "version": "2.0.8", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Codeception.git", + "reference": "0f9de6de9788912a289214a020193eac0a9a05e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/0f9de6de9788912a289214a020193eac0a9a05e8", + "reference": "0f9de6de9788912a289214a020193eac0a9a05e8", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "facebook/webdriver": "~0.4", + "guzzlehttp/guzzle": "~4.0|~5.0", + "php": ">=5.4.0", + "phpunit/phpunit": "~4.0", + "symfony/browser-kit": "~2.4", + "symfony/console": "~2.4", + "symfony/css-selector": "~2.4", + "symfony/dom-crawler": "~2.4,!=2.4.5", + "symfony/event-dispatcher": "~2.4", + "symfony/finder": "~2.4", + "symfony/yaml": "~2.4" + }, + "require-dev": { + "codeception/specify": "~0.3", + "codegyre/robo-ci": "@dev", + "facebook/php-sdk": "~3.2", + "monolog/monolog": "~1.8", + "pda/pheanstalk": "~2.0", + "phpseclib/phpseclib": "~0.3.6", + "videlalvaro/php-amqplib": "~2.4" + }, + "suggest": { + "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests", + "codeception/specify": "BDD-style code blocks", + "codeception/verify": "BDD-style assertions", + "monolog/monolog": "Log test steps", + "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module." + }, + "bin": [ + "codecept" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "psr-0": { + "Codeception": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" + } + ], + "description": "BDD-style testing framework", + "homepage": "http://codeception.com/", + "keywords": [ + "BDD", + "TDD", + "acceptance testing", + "functional testing", + "unit testing" + ], + "time": "2014-11-18 00:48:50" + }, + { + "name": "doctrine/annotations", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/6a6bec0670bb6e71a263b08bc1b98ea242928633", + "reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": ">=5.3.2" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Annotations\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2014-09-25 16:45:30" + }, + { + "name": "doctrine/cache", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/cf483685798a72c93bf4206e3dd6358ea07d64e7", + "reference": "cf483685798a72c93bf4206e3dd6358ea07d64e7", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "phpunit/phpunit": ">=3.7", + "satooshi/php-coveralls": "~0.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Cache\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Caching library offering an object-oriented API for many cache backends", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "cache", + "caching" + ], + "time": "2014-09-17 14:24:04" + }, + { + "name": "doctrine/collections", + "version": "v1.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/collections.git", + "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/collections/zipball/b99c5c46c87126201899afe88ec490a25eedd6a2", + "reference": "b99c5c46c87126201899afe88ec490a25eedd6a2", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Collections\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/", + "role": "Creator" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Collections Abstraction library", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "array", + "collections", + "iterator" + ], + "time": "2014-02-03 23:07:43" + }, + { + "name": "doctrine/common", + "version": "v2.4.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common.git", + "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/", + "role": "Creator" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" + ], + "time": "2014-05-21 19:28:51" + }, + { + "name": "doctrine/dbal", + "version": "v2.5.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "71140662c0a954602e81271667b6e03d9f53ea34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/71140662c0a954602e81271667b6e03d9f53ea34", + "reference": "71140662c0a954602e81271667b6e03d9f53ea34", + "shasum": "" + }, + "require": { + "doctrine/common": ">=2.4,<2.6-dev", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "4.*", + "symfony/console": "2.*" + }, + "suggest": { + "symfony/console": "For helpful console commands such as SQL execution and import of files." + }, + "bin": [ + "bin/doctrine-dbal" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\DBAL\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "dbal", + "persistence", + "queryobject" + ], + "time": "2014-12-04 21:57:15" + }, + { + "name": "doctrine/inflector", + "version": "v1.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "54b8333d2a5682afdc690060c1cf384ba9f47f08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/54b8333d2a5682afdc690060c1cf384ba9f47f08", + "reference": "54b8333d2a5682afdc690060c1cf384ba9f47f08", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "Doctrine\\Common\\Inflector\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/", + "role": "Creator" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "inflection", + "pluarlize", + "singuarlize", + "string" + ], + "time": "2013-01-10 21:49:15" + }, + { + "name": "doctrine/instantiator", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "2.0.*@ALPHA" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Instantiator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2014-10-13 12:58:55" + }, + { + "name": "doctrine/lexer", + "version": "v1.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb", + "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2013-01-12 18:59:04" + }, + { + "name": "facebook/webdriver", + "version": "v0.5.1", + "source": { + "type": "git", + "url": "https://github.com/facebook/php-webdriver.git", + "reference": "bbcb697efb394d17bd9ec3d467e7da847cde4509" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bbcb697efb394d17bd9ec3d467e7da847cde4509", + "reference": "bbcb697efb394d17bd9ec3d467e7da847cde4509", + "shasum": "" + }, + "require": { + "php": ">=5.3.19" + }, + "require-dev": { + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "A php client for WebDriver", + "homepage": "https://github.com/facebook/php-webdriver", + "keywords": [ + "facebook", + "php", + "selenium", + "webdriver" + ], + "time": "2014-11-05 20:53:09" + }, + { + "name": "fzaninotto/faker", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/010c7efedd88bf31141a02719f51fb44c732d5a0", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-0": { + "Faker": "src/", + "Faker\\PHPUnit": "test/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2014-06-04 14:43:02" + }, + { + "name": "guzzle/guzzle", + "version": "v3.9.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "54991459675c1a2924122afbb0e5609ade581155" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155", + "reference": "54991459675c1a2924122afbb0e5609ade581155", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2014-08-11 04:32:36" + }, + { + "name": "guzzlehttp/guzzle", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6c72627de1d66832e4270e36e56acdb0d1d8f282", + "reference": "6c72627de1d66832e4270e36e56acdb0d1d8f282", + "shasum": "" + }, + "require": { + "guzzlehttp/ringphp": "~1.0", + "php": ">=5.4.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2014-11-04 07:09:15" + }, + { + "name": "guzzlehttp/ringphp", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/guzzle/RingPHP.git", + "reference": "9187999f80720b9494692d2167d75144acb2ad05" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/9187999f80720b9494692d2167d75144acb2ad05", + "reference": "9187999f80720b9494692d2167d75144acb2ad05", + "shasum": "" + }, + "require": { + "guzzlehttp/streams": "~3.0", + "php": ">=5.4.0", + "react/promise": "~2.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "ext-curl": "Guzzle will use specific adapters if cURL is present" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Ring\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "time": "2014-12-02 05:01:22" + }, + { + "name": "guzzlehttp/streams", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/streams.git", + "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", + "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Stream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Provides a simple abstraction over streams of data", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "stream" + ], + "time": "2014-10-12 19:18:40" + }, + { + "name": "league/factory-muffin", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/factory-muffin.git", + "reference": "91f0adcdac6b5f7bf2277ac2c90f94352afe65de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/factory-muffin/zipball/91f0adcdac6b5f7bf2277ac2c90f94352afe65de", + "reference": "91f0adcdac6b5f7bf2277ac2c90f94352afe65de", + "shasum": "" + }, + "require": { + "fzaninotto/faker": "1.4.*", + "php": ">=5.3.3" + }, + "replace": { + "zizaco/factory-muff": "self.version" + }, + "require-dev": { + "illuminate/database": "~4.1", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "illuminate/database": "Factory Muffin works well with eloquent models." + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\FactoryMuffin\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "graham@mineuk.com" + }, + { + "name": "Zizaco Zizuini", + "email": "zizaco@gmail.com" + }, + { + "name": "Scott Robertson", + "email": "scottymeuk@gmail.com" + } + ], + "description": "The goal of this package is to enable the rapid creation of objects for the purpose of testing.", + "homepage": "http://factory-muffin.thephpleague.com/", + "keywords": [ + "factory", + "laravel", + "testing" + ], + "time": "2014-09-18 18:29:06" + }, + { + "name": "maximebf/debugbar", + "version": "1.10.1", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "f100f27124e8e042074d6264e33c75c6ea2677e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/f100f27124e8e042074d6264e33c75c6ea2677e6", + "reference": "f100f27124e8e042074d6264e33c75c6ea2677e6", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "autoload": { + "psr-0": { + "DebugBar": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug" + ], + "time": "2014-11-23 12:05:01" + }, + { + "name": "mockery/mockery", + "version": "0.9.2", + "source": { + "type": "git", + "url": "https://github.com/padraic/mockery.git", + "reference": "95a4855380dc70176c51807c678fb3bd6198529a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/padraic/mockery/zipball/95a4855380dc70176c51807c678fb3bd6198529a", + "reference": "95a4855380dc70176c51807c678fb3bd6198529a", + "shasum": "" + }, + "require": { + "lib-pcre": ">=7.0", + "php": ">=5.3.2" + }, + "require-dev": { + "hamcrest/hamcrest-php": "~1.1", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "~0.7@dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.9.x-dev" + } + }, + "autoload": { + "psr-0": { + "Mockery": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "http://blog.astrumfutura.com" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "http://davedevelopment.co.uk" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succint API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", + "homepage": "http://github.com/padraic/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ], + "time": "2014-09-03 10:11:10" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "38743b677965c48a637097b2746a281264ae2347" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/38743b677965c48a637097b2746a281264ae2347", + "reference": "38743b677965c48a637097b2746a281264ae2347", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*@stable" + }, + "suggest": { + "dflydev/markdown": "1.0.*", + "erusev/parsedown": "~0.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "phpDocumentor": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "time": "2014-08-09 10:27:07" + }, + { + "name": "phpunit/php-code-coverage", + "version": "2.0.13", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", + "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "~1.0", + "sebastian/version": "~1.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4.1" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2014-12-03 06:41:44" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.3.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2013-10-10 15:34:57" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2014-01-30 17:20:04" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2013-08-02 07:42:54" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "f8d5d08c56de5cfd592b3340424a81733259a876" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876", + "reference": "f8d5d08c56de5cfd592b3340424a81733259a876", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2014-08-31 06:12:13" + }, + { + "name": "phpunit/phpunit", + "version": "4.4.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0", + "reference": "bbe7bcb83b6ec1a9eaabbe1b70d4795027c53ee0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": "~2.0", + "phpunit/php-file-iterator": "~1.3.2", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.0", + "sebastian/diff": "~1.1", + "sebastian/environment": "~1.1", + "sebastian/exporter": "~1.0", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2014-12-05 06:49:03" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "c63d2367247365f688544f0d500af90a11a44c65" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65", + "reference": "c63d2367247365f688544f0d500af90a11a44c65", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "~1.0,>=1.0.1", + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.3" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2014-10-03 05:12:11" + }, + { + "name": "react/promise", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "937b04f1b0ee8f6d180e75a0830aac778ca4bcd6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/937b04f1b0ee8f6d180e75a0830aac778ca4bcd6", + "reference": "937b04f1b0ee8f6d180e75a0830aac778ca4bcd6", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@googlemail.com" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "time": "2014-10-15 20:05:57" + }, + { + "name": "satooshi/php-coveralls", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/satooshi/php-coveralls.git", + "reference": "2fbf803803d179ab1082807308a67bbd5a760c70" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70", + "reference": "2fbf803803d179ab1082807308a67bbd5a760c70", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": ">=2.7", + "php": ">=5.3", + "psr/log": "1.0.0", + "symfony/config": ">=2.0", + "symfony/console": ">=2.0", + "symfony/stopwatch": ">=2.2", + "symfony/yaml": ">=2.0" + }, + "require-dev": { + "apigen/apigen": "2.8.*@stable", + "pdepend/pdepend": "dev-master as 2.0.0", + "phpmd/phpmd": "dev-master", + "phpunit/php-invoker": ">=1.1.0,<1.2.0", + "phpunit/phpunit": "3.7.*@stable", + "sebastian/finder-facade": "dev-master", + "sebastian/phpcpd": "1.4.*@stable", + "squizlabs/php_codesniffer": "1.4.*@stable", + "theseer/fdomdocument": "dev-master" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "composer/bin/coveralls" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.7-dev" + } + }, + "autoload": { + "psr-0": { + "Satooshi\\Component": "src/", + "Satooshi\\Bundle": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "time": "2014-11-11 15:35:34" + }, + { + "name": "sebastian/comparator", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "c484a80f97573ab934e37826dba0135a3301b26a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", + "reference": "c484a80f97573ab934e37826dba0135a3301b26a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.1", + "sebastian/exporter": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2014-11-16 21:32:38" + }, + { + "name": "sebastian/diff", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7", + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2014-08-15 10:29:00" + }, + { + "name": "sebastian/environment", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", + "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2014-10-25 08:00:45" + }, + { + "name": "sebastian/exporter", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2014-09-10 00:51:36" + }, + { + "name": "sebastian/global-state", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2014-10-06 09:23:50" + }, + { + "name": "sebastian/version", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2014-03-07 15:35:33" + }, + { + "name": "symfony/class-loader", + "version": "v2.6.1", + "target-dir": "Symfony/Component/ClassLoader", + "source": { + "type": "git", + "url": "https://github.com/symfony/ClassLoader.git", + "reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/ba3300e6d79eb51ca9edf77791bbd0497f6030dc", + "reference": "ba3300e6d79eb51ca9edf77791bbd0497f6030dc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/finder": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\ClassLoader\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/config", + "version": "v2.6.1", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config.git", + "reference": "84c0c150c1520995f09ea9e47e817068b353cb0f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Config/zipball/84c0c150c1520995f09ea9e47e817068b353cb0f", + "reference": "84c0c150c1520995f09ea9e47e817068b353cb0f", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/filesystem": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Config\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/stopwatch", + "version": "v2.6.1", + "target-dir": "Symfony/Component/Stopwatch", + "source": { + "type": "git", + "url": "https://github.com/symfony/Stopwatch.git", + "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/261abd360cfb6ac65ea93ffd82073e2011d034fc", + "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Stopwatch\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + }, + { + "name": "symfony/yaml", + "version": "v2.6.1", + "target-dir": "Symfony/Component/Yaml", + "source": { + "type": "git", + "url": "https://github.com/symfony/Yaml.git", + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20", + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Yaml\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Yaml Component", + "homepage": "http://symfony.com", + "time": "2014-12-02 20:19:20" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": { + "grumpydictator/gchart": 20, + "barryvdh/laravel-debugbar": 0, + "barryvdh/laravel-ide-helper": 0, + "satooshi/php-coveralls": 20, + "mockery/mockery": 0 + }, + "prefer-stable": false, + "platform": [], + "platform-dev": [] +} From cb2863eaf365a3e0e7ee42092aa00658b3a0d5d0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 12 Dec 2014 07:13:40 +0100 Subject: [PATCH 04/92] Cleaned up the budget controller. --- app/controllers/AccountController.php | 2 +- app/controllers/BudgetController.php | 271 ++++++++++--------------- app/lib/FireflyIII/Database/Budget.php | 47 ++++- app/views/budgets/income.blade.php | 2 +- app/views/budgets/index.blade.php | 10 +- 5 files changed, 153 insertions(+), 179 deletions(-) diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index b4fe3cd03d..a3a3d84697 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -236,7 +236,7 @@ class AccountController extends BaseController } // go back to update screen. if ($data['post_submit_action'] == 'return_to_edit') { - return Redirect::route('accounts.edit', $account->id); + return Redirect::route('accounts.edit', $account->id)->withInput(['post_submit_action' => 'return_to_edit']); } return Redirect::route('accounts.index', $data['what']); diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 3d2f95d75a..467d0318c1 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -1,24 +1,31 @@ _repository = $repository; + $this->_repository = $repository; + $this->_preferences = $preferences; View::share('title', 'Budgets'); View::share('mainTitleIcon', 'fa-tasks'); } @@ -31,17 +38,11 @@ class BudgetController extends BaseController */ public function amount(Budget $budget) { - $amount = intval(Input::get('amount')); - $date = Session::get('start'); - $limit = $this->_repository->updateLimitAmount($budget, $date, $amount); + $amount = intval(Input::get('amount')); + $date = Session::get('start'); + $limitRepetition = $this->_repository->updateLimitAmount($budget, $date, $amount); - // try to find the limit repetition for this limit: - $repetition = $limit->limitrepetitions()->first(); - if ($repetition) { - return Response::json(['name' => $budget->name, 'repetition' => $repetition->id]); - } else { - return Response::json(['name' => $budget->name, 'repetition' => null]); - } + return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition->id]); } @@ -72,8 +73,9 @@ class BudgetController extends BaseController */ public function destroy(Budget $budget) { + Session::flash('success', 'Budget "' . e($budget->name) . '" was deleted.'); $this->_repository->destroy($budget); - Session::flash('success', 'The budget was deleted.'); + return Redirect::route('budgets.index'); @@ -86,67 +88,39 @@ class BudgetController extends BaseController */ public function edit(Budget $budget) { - $subTitle = 'Edit budget "' . $budget->name . '"'; + $subTitle = 'Edit budget "' . e($budget->name) . '"'; return View::make('budgets.edit', compact('budget', 'subTitle')); } /** + * The index of the budget controller contains all budgets and the current relevant limit repetition. + * * @return $this */ public function index() { + $budgets = $this->_repository->get(); - /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */ - $preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface'); - - /** @var \FireflyIII\Database\Budget $repos */ - $repos = App::make('FireflyIII\Database\Budget'); - $budgets = $repos->get(); - - // get the limits for the current month. - $date = \Session::get('start'); - $spent = 0; - /** @var \Budget $budget */ - foreach ($budgets as $budget) { - - $budget->spent = $repos->spentInMonth($budget, $date); - $spent += $budget->spent; - $budget->pct = 0; - $budget->limit = 0; - - /** @var \Limit $limit */ - foreach ($budget->limits as $limit) { - /** @var \LimitRepetition $repetition */ - foreach ($limit->limitrepetitions as $repetition) { - if ($repetition->startdate == $date) { - $budget->currentRep = $repetition; - $budget->limit = floatval($repetition->amount); - if ($budget->limit > $budget->spent) { - // not overspent: - $budget->pct = 30; - } else { - $budget->pct = 50; - } - - } - } + // loop the budgets: + $budgets->each( + function (Budget $budget) { + /** @noinspection PhpUndefinedFieldInspection */ + $budget->spent = $this->_repository->spentInMonth($budget, \Session::get('start')); + /** @noinspection PhpUndefinedFieldInspection */ + $budget->currentRep = $budget->limitrepetitions()->where('limit_repetitions.startdate', \Session::get('start')->format('Y-m-d'))->first( + ['limit_repetitions.*'] + ); } - } + ); - $budgetAmount = $preferences->get('budgetIncomeTotal' . $date->format('FY'), 1000); - $amount = floatval($budgetAmount->data); - $overspent = $spent > $amount; - if ($overspent) { - // overspent on total amount - $spentPCT = ceil($amount / $spent * 100); - } else { - // not overspent on total amount. - $spentPCT = ceil($spent / $amount * 100); - } + $spent = $budgets->sum('spent'); + $amount = $this->_preferences->get('budgetIncomeTotal' . \Session::get('start')->format('FY'), 1000)->data; + $overspent = $spent > $amount; + $spentPCT = $overspent ? ceil($amount / $spent * 100) : ceil($spent / $amount * 100); - return View::make('budgets.index', compact('budgets', 'spent', 'spentPCT', 'overspent'))->with('budgetAmount', $budgetAmount); + return View::make('budgets.index', compact('budgets', 'spent', 'spentPCT', 'overspent', 'amount')); } /** @@ -154,12 +128,7 @@ class BudgetController extends BaseController */ public function postUpdateIncome() { - /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */ - $preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface'); - $date = Session::get('start'); - - $value = intval(Input::get('amount')); - $preferences->set('budgetIncomeTotal' . $date->format('FY'), $value); + $this->_preferences->set('budgetIncomeTotal' . Session::get('start')->format('FY'), intval(Input::get('amount'))); return Redirect::route('budgets.index'); } @@ -175,121 +144,93 @@ class BudgetController extends BaseController if (!is_null($repetition) && $repetition->limit->budget->id != $budget->id) { App::abort(500); } - /** @var \FireflyIII\Database\Budget $repos */ - $repos = App::make('FireflyIII\Database\Budget'); - if (is_null($repetition)) { - // get all other repetitions: - $limits = $budget->limits()->orderBy('startdate', 'DESC')->get(); - // get all transaction journals for this budget. - $journals = $repos->getTransactionJournals($budget, 50); + $journals = $this->_repository->getJournals($budget, $repetition); + $limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit]; + $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); - $subTitle = $budget->name; - } else { - // get nothing? i dunno - $limits = [$repetition->limit]; - // get all transaction journals for this budget and limit repetition. - $subTitle = $budget->name . ' in ' . $repetition->startdate->format('F Y'); - $journals = $repos->getTransactionJournalsInRepetition($budget, $repetition, 50); - } - $hideBudget = true; - - - return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget')); + return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle')); } /** - * @return $this - * @throws FireflyException + * @return $this|\Illuminate\Http\RedirectResponse */ public function store() { - /** @var \FireflyIII\Database\Budget $repos */ - $repos = App::make('FireflyIII\Database\Budget'); - $data = Input::except('_token'); + $data = Input::except('_token'); - switch ($data['post_submit_action']) { - default: - throw new FireflyException('Cannot handle post_submit_action "' . e($data['post_submit_action']) . '"'); - break; - case 'create_another': - case 'store': - $messages = $repos->validate($data); - /** @var MessageBag $messages ['errors'] */ - if ($messages['errors']->count() > 0) { - Session::flash('warnings', $messages['warnings']); - Session::flash('successes', $messages['successes']); - Session::flash('error', 'Could not save budget: ' . $messages['errors']->first()); + // always validate: + $messages = $this->_repository->validate($data); - return Redirect::route('budgets.create')->withInput()->withErrors($messages['errors']); - } - // store! - $repos->store($data); - Session::flash('success', 'New budget stored!'); - - if ($data['post_submit_action'] == 'create_another') { - return Redirect::route('budgets.create'); - } else { - return Redirect::route('budgets.index'); - } - break; - case 'validate_only': - $messageBags = $repos->validate($data); - Session::flash('warnings', $messageBags['warnings']); - Session::flash('successes', $messageBags['successes']); - Session::flash('errors', $messageBags['errors']); - - return Redirect::route('budgets.create')->withInput(); - break; + // flash messages: + Session::flash('warnings', $messages['warnings']); + Session::flash('successes', $messages['successes']); + Session::flash('errors', $messages['errors']); + if ($messages['errors']->count() > 0) { + Session::flash('error', 'Could not store budget: ' . $messages['errors']->first()); } + + // return to create screen: + if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) { + return Redirect::route('budgets.create')->withInput(); + } + + // store: + $this->_repository->store($data); + Session::flash('success', 'Budget "' . e($data['name']) . '" stored.'); + if ($data['post_submit_action'] == 'store') { + return Redirect::route('budgets.index'); + } + + // create another. + if ($data['post_submit_action'] == 'create_another') { + return Redirect::route('budgets.create')->withInput(); + } + + return Redirect::route('budgets.index'); } + /** * @param Budget $budget * - * @return $this - * @throws FireflyException + * @return $this|\Illuminate\Http\RedirectResponse */ public function update(Budget $budget) { - /** @var \FireflyIII\Database\Budget $repos */ - $repos = App::make('FireflyIII\Database\Budget'); - $data = Input::except('_token'); + $data = Input::except('_token'); - switch (Input::get('post_submit_action')) { - default: - throw new FireflyException('Cannot handle post_submit_action "' . e(Input::get('post_submit_action')) . '"'); - break; - case 'return_to_edit': - case 'update': - $messages = $repos->validate($data); - /** @var MessageBag $messages ['errors'] */ - if ($messages['errors']->count() > 0) { - Session::flash('warnings', $messages['warnings']); - Session::flash('successes', $messages['successes']); - Session::flash('error', 'Could not save budget: ' . $messages['errors']->first()); + // always validate: + $messages = $this->_repository->validate($data); - return Redirect::route('budgets.edit', $budget->id)->withInput()->withErrors($messages['errors']); - } - // store! - $repos->update($budget, $data); - Session::flash('success', 'Budget updated!'); - - if ($data['post_submit_action'] == 'return_to_edit') { - return Redirect::route('budgets.edit', $budget->id); - } else { - return Redirect::route('budgets.index'); - } - case 'validate_only': - $messageBags = $repos->validate($data); - Session::flash('warnings', $messageBags['warnings']); - Session::flash('successes', $messageBags['successes']); - Session::flash('errors', $messageBags['errors']); - - return Redirect::route('budgets.edit', $budget->id)->withInput(); - break; + // flash messages: + Session::flash('warnings', $messages['warnings']); + Session::flash('successes', $messages['successes']); + Session::flash('errors', $messages['errors']); + if ($messages['errors']->count() > 0) { + Session::flash('error', 'Could not update budget: ' . $messages['errors']->first()); } + + // return to update screen: + if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) { + return Redirect::route('budgets.edit', $budget->id)->withInput(); + } + + // update + $this->_repository->update($budget, $data); + Session::flash('success', 'Budget "' . e($data['name']) . '" updated.'); + + // go back to list + if ($data['post_submit_action'] == 'update') { + return Redirect::route('budgets.index'); + } + // go back to update screen. + if ($data['post_submit_action'] == 'return_to_edit') { + return Redirect::route('budgets.edit', $budget->id)->withInput(['post_submit_action' => 'return_to_edit']); + } + + return Redirect::route('budgets.index'); } /** @@ -297,11 +238,7 @@ class BudgetController extends BaseController */ public function updateIncome() { - $date = Session::get('start'); - /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */ - $preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface'); - $budgetAmount = $preferences->get('budgetIncomeTotal' . $date->format('FY'), 1000); - - return View::make('budgets.income')->with('amount', $budgetAmount)->with('date', $date); + $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start')->format('FY'), 1000); + return View::make('budgets.income')->with('amount', $budgetAmount); } -} \ No newline at end of file +} diff --git a/app/lib/FireflyIII/Database/Budget.php b/app/lib/FireflyIII/Database/Budget.php index 369dd15512..9f14598cbf 100644 --- a/app/lib/FireflyIII/Database/Budget.php +++ b/app/lib/FireflyIII/Database/Budget.php @@ -166,6 +166,40 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface throw new NotImplementedException; } + /** + * Returns all the transaction journals for a limit, possibly limited by a limit repetition. + * + * @param \Budget $budget + * @param \LimitRepetition $repetition + * @param int $take + * + * @return \Illuminate\Pagination\Paginator + */ + public function getJournals(\Budget $budget, \LimitRepetition $repetition = null, $take = 50) + { + $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $take : 0; + + + $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset)->orderBy('date', 'DESC'); + $countQuery = $budget->transactionJournals(); + + + if (!is_null($repetition)) { + $setQuery->before($repetition->startdate)->after($repetition->enddate); + $countQuery->before($repetition->startdate)->after($repetition->enddate); + } + + + $set = $setQuery->get(['transaction_journals.*']); + $count = $countQuery->count(); + $items = []; + foreach ($set as $entry) { + $items[] = $entry; + } + + return \Paginator::make($items, $count, $take); + } + public function getTransactionJournals(\Budget $budget, $limit = 50) { $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; @@ -265,11 +299,14 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface } /** + * This method updates the amount (envelope) for the given date and budget. This results in a (new) limit (aka an envelope) + * for that budget. Returned to the user is the new limit repetition. + * * @param \Budget $budget * @param Carbon $date * @param $amount * - * @return \Limit + * @return \LimitRepetition * @throws \Exception */ public function updateLimitAmount(\Budget $budget, Carbon $date, $amount) @@ -280,10 +317,10 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface // create one! $limit = new \Limit; $limit->budget()->associate($budget); - $limit->startdate = $date; - $limit->amount = $amount; + $limit->startdate = $date; + $limit->amount = $amount; $limit->repeat_freq = 'monthly'; - $limit->repeats = 0; + $limit->repeats = 0; $limit->save(); /* * A newly stored limit also created a limit repetition. @@ -302,7 +339,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface } } - return $limit; + return $limit->limitrepetitions()->first(); } diff --git a/app/views/budgets/income.blade.php b/app/views/budgets/income.blade.php index 4c6e3761df..d5b70c4f93 100644 --- a/app/views/budgets/income.blade.php +++ b/app/views/budgets/income.blade.php @@ -4,7 +4,7 @@
- +
diff --git a/app/views/budgets/index.blade.php b/app/views/budgets/index.blade.php index dbcdb2ff41..5d6acda60b 100644 --- a/app/views/budgets/index.blade.php +++ b/app/views/budgets/index.blade.php @@ -14,7 +14,7 @@
Income {{\Session::get('start')->format('F Y')}}: - {{mf($budgetAmount->data)}} + {{mf($amount)}}
@@ -59,7 +59,7 @@
- @if($budget->currentRep) + @if(isset($budget->currentRep)) {{{$budget->name}}} @else {{{$budget->name}}} @@ -99,10 +99,10 @@ Budgeted: - @if($budget->limit > $budget->spent) - € + @if($budget->currentRep->amount > $budget->spent) + € @else - € + € @endif @else From 136adbe72365c05a4cf084b01e073c2b5436d15b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 12 Dec 2014 07:42:38 +0100 Subject: [PATCH 05/92] Some cleanup and a small bug fix. --- app/controllers/BudgetController.php | 12 ++++++----- app/controllers/CategoryController.php | 29 +++++++++++++------------- app/lib/FireflyIII/Database/Budget.php | 4 ++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 467d0318c1..134e758e05 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -145,11 +145,12 @@ class BudgetController extends BaseController App::abort(500); } - $journals = $this->_repository->getJournals($budget, $repetition); - $limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit]; - $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); + $hideBudget = true; // used in transaction list. + $journals = $this->_repository->getJournals($budget, $repetition); + $limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit]; + $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); - return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle')); + return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget')); } /** @@ -181,7 +182,7 @@ class BudgetController extends BaseController if ($data['post_submit_action'] == 'store') { return Redirect::route('budgets.index'); } - + // create another. if ($data['post_submit_action'] == 'create_another') { return Redirect::route('budgets.create')->withInput(); @@ -239,6 +240,7 @@ class BudgetController extends BaseController public function updateIncome() { $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start')->format('FY'), 1000); + return View::make('budgets.income')->with('amount', $budgetAmount); } } diff --git a/app/controllers/CategoryController.php b/app/controllers/CategoryController.php index 2093aa54e0..b0effea7da 100644 --- a/app/controllers/CategoryController.php +++ b/app/controllers/CategoryController.php @@ -1,4 +1,5 @@ _repository = $repository; } /** @@ -41,11 +48,9 @@ class CategoryController extends BaseController */ public function destroy(Category $category) { - /** @var \FireflyIII\Database\Category $repos */ - $repos = App::make('FireflyIII\Database\Category'); + Session::flash('success', 'Category "' . e($category->name) . '" was deleted.'); + $this->_repository->destroy($category); - $repos->destroy($category); - Session::flash('success', 'The category was deleted.'); return Redirect::route('categories.index'); } @@ -65,9 +70,7 @@ class CategoryController extends BaseController */ public function index() { - /** @var \FireflyIII\Database\Category $repos */ - $repos = App::make('FireflyIII\Database\Category'); - $categories = $repos->get(); + $categories = $this->_repository->get(); return View::make('categories.index', compact('categories')); } @@ -79,12 +82,8 @@ class CategoryController extends BaseController */ public function show(Category $category) { - $hideCategory = true; - - /** @var \FireflyIII\Database\Category $repos */ - $repos = App::make('FireflyIII\Database\Category'); - - $journals = $repos->getTransactionJournals($category, 50); + $hideCategory = true; // used in list. + $journals = $this->_repository->getTransactionJournals($category, 50); return View::make('categories.show', compact('category', 'journals', 'hideCategory')); } diff --git a/app/lib/FireflyIII/Database/Budget.php b/app/lib/FireflyIII/Database/Budget.php index 9f14598cbf..5ed3b18e6d 100644 --- a/app/lib/FireflyIII/Database/Budget.php +++ b/app/lib/FireflyIII/Database/Budget.php @@ -185,8 +185,8 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface if (!is_null($repetition)) { - $setQuery->before($repetition->startdate)->after($repetition->enddate); - $countQuery->before($repetition->startdate)->after($repetition->enddate); + $setQuery->after($repetition->startdate)->before($repetition->enddate); + $countQuery->after($repetition->startdate)->before($repetition->enddate); } From 7350b1da1b0f2407f80aa05da31620ade716d02d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 12 Dec 2014 16:22:16 +0100 Subject: [PATCH 06/92] Cleanup and added todo's --- app/controllers/BudgetController.php | 4 + app/controllers/CategoryController.php | 132 ++++++++++++------------- 2 files changed, 66 insertions(+), 70 deletions(-) diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 134e758e05..62c2bb1372 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -6,6 +6,10 @@ use FireflyIII\Shared\Preferences\PreferencesInterface as Pref; /** * Class BudgetController * + * TODO move AJAX methods to their own BudgetAjaxControlle + * TODO Find out what constitutes proper camelCase + * TODO How is object coupling counted? + * * @SuppressWarnings("CamelCase") * @SuppressWarnings("TooManyMethods") * @SuppressWarnings("CouplingBetweenObjects") diff --git a/app/controllers/CategoryController.php b/app/controllers/CategoryController.php index b0effea7da..a00e2d7421 100644 --- a/app/controllers/CategoryController.php +++ b/app/controllers/CategoryController.php @@ -1,9 +1,13 @@ validate($data); - /** @var MessageBag $messages ['errors'] */ - if ($messages['errors']->count() > 0) { - Session::flash('warnings', $messages['warnings']); - Session::flash('successes', $messages['successes']); - Session::flash('error', 'Could not save category: ' . $messages['errors']->first()); + // always validate: + $messages = $this->_repository->validate($data); - return Redirect::route('categories.create')->withInput()->withErrors($messages['errors']); - } - // store! - $repos->store($data); - Session::flash('success', 'New category stored!'); - - if ($data['post_submit_action'] == 'create_another') { - return Redirect::route('categories.create')->withInput(); - } else { - return Redirect::route('categories.index'); - } - break; - case 'validate_only': - $messageBags = $repos->validate($data); - Session::flash('warnings', $messageBags['warnings']); - Session::flash('successes', $messageBags['successes']); - Session::flash('errors', $messageBags['errors']); - - return Redirect::route('categories.create')->withInput(); - break; + // flash messages: + Session::flash('warnings', $messages['warnings']); + Session::flash('successes', $messages['successes']); + Session::flash('errors', $messages['errors']); + if ($messages['errors']->count() > 0) { + Session::flash('error', 'Could not store category: ' . $messages['errors']->first()); } + + // return to create screen: + if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) { + return Redirect::route('categories.create')->withInput(); + } + + // store: + $this->_repository->store($data); + Session::flash('success', 'Category "' . e($data['name']) . '" stored.'); + if ($data['post_submit_action'] == 'store') { + return Redirect::route('categories.index'); + } + + // create another. + if ($data['post_submit_action'] == 'create_another') { + return Redirect::route('categories.create')->withInput(); + } + + return Redirect::route('categories.index'); } /** @@ -142,44 +139,39 @@ class CategoryController extends BaseController */ public function update(Category $category) { - /** @var \FireflyIII\Database\Category $repos */ - $repos = App::make('FireflyIII\Database\Category'); - $data = Input::except('_token'); + $data = Input::except('_token'); - switch (Input::get('post_submit_action')) { - default: - throw new FireflyException('Cannot handle post_submit_action "' . e(Input::get('post_submit_action')) . '"'); - break; - case 'return_to_edit': - case 'update': - $messages = $repos->validate($data); - /** @var MessageBag $messages ['errors'] */ - if ($messages['errors']->count() > 0) { - Session::flash('warnings', $messages['warnings']); - Session::flash('successes', $messages['successes']); - Session::flash('error', 'Could not save category: ' . $messages['errors']->first()); + // always validate: + $messages = $this->_repository->validate($data); - return Redirect::route('categories.edit', $category->id)->withInput()->withErrors($messages['errors']); - } - // store! - $repos->update($category, $data); - Session::flash('success', 'Category updated!'); - - if ($data['post_submit_action'] == 'return_to_edit') { - return Redirect::route('categories.edit', $category->id); - } else { - return Redirect::route('categories.index'); - } - case 'validate_only': - $messageBags = $repos->validate($data); - Session::flash('warnings', $messageBags['warnings']); - Session::flash('successes', $messageBags['successes']); - Session::flash('errors', $messageBags['errors']); - - return Redirect::route('categories.edit', $category->id)->withInput(); - break; + // flash messages: + Session::flash('warnings', $messages['warnings']); + Session::flash('successes', $messages['successes']); + Session::flash('errors', $messages['errors']); + if ($messages['errors']->count() > 0) { + Session::flash('error', 'Could not update category: ' . $messages['errors']->first()); } + // return to update screen: + if ($data['post_submit_action'] == 'validate_only' || $messages['errors']->count() > 0) { + return Redirect::route('categories.edit', $category->id)->withInput(); + } + + // update + $this->_repository->update($category, $data); + Session::flash('success', 'Category "' . e($data['name']) . '" updated.'); + + // go back to list + if ($data['post_submit_action'] == 'update') { + return Redirect::route('categories.index'); + } + // go back to update screen. + if ($data['post_submit_action'] == 'return_to_edit') { + return Redirect::route('categories.edit', $category->id)->withInput(['post_submit_action' => 'return_to_edit']); + } + + return Redirect::route('categories.index'); + } From 7af55b7268c3504c43426667ccfa1ae3090c6ea4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 09:36:30 +0100 Subject: [PATCH 07/92] Updated some tests, fixed some bugs. --- .gitignore | 1 + app/controllers/GoogleChartController.php | 67 ++++++------- app/database/seeds/TestContentSeeder.php | 4 + app/views/accounts/delete.blade.php | 13 +-- composer.json | 2 +- composer.lock | 25 +++-- tests/_bootstrap.php | 18 +++- tests/functional/AccountControllerCest.php | 106 +++++++++++++++++++++ tests/functional/UserControllerCest.php | 23 ++++- 9 files changed, 193 insertions(+), 66 deletions(-) create mode 100644 tests/functional/AccountControllerCest.php diff --git a/.gitignore b/.gitignore index 7a425f757c..a76c7d4966 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ tests/_output/* testing.sqlite c3.php _ide_helper_models.php +clean.sqlite diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 0eb2b58396..29b6dd02cb 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -1,5 +1,6 @@ _chart = $chart; + + } + /** * @param Account $account * @param string $view @@ -15,55 +28,35 @@ class GoogleChartController extends BaseController */ public function accountBalanceChart(Account $account, $view = 'session') { - /** @var \Grumpydictator\Gchart\GChart $chart */ - $chart = App::make('gchart'); + $this->_chart->addColumn('Day of month', 'date'); + $this->_chart->addColumn('Balance for ' . $account->name, 'number'); - $chart->addColumn('Day of month', 'date'); - $chart->addColumn('Balance for ' . $account->name, 'number'); + $start = Session::get('start'); + $end = Session::get('end'); + $count = $account->transactions()->count(); - /* - * Loop the date, then loop the accounts, then add balance. - */ - switch ($view) { - default: - case 'session': - $start = Session::get('start'); - $end = Session::get('end'); - break; - case 'all': - $first = $account->transactionjournals()->orderBy('date', 'DESC')->first(); - $last = $account->transactionjournals()->orderBy('date', 'ASC')->first(); - if (is_null($first)) { - $start = Session::get('start'); - } else { - $start = clone $first->date; - } - if (is_null($last)) { - $end = Session::get('end'); - } else { - $end = clone $last->date; - } - break; + if ($view == 'all' && $count > 0) { + $first = $account->transactions()->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->orderBy( + 'date', 'ASC' + )->first(['transaction_journals.date']); + $last = $account->transactions()->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->orderBy( + 'date', 'DESC' + )->first(['transaction_journals.date']); + $start = new Carbon($first->date); + $end = new Carbon($last->date); } $current = clone $start; while ($end >= $current) { - $row = [clone $current]; - if ($current > Carbon::now()) { - $row[] = null; - } else { - $row[] = Steam::balance($account, $current); - } - - $chart->addRowArray($row); + $this->_chart->addRow(clone $current, $current > Carbon::now() ? null : Steam::balance($account, $current)); $current->addDay(); } - $chart->generate(); + $this->_chart->generate(); - return Response::json($chart->getData()); + return Response::json($this->_chart->getData()); } /** diff --git a/app/database/seeds/TestContentSeeder.php b/app/database/seeds/TestContentSeeder.php index 202b8ebd11..dfaf035df3 100644 --- a/app/database/seeds/TestContentSeeder.php +++ b/app/database/seeds/TestContentSeeder.php @@ -2,6 +2,9 @@ use Carbon\Carbon; +/** + * Class TestContentSeeder + */ class TestContentSeeder extends Seeder { @@ -27,6 +30,7 @@ class TestContentSeeder extends Seeder // create two asset accounts. $checking = Account::create(['user_id' => $user->id, 'account_type_id' => $assetType->id, 'name' => 'Checking account', 'active' => 1]); $savings = Account::create(['user_id' => $user->id, 'account_type_id' => $assetType->id, 'name' => 'Savings account', 'active' => 1]); + $deleteMe = Account::create(['user_id' => $user->id, 'account_type_id' => $assetType->id, 'name' => 'Delete me', 'active' => 1]); // create two budgets: $groceriesBudget = Budget::create(['user_id' => $user->id, 'name' => 'Groceries']); diff --git a/app/views/accounts/delete.blade.php b/app/views/accounts/delete.blade.php index 5140108559..0f60d5298d 100644 --- a/app/views/accounts/delete.blade.php +++ b/app/views/accounts/delete.blade.php @@ -1,7 +1,7 @@ @extends('layouts.default') @section('content') {{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $account) }} -{{Form::open(['class' => 'form-horizontal','url' => route('accounts.destroy',$account->id)])}} +{{Form::open(['class' => 'form-horizontal','id' => 'destroy','url' => route('accounts.destroy',$account->id)])}}
@@ -29,16 +29,5 @@
-
-
-
-
- -
-
-
-
- - {{Form::close()}} @stop \ No newline at end of file diff --git a/composer.json b/composer.json index acd8fe328a..7b3fad61ff 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require": { "laravel/framework": "4.2.*", "davejamesmiller/laravel-breadcrumbs": "2.*", - "grumpydictator/gchart": "dev-master", + "grumpydictator/gchart": "1.*", "michelf/php-markdown": "1.*", "watson/validating": "0.10.*" }, diff --git a/composer.lock b/composer.lock index b05ef34b6b..0b40a3d726 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "248937553255d85014e6ec3b32115848", + "hash": "4149e5d1a8b58787b3e9f68fc8cf40b9", "packages": [ { "name": "classpreloader/classpreloader", @@ -195,7 +195,7 @@ }, { "name": "grumpydictator/gchart", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/JC5/gchart.git", @@ -324,16 +324,16 @@ }, { "name": "laravel/framework", - "version": "v4.2.11", + "version": "v4.2.12", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e29253c7f29e3b1ca716de7fe309b272e3ddf47d" + "reference": "70a60f2ff9b96b3fcd88a68ef5382557733fe671" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e29253c7f29e3b1ca716de7fe309b272e3ddf47d", - "reference": "e29253c7f29e3b1ca716de7fe309b272e3ddf47d", + "url": "https://api.github.com/repos/laravel/framework/zipball/70a60f2ff9b96b3fcd88a68ef5382557733fe671", + "reference": "70a60f2ff9b96b3fcd88a68ef5382557733fe671", "shasum": "" }, "require": { @@ -435,7 +435,7 @@ "framework", "laravel" ], - "time": "2014-10-04 18:48:27" + "time": "2014-12-11 17:14:36" }, { "name": "michelf/php-markdown", @@ -2828,16 +2828,16 @@ }, { "name": "guzzlehttp/ringphp", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/guzzle/RingPHP.git", - "reference": "9187999f80720b9494692d2167d75144acb2ad05" + "reference": "a903f51b692427318bc813217c0e6505287e79a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/9187999f80720b9494692d2167d75144acb2ad05", - "reference": "9187999f80720b9494692d2167d75144acb2ad05", + "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/a903f51b692427318bc813217c0e6505287e79a4", + "reference": "a903f51b692427318bc813217c0e6505287e79a4", "shasum": "" }, "require": { @@ -2874,7 +2874,7 @@ "homepage": "https://github.com/mtdowling" } ], - "time": "2014-12-02 05:01:22" + "time": "2014-12-11 05:50:32" }, { "name": "guzzlehttp/streams", @@ -4162,7 +4162,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "grumpydictator/gchart": 20, "barryvdh/laravel-debugbar": 0, "barryvdh/laravel-ide-helper": 0, "satooshi/php-coveralls": 20, diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index 14f1eda6e0..114e9e4b81 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -1,8 +1,24 @@ amLoggedAs(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james']); + + Session::put('start', new Carbon); + Session::put('end', new Carbon); + + + } + + /** + * @param FunctionalTester $I + */ + public function create(FunctionalTester $I) + { + // @codingStandardsIgnoreStart + $I->wantTo('create a new asset account'); + $I->amOnPage('/accounts/create/asset'); + $I->see('Create a new asset account'); + } + + /** + * @param FunctionalTester $I + */ + public function delete(FunctionalTester $I) + { + $I->wantTo('delete an asset account'); + $I->amOnPage('/accounts/delete/3'); + $I->see('Delete account "Delete me"'); + } + + /** + * @param FunctionalTester $I + */ + public function destroy(FunctionalTester $I) + { + $I->wantTo('destroy an asset account'); + } + + /** + * @param FunctionalTester $I + */ + public function edit(FunctionalTester $I) + { + $I->wantTo('delete an asset account'); + $I->amOnPage('/accounts/edit/3'); + $I->see('Edit asset account "Delete me"'); + } + + /** + * @param FunctionalTester $I + */ + public function index(FunctionalTester $I) + { + $I->wantTo('see a list of accounts'); + $I->amOnPage('/accounts/asset'); + $I->see('Checking account'); + $I->see('Delete me'); + } + + /** + * @param FunctionalTester $I + */ + public function show(FunctionalTester $I) + { + $I->wantTo('see one account'); + #$I->amOnPage('/accounts/show/3'); + #$I->see('Details for'); + #$I->see('Delete me'); + } + + /** + * @param FunctionalTester $I + */ + public function store(FunctionalTester $I) + { + $I->wantTo('store a new asset account'); + } + + /** + * @param FunctionalTester $I + */ + public function update(FunctionalTester $I) + { + $I->wantTo('update an asset account'); + } + +} \ No newline at end of file diff --git a/tests/functional/UserControllerCest.php b/tests/functional/UserControllerCest.php index ce7340c404..06050c1bb6 100644 --- a/tests/functional/UserControllerCest.php +++ b/tests/functional/UserControllerCest.php @@ -1,5 +1,11 @@ wantTo('login'); $I->amOnPage('/login'); $I->see('Sign In'); - $I->submitForm('#login', ['email' => 'functional@example.com','password' => 'functional']); + $I->submitForm('#login', ['email' => 'functional@example.com', 'password' => 'functional']); $I->see('functional@example.com'); } + /** + * @param FunctionalTester $I + */ + public function loginFails(FunctionalTester $I) + { + $I->wantTo('fail the login'); + $I->amOnPage('/login'); + $I->see('Sign In'); + $I->submitForm('#login', ['email' => 'functional@example.com', 'password' => 'wrong']); + $I->see('No good'); + + } + /** * @param FunctionalTester $I */ @@ -57,7 +76,7 @@ class UserControllerCest $I->wantTo('post-register a new account'); $I->amOnPage('/register'); $token = $I->grabValueFrom('input[name=_token]'); - $I->submitForm('#register', ['email' => 'noreply@gmail.com','_token' => $token]); + $I->submitForm('#register', ['email' => 'noreply@gmail.com', '_token' => $token]); $I->see('Password sent!'); $I->seeRecord('users', ['email' => 'noreply@gmail.com']); // @codingStandardsIgnoreEnd From e51c2d10f04d42d3d899caccc2c10541e3cad410 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 09:39:11 +0100 Subject: [PATCH 08/92] Generate coverage. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 835ec484b9..78c8d01c39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - composer install script: - - php vendor/bin/codecept run + - php vendor/bin/codecept run --coverage-xml after_script: - php vendor/bin/coveralls \ No newline at end of file From c0a524c8a3414511f2791465e164964bc9d0f714 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 09:51:19 +0100 Subject: [PATCH 09/92] Add debug info. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 78c8d01c39..b98ddd14ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - composer install script: - - php vendor/bin/codecept run --coverage-xml + - php vendor/bin/codecept run --coverage-xml -vvv after_script: - php vendor/bin/coveralls \ No newline at end of file From 55740c0d97c800fa69a25ce2e01ea951fab0a5f7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 09:54:32 +0100 Subject: [PATCH 10/92] Add c3.php to repository. --- .gitignore | 4 +- c3.php | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 c3.php diff --git a/.gitignore b/.gitignore index a76c7d4966..6c48663ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,7 @@ index.html* app/storage/firefly-export* .vagrant firefly-iii-import-*.json - tests/_output/* testing.sqlite -c3.php _ide_helper_models.php -clean.sqlite +clean.sqlite \ No newline at end of file diff --git a/c3.php b/c3.php new file mode 100644 index 0000000000..7f77e7cde2 --- /dev/null +++ b/c3.php @@ -0,0 +1,240 @@ + $value) { + $_SERVER["HTTP_X_CODECEPTION_".strtoupper($key)] = $value; + } + } +} + +if (!array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE', $_SERVER)) { + return; +} + +if (!function_exists('__c3_error')) { + function __c3_error($message) + { + file_put_contents(C3_CODECOVERAGE_MEDIATE_STORAGE . DIRECTORY_SEPARATOR . 'error.txt', $message); + if (!headers_sent()) { + header('X-Codeception-CodeCoverage-Error: ' . str_replace("\n", ' ', $message), true, 500); + } + setcookie('CODECEPTION_CODECOVERAGE_ERROR', $message); + } +} + +// Autoload Codeception classes +if (!class_exists('\\Codeception\\Codecept')) { + if (stream_resolve_include_path(__DIR__ . '/vendor/autoload.php')) { + require_once __DIR__ . '/vendor/autoload.php'; + } elseif (file_exists(__DIR__ . '/codecept.phar')) { + require_once 'phar://'.__DIR__ . '/codecept.phar/autoload.php'; + } elseif (stream_resolve_include_path('Codeception/autoload.php')) { + require_once 'Codeception/autoload.php'; + } else { + __c3_error('Codeception is not loaded. Please check that either PHAR or Composer or PEAR package can be used'); + } +} + +// Load Codeception Config +$config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . 'codeception.yml'; +if (array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG', $_SERVER)) { + $config_file = realpath(__DIR__) . DIRECTORY_SEPARATOR . $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG']; +} +if (!file_exists($config_file)) { + __c3_error(sprintf("Codeception config file '%s' not found", $config_file)); +} +try { + \Codeception\Configuration::config($config_file); +} catch (\Exception $e) { + __c3_error($e->getMessage()); +} + +if (!defined('C3_CODECOVERAGE_MEDIATE_STORAGE')) { + + // workaround for 'zend_mm_heap corrupted' problem + gc_disable(); + + if ((integer)ini_get('memory_limit') < 384) { + ini_set('memory_limit', '384M'); + } + + define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::logDir() . 'c3tmp'); + define('C3_CODECOVERAGE_PROJECT_ROOT', Codeception\Configuration::projectDir()); + define('C3_CODECOVERAGE_TESTNAME', $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE']); + + function __c3_build_html_report(PHP_CodeCoverage $codeCoverage, $path) + { + $writer = new PHP_CodeCoverage_Report_HTML(); + $writer->process($codeCoverage, $path . 'html'); + + if (file_exists($path . '.tar')) { + unlink($path . '.tar'); + } + + $phar = new PharData($path . '.tar'); + $phar->setSignatureAlgorithm(Phar::SHA1); + $files = $phar->buildFromDirectory($path . 'html'); + array_map('unlink', $files); + + if (in_array('GZ', Phar::getSupportedCompression())) { + if (file_exists($path . '.tar.gz')) { + unlink($path . '.tar.gz'); + } + + $phar->compress(\Phar::GZ); + + // close the file so that we can rename it + unset($phar); + + unlink($path . '.tar'); + rename($path . '.tar.gz', $path . '.tar'); + } + + return $path . '.tar'; + } + + function __c3_build_clover_report(PHP_CodeCoverage $codeCoverage, $path) + { + $writer = new PHP_CodeCoverage_Report_Clover(); + $writer->process($codeCoverage, $path . '.clover.xml'); + + return $path . '.clover.xml'; + } + + function __c3_send_file($filename) + { + if (!headers_sent()) { + readfile($filename); + } + + return __c3_exit(); + } + + /** + * @param $filename + * @return null|PHP_CodeCoverage + */ + function __c3_factory($filename) + { + $phpCoverage = is_readable($filename) + ? unserialize(file_get_contents($filename)) + : new PHP_CodeCoverage(); + + + if (isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_SUITE'])) { + $suite = $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_SUITE']; + try { + $settings = \Codeception\Configuration::suiteSettings($suite, \Codeception\Configuration::config()); + } catch (Exception $e) { + __c3_error($e->getMessage()); + } + } else { + $settings = \Codeception\Configuration::config(); + } + + try { + \Codeception\Coverage\Filter::setup($phpCoverage) + ->whiteList($settings) + ->blackList($settings); + } catch (Exception $e) { + __c3_error($e->getMessage()); + } + + return $phpCoverage; + } + + function __c3_exit() + { + if (!isset($_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE_DEBUG'])) { + exit; + } + return null; + } + + function __c3_clear() + { + \Codeception\Util\FileSystem::doEmptyDir(C3_CODECOVERAGE_MEDIATE_STORAGE); + } +} + +if (!is_dir(C3_CODECOVERAGE_MEDIATE_STORAGE)) { + if (mkdir(C3_CODECOVERAGE_MEDIATE_STORAGE, 0777, true) === false) { + __c3_error('Failed to create directory "' . C3_CODECOVERAGE_MEDIATE_STORAGE . '"'); + } +} + +// evaluate base path for c3-related files +$path = realpath(C3_CODECOVERAGE_MEDIATE_STORAGE) . DIRECTORY_SEPARATOR . 'codecoverage'; + +$requested_c3_report = (strpos($_SERVER['REQUEST_URI'], 'c3/report') !== false); + +$complete_report = $current_report = $path . '.serialized'; +if ($requested_c3_report) { + set_time_limit(0); + + $route = ltrim(strrchr($_SERVER['REQUEST_URI'], '/'), '/'); + + if ($route == 'clear') { + __c3_clear(); + return __c3_exit(); + } + + $codeCoverage = __c3_factory($complete_report); + + switch ($route) { + case 'html': + try { + __c3_send_file(__c3_build_html_report($codeCoverage, $path)); + } catch (Exception $e) { + __c3_error($e->getMessage()); + } + return __c3_exit(); + case 'clover': + try { + __c3_send_file(__c3_build_clover_report($codeCoverage, $path)); + } catch (Exception $e) { + __c3_error($e->getMessage()); + } + return __c3_exit(); + case 'serialized': + try { + __c3_send_file($complete_report); + } catch (Exception $e) { + __c3_error($e->getMessage()); + } + return __c3_exit(); + } + +} else { + $codeCoverage = __c3_factory($current_report); + $codeCoverage->start(C3_CODECOVERAGE_TESTNAME); + if (!array_key_exists('HTTP_X_CODECEPTION_CODECOVERAGE_DEBUG', $_SERVER)) { + register_shutdown_function( + function () use ($codeCoverage, $current_report) { + $codeCoverage->stop(); + file_put_contents($current_report, serialize($codeCoverage)); + } + ); + } +} + +// @codeCoverageIgnoreEnd \ No newline at end of file From d3cda8811dad8452a0b6879cc074778f807fc09e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 13:07:12 +0100 Subject: [PATCH 11/92] Added some new tests. --- tests/functional/AccountControllerCest.php | 13 +-- tests/functional/BudgetControllerCest.php | 119 ++++++++++++++++++++ tests/functional/CategoryControllerCest.php | 96 ++++++++++++++++ 3 files changed, 221 insertions(+), 7 deletions(-) create mode 100644 tests/functional/BudgetControllerCest.php create mode 100644 tests/functional/CategoryControllerCest.php diff --git a/tests/functional/AccountControllerCest.php b/tests/functional/AccountControllerCest.php index 704bcf51fb..5cdd1111ae 100644 --- a/tests/functional/AccountControllerCest.php +++ b/tests/functional/AccountControllerCest.php @@ -2,6 +2,9 @@ use Carbon\Carbon; /** + * @SuppressWarnings("CamelCase") + * @SuppressWarnings("short") + * * Class AccountControllerCest */ class AccountControllerCest @@ -20,10 +23,6 @@ class AccountControllerCest { $I->amLoggedAs(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james']); - Session::put('start', new Carbon); - Session::put('end', new Carbon); - - } /** @@ -82,9 +81,9 @@ class AccountControllerCest public function show(FunctionalTester $I) { $I->wantTo('see one account'); - #$I->amOnPage('/accounts/show/3'); - #$I->see('Details for'); - #$I->see('Delete me'); + $I->amOnPage('/accounts/show/3'); + $I->see('Details for'); + $I->see('Delete me'); } /** diff --git a/tests/functional/BudgetControllerCest.php b/tests/functional/BudgetControllerCest.php new file mode 100644 index 0000000000..bb1f886f6d --- /dev/null +++ b/tests/functional/BudgetControllerCest.php @@ -0,0 +1,119 @@ +amLoggedAs(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james']); + } + + /** + * @param FunctionalTester $I + */ + public function amount(FunctionalTester $I) + { + $I->wantTo('update the amount for a budget and limit repetition'); + $I->amOnPage('/budgets/income'); + } + + /** + * @param FunctionalTester $I + */ + public function create(FunctionalTester $I) + { + $I->wantTo('create a budget'); + $I->amOnRoute('budgets.create'); + } + + /** + * @param FunctionalTester $I + */ + public function delete(FunctionalTester $I) + { + $I->wantTo('delete a budget'); + $I->amOnPage('/budgets/delete/1'); + } + + /** + * @param FunctionalTester $I + */ + public function destroy(FunctionalTester $I) + { + $I->wantTo('destroy a budget'); + } + + /** + * @param FunctionalTester $I + */ + public function edit(FunctionalTester $I) + { + $I->wantTo('edit a budget'); + $I->amOnPage('/budgets/edit/1'); + } + + /** + * @param FunctionalTester $I + */ + public function index(FunctionalTester $I) + { + $I->wantTo('show all budgets'); + $I->amOnPage('/budgets'); + } + + /** + * @param FunctionalTester $I + */ + public function postUpdateIncome(FunctionalTester $I) + { + $I->wantTo('process the update to my monthly income'); + } + + /** + * @param FunctionalTester $I + */ + public function show(FunctionalTester $I) + { + $I->wantTo('show a budget'); + $I->amOnPage('/budgets/show/1'); + } + + /** + * @param FunctionalTester $I + */ + public function store(FunctionalTester $I) + { + $I->wantTo('store a budget'); + } + + /** + * @param FunctionalTester $I + */ + public function update(FunctionalTester $I) + { + $I->wantTo('update a budget'); + } + + /** + * @param FunctionalTester $I + */ + public function updateIncome(FunctionalTester $I) + { + $I->wantTo('update my monthly income'); + } +} \ No newline at end of file diff --git a/tests/functional/CategoryControllerCest.php b/tests/functional/CategoryControllerCest.php new file mode 100644 index 0000000000..b0e9ceab87 --- /dev/null +++ b/tests/functional/CategoryControllerCest.php @@ -0,0 +1,96 @@ +amLoggedAs(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james']); + } + + /** + * @param FunctionalTester $I + */ + public function create(FunctionalTester $I) + { + $I->wantTo('create a new category'); + $I->amOnPage('/categories/create'); + } + + /** + * @param FunctionalTester $I + */ + public function delete(FunctionalTester $I) + { + $I->wantTo('delete a category'); + $I->amOnPage('/categories/delete/1'); + } + + /** + * @param FunctionalTester $I + */ + public function destroy(FunctionalTester $I) + { + $I->wantTo('destroy a category'); + + } + + /** + * @param FunctionalTester $I + */ + public function edit(FunctionalTester $I) + { + $I->wantTo('edit a category'); + $I->amOnPage('/categories/edit/1'); + } + + /** + * @param FunctionalTester $I + */ + public function index(FunctionalTester $I) + { + $I->wantTo('show all categories'); + $I->amOnPage('/categories'); + } + + /** + * @param FunctionalTester $I + */ + public function show(FunctionalTester $I) + { + $I->wantTo('show a category'); + $I->amOnPage('/categories/delete/1'); + } + + /** + * @param FunctionalTester $I + */ + public function store(FunctionalTester $I) + { + $I->wantTo('store a category'); + } + + /** + * @param FunctionalTester $I + */ + public function update(FunctionalTester $I) + { + $I->wantTo('update a category'); + } + +} \ No newline at end of file From 9ab0a83f7cca6887a579a4e176076c868b2167d6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 13:07:32 +0100 Subject: [PATCH 12/92] Default value for when session is empty. --- app/controllers/BudgetController.php | 15 ++++++++------- app/controllers/GoogleChartController.php | 20 ++++++++++---------- app/controllers/HomeController.php | 5 +++-- app/database/seeds/TestContentSeeder.php | 2 +- app/lib/FireflyIII/Database/Account.php | 4 ++-- app/views/budgets/income.blade.php | 2 +- app/views/budgets/index.blade.php | 4 ++-- app/views/budgets/show.blade.php | 2 +- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 62c2bb1372..1a90a92afd 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -1,5 +1,6 @@ startOfMonth()); $limitRepetition = $this->_repository->updateLimitAmount($budget, $date, $amount); return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition->id]); @@ -111,16 +112,16 @@ class BudgetController extends BaseController $budgets->each( function (Budget $budget) { /** @noinspection PhpUndefinedFieldInspection */ - $budget->spent = $this->_repository->spentInMonth($budget, \Session::get('start')); + $budget->spent = $this->_repository->spentInMonth($budget, \Session::get('start',Carbon::now()->startOfMonth())); /** @noinspection PhpUndefinedFieldInspection */ - $budget->currentRep = $budget->limitrepetitions()->where('limit_repetitions.startdate', \Session::get('start')->format('Y-m-d'))->first( + $budget->currentRep = $budget->limitrepetitions()->where('limit_repetitions.startdate', \Session::get('start',Carbon::now()->startOfMonth())->format('Y-m-d'))->first( ['limit_repetitions.*'] ); } ); $spent = $budgets->sum('spent'); - $amount = $this->_preferences->get('budgetIncomeTotal' . \Session::get('start')->format('FY'), 1000)->data; + $amount = $this->_preferences->get('budgetIncomeTotal' . \Session::get('start',Carbon::now()->startOfMonth())->format('FY'), 1000)->data; $overspent = $spent > $amount; $spentPCT = $overspent ? ceil($amount / $spent * 100) : ceil($spent / $amount * 100); @@ -132,7 +133,7 @@ class BudgetController extends BaseController */ public function postUpdateIncome() { - $this->_preferences->set('budgetIncomeTotal' . Session::get('start')->format('FY'), intval(Input::get('amount'))); + $this->_preferences->set('budgetIncomeTotal' . Session::get('start',Carbon::now()->startOfMonth())->format('FY'), intval(Input::get('amount'))); return Redirect::route('budgets.index'); } @@ -151,7 +152,7 @@ class BudgetController extends BaseController $hideBudget = true; // used in transaction list. $journals = $this->_repository->getJournals($budget, $repetition); - $limits = $repetition ? $budget->limits()->orderBy('startdate', 'DESC')->get() : [$repetition->limit]; + $limits = $repetition ? [$repetition->limit] : $budget->limits()->orderBy('startdate', 'DESC')->get(); $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget')); @@ -243,7 +244,7 @@ class BudgetController extends BaseController */ public function updateIncome() { - $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start')->format('FY'), 1000); + $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start',Carbon::now()->startOfMonth())->format('FY'), 1000); return View::make('budgets.income')->with('amount', $budgetAmount); } diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 29b6dd02cb..16ab897861 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -31,7 +31,7 @@ class GoogleChartController extends BaseController $this->_chart->addColumn('Day of month', 'date'); $this->_chart->addColumn('Balance for ' . $account->name, 'number'); - $start = Session::get('start'); + $start = Session::get('start',Carbon::now()->startOfMonth()); $end = Session::get('end'); $count = $account->transactions()->count(); @@ -79,14 +79,14 @@ class GoogleChartController extends BaseController switch ($view) { default: case 'session': - $start = Session::get('start'); + $start = Session::get('start',Carbon::now()->startOfMonth()); $end = Session::get('end'); break; case 'all': $first = $account->transactionjournals()->orderBy('date', 'DESC')->first(); $last = $account->transactionjournals()->orderBy('date', 'ASC')->first(); if (is_null($first)) { - $start = Session::get('start'); + $start = Session::get('start',Carbon::now()->startOfMonth()); } else { $start = clone $first->date; } @@ -161,7 +161,7 @@ class GoogleChartController extends BaseController ['transactionjournal', 'transactionjournal.transactions', 'transactionjournal.budgets', 'transactionjournal.transactiontype', 'transactionjournal.categories'] )->before(Session::get('end'))->after( - Session::get('start') + Session::get('start',Carbon::now()->startOfMonth()) )->get(); /** @var Transaction $transaction */ @@ -235,7 +235,7 @@ class GoogleChartController extends BaseController /* * Loop the date, then loop the accounts, then add balance. */ - $start = Session::get('start'); + $start = Session::get('start',Carbon::now()->startOfMonth()); $end = Session::get('end'); $current = clone $start; @@ -281,14 +281,14 @@ class GoogleChartController extends BaseController * Is there a repetition starting on this particular date? We can use that. */ /** @var \LimitRepetition $repetition */ - $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start')); + $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start',Carbon::now()->startOfMonth())); /* * If there is, use it. Otherwise, forget it. */ if (is_null($repetition)) { // use the session start and end for our search query - $searchStart = Session::get('start'); + $searchStart = Session::get('start',Carbon::now()->startOfMonth()); $searchEnd = Session::get('end'); // the limit is zero: $limit = 0; @@ -315,7 +315,7 @@ class GoogleChartController extends BaseController * Finally, get all transactions WITHOUT a budget and add those as well. * (yes this method is oddly specific). */ - $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start'), Session::get('end')); + $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start',Carbon::now()->startOfMonth()), Session::get('end')); $sum = $noBudgetSet->sum('amount') * -1; $chart->addRow('No budget', 0, $sum); @@ -343,7 +343,7 @@ class GoogleChartController extends BaseController /* * Get the journals: */ - $journals = $tj->getInDateRange(Session::get('start'), Session::get('end')); + $journals = $tj->getInDateRange(Session::get('start',Carbon::now()->startOfMonth()), Session::get('end')); /** @var \TransactionJournal $journal */ foreach ($journals as $journal) { @@ -627,7 +627,7 @@ class GoogleChartController extends BaseController /* * In the current session range? */ - if (\Session::get('end') >= $current and $currentEnd >= \Session::get('start')) { + if (\Session::get('end') >= $current and $currentEnd >= \Session::get('start',Carbon::now()->startOfMonth())) { /* * Lets see if we've already spent money on this recurring transaction (it hath recurred). */ diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 9617608efc..217068e007 100644 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -1,4 +1,5 @@ countAssetAccounts(); - $start = Session::get('start'); - $end = Session::get('end'); + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); // get the preference for the home accounts to show: diff --git a/app/database/seeds/TestContentSeeder.php b/app/database/seeds/TestContentSeeder.php index dfaf035df3..70154a8072 100644 --- a/app/database/seeds/TestContentSeeder.php +++ b/app/database/seeds/TestContentSeeder.php @@ -37,7 +37,7 @@ class TestContentSeeder extends Seeder $billsBudget = Budget::create(['user_id' => $user->id, 'name' => 'Bills']); // create two categories: - $dailyGroceries = Category::create(['user_id' => $user->id, 'name' => 'Daily groceries']); + $dailyGroceries = Category::create(['user_id' => $user->id, 'name' => 'DailyGroceries']); $lunch = Category::create(['user_id' => $user->id, 'name' => 'Lunch']); $house = Category::create(['user_id' => $user->id, 'name' => 'House']); diff --git a/app/lib/FireflyIII/Database/Account.php b/app/lib/FireflyIII/Database/Account.php index 3e26eb3aaf..5ccd858ec3 100644 --- a/app/lib/FireflyIII/Database/Account.php +++ b/app/lib/FireflyIII/Database/Account.php @@ -580,8 +580,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface ->orderBy('date', 'DESC'); if ($range == 'session') { - $query->before(\Session::get('end')); - $query->after(\Session::get('start')); + $query->before(\Session::get('end', \Carbon\Carbon::now()->startOfMonth())); + $query->after(\Session::get('start', \Carbon\Carbon::now()->startOfMonth())); } $count = $query->count(); $set = $query->take($limit)->offset($offset)->get(['transaction_journals.*']); diff --git a/app/views/budgets/income.blade.php b/app/views/budgets/income.blade.php index d5b70c4f93..d215db7269 100644 --- a/app/views/budgets/income.blade.php +++ b/app/views/budgets/income.blade.php @@ -4,7 +4,7 @@
- +
diff --git a/app/views/budgets/index.blade.php b/app/views/budgets/index.blade.php index 5d6acda60b..8e26fd0924 100644 --- a/app/views/budgets/index.blade.php +++ b/app/views/budgets/index.blade.php @@ -5,7 +5,7 @@
- {{\Session::get('start')->format('F Y')}} + {{\Session::get('start', \Carbon\Carbon::now()->startOfMonth())->format('F Y')}}
@@ -13,7 +13,7 @@ Budgeted: {{mf(300)}}
- Income {{\Session::get('start')->format('F Y')}}: + Income {{\Session::get('start', \Carbon\Carbon::now()->startOfMonth())->format('F Y')}}: {{mf($amount)}}
diff --git a/app/views/budgets/show.blade.php b/app/views/budgets/show.blade.php index 80e24ff00a..7228e03054 100644 --- a/app/views/budgets/show.blade.php +++ b/app/views/budgets/show.blade.php @@ -76,7 +76,7 @@ var repetitionID = {{$repetition->id}}; var year = {{$repetition->startdate->format('Y')}}; @else - var year = {{Session::get('start')->format('Y')}}; + var year = {{Session::get('start',\Carbon\Carbon::now()->startOfMonth())->format('Y')}}; @endif From c77b43458e765e116e864bed3df41a58ffde8043 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 20:03:44 +0100 Subject: [PATCH 13/92] Removed some charts, removed lots of dead code. --- app/controllers/GoogleChartController.php | 160 +--- .../Database/SingleTableInheritanceEntity.php | 121 --- .../Firefly/Exception/FireflyException.php | 14 - .../Firefly/Exception/ValidationException.php | 11 - app/lib/Firefly/Form/Form.php | 365 --------- .../Firefly/Helper/Controllers/Account.php | 154 ---- .../Helper/Controllers/AccountInterface.php | 30 - app/lib/Firefly/Helper/Controllers/Budget.php | 227 ------ .../Helper/Controllers/BudgetInterface.php | 44 -- .../Firefly/Helper/Controllers/Category.php | 29 - .../Helper/Controllers/CategoryInterface.php | 25 - app/lib/Firefly/Helper/Controllers/Chart.php | 475 ----------- .../Helper/Controllers/ChartInterface.php | 108 --- app/lib/Firefly/Helper/Controllers/Json.php | 396 ---------- .../Helper/Controllers/JsonInterface.php | 64 -- .../Firefly/Helper/Controllers/Recurring.php | 120 --- .../Helper/Controllers/RecurringInterface.php | 15 - app/lib/Firefly/Helper/Controllers/Search.php | 101 --- .../Helper/Controllers/SearchInterface.php | 36 - .../Helper/Controllers/Transaction.php | 485 ------------ .../Controllers/TransactionInterface.php | 48 -- app/lib/Firefly/Helper/Email/EmailHelper.php | 77 -- .../Helper/Email/EmailHelperInterface.php | 34 - .../Firefly/Helper/HelperServiceProvider.php | 78 -- .../Helper/Preferences/PreferencesHelper.php | 58 -- .../PreferencesHelperInterface.php | 29 - app/lib/Firefly/Helper/Toolkit/Toolkit.php | 504 ------------ .../Helper/Toolkit/ToolkitInterface.php | 52 -- app/lib/Firefly/Queue/Import.php | 596 -------------- .../Account/AccountRepositoryInterface.php | 146 ---- .../Account/EloquentAccountRepository.php | 736 ------------------ .../Budget/BudgetRepositoryInterface.php | 88 --- .../Budget/EloquentBudgetRepository.php | 401 ---------- .../Category/CategoryRepositoryInterface.php | 95 --- .../Category/EloquentCategoryRepository.php | 387 --------- .../Import/EloquentImportRepository.php | 58 -- .../Import/ImportRepositoryInterface.php | 51 -- .../Storage/Limit/EloquentLimitRepository.php | 249 ------ .../Limit/LimitRepositoryInterface.php | 70 -- .../Piggybank/EloquentPiggybankRepository.php | 381 --------- .../PiggybankRepositoryInterface.php | 95 --- ...EloquentRecurringTransactionRepository.php | 223 ------ ...ecurringTransactionRepositoryInterface.php | 64 -- .../Reminder/EloquentReminderRepository.php | 34 - .../Reminder/ReminderRepositoryInterface.php | 19 - .../Storage/StorageServiceProvider.php | 73 -- .../EloquentTransactionRepository.php | 32 - .../TransactionRepositoryInterface.php | 19 - .../EloquentTransactionJournalRepository.php | 610 --------------- .../TransactionJournalRepositoryInterface.php | 88 --- .../Storage/User/EloquentUserRepository.php | 80 -- .../Storage/User/UserRepositoryInterface.php | 43 - .../Trigger/Budgets/EloquentBudgetTrigger.php | 67 -- .../Journals/EloquentJournalTrigger.php | 64 -- .../Trigger/Limits/EloquentLimitTrigger.php | 133 ---- .../Piggybanks/EloquentPiggybankTrigger.php | 239 ------ .../Recurring/EloquentRecurringTrigger.php | 111 --- .../Firefly/Validation/FireflyValidator.php | 22 - .../Validation/ValidationServiceProvider.php | 22 - app/routes.php | 2 - app/views/accounts/show.blade.php | 23 - composer.json | 4 +- composer.lock | 186 ++++- public/assets/javascript/firefly/accounts.js | 5 - public/assets/javascript/firefly/gcharts.js | 40 - .../javascript/firefly/gcharts.options.js | 3 - 66 files changed, 197 insertions(+), 9222 deletions(-) delete mode 100644 app/lib/Firefly/Database/SingleTableInheritanceEntity.php delete mode 100644 app/lib/Firefly/Exception/FireflyException.php delete mode 100644 app/lib/Firefly/Exception/ValidationException.php delete mode 100644 app/lib/Firefly/Form/Form.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Account.php delete mode 100644 app/lib/Firefly/Helper/Controllers/AccountInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Budget.php delete mode 100644 app/lib/Firefly/Helper/Controllers/BudgetInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Category.php delete mode 100644 app/lib/Firefly/Helper/Controllers/CategoryInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Chart.php delete mode 100644 app/lib/Firefly/Helper/Controllers/ChartInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Json.php delete mode 100644 app/lib/Firefly/Helper/Controllers/JsonInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Recurring.php delete mode 100644 app/lib/Firefly/Helper/Controllers/RecurringInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Search.php delete mode 100644 app/lib/Firefly/Helper/Controllers/SearchInterface.php delete mode 100644 app/lib/Firefly/Helper/Controllers/Transaction.php delete mode 100644 app/lib/Firefly/Helper/Controllers/TransactionInterface.php delete mode 100644 app/lib/Firefly/Helper/Email/EmailHelper.php delete mode 100644 app/lib/Firefly/Helper/Email/EmailHelperInterface.php delete mode 100644 app/lib/Firefly/Helper/HelperServiceProvider.php delete mode 100644 app/lib/Firefly/Helper/Preferences/PreferencesHelper.php delete mode 100644 app/lib/Firefly/Helper/Preferences/PreferencesHelperInterface.php delete mode 100644 app/lib/Firefly/Helper/Toolkit/Toolkit.php delete mode 100644 app/lib/Firefly/Helper/Toolkit/ToolkitInterface.php delete mode 100644 app/lib/Firefly/Queue/Import.php delete mode 100644 app/lib/Firefly/Storage/Account/AccountRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Account/EloquentAccountRepository.php delete mode 100644 app/lib/Firefly/Storage/Budget/BudgetRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Budget/EloquentBudgetRepository.php delete mode 100644 app/lib/Firefly/Storage/Category/CategoryRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Category/EloquentCategoryRepository.php delete mode 100644 app/lib/Firefly/Storage/Import/EloquentImportRepository.php delete mode 100644 app/lib/Firefly/Storage/Import/ImportRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Limit/EloquentLimitRepository.php delete mode 100644 app/lib/Firefly/Storage/Limit/LimitRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Piggybank/EloquentPiggybankRepository.php delete mode 100644 app/lib/Firefly/Storage/Piggybank/PiggybankRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/RecurringTransaction/EloquentRecurringTransactionRepository.php delete mode 100644 app/lib/Firefly/Storage/RecurringTransaction/RecurringTransactionRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/Reminder/EloquentReminderRepository.php delete mode 100644 app/lib/Firefly/Storage/Reminder/ReminderRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/StorageServiceProvider.php delete mode 100644 app/lib/Firefly/Storage/Transaction/EloquentTransactionRepository.php delete mode 100644 app/lib/Firefly/Storage/Transaction/TransactionRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/TransactionJournal/EloquentTransactionJournalRepository.php delete mode 100644 app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php delete mode 100644 app/lib/Firefly/Storage/User/EloquentUserRepository.php delete mode 100644 app/lib/Firefly/Storage/User/UserRepositoryInterface.php delete mode 100644 app/lib/Firefly/Trigger/Budgets/EloquentBudgetTrigger.php delete mode 100644 app/lib/Firefly/Trigger/Journals/EloquentJournalTrigger.php delete mode 100644 app/lib/Firefly/Trigger/Limits/EloquentLimitTrigger.php delete mode 100644 app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php delete mode 100644 app/lib/Firefly/Trigger/Recurring/EloquentRecurringTrigger.php delete mode 100644 app/lib/Firefly/Validation/FireflyValidator.php delete mode 100644 app/lib/Firefly/Validation/ValidationServiceProvider.php diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 16ab897861..c31c66c354 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -1,6 +1,7 @@ _chart->addColumn('Day of month', 'date'); $this->_chart->addColumn('Balance for ' . $account->name, 'number'); - $start = Session::get('start',Carbon::now()->startOfMonth()); + // TODO this can be combined in some method, it's + $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end'); $count = $account->transactions()->count(); @@ -59,150 +61,6 @@ class GoogleChartController extends BaseController return Response::json($this->_chart->getData()); } - /** - * @param Account $account - * @param string $view - * - * @return \Illuminate\Http\JsonResponse - */ - public function accountSankeyInChart(Account $account, $view = 'session') - { - // collect all relevant entries. - $set = []; - - /** @var \Grumpydictator\Gchart\GChart $chart */ - $chart = App::make('gchart'); - $chart->addColumn('From', 'string'); - $chart->addColumn('To', 'string', 'domain'); - $chart->addColumn('Weight', 'number'); - - switch ($view) { - default: - case 'session': - $start = Session::get('start',Carbon::now()->startOfMonth()); - $end = Session::get('end'); - break; - case 'all': - $first = $account->transactionjournals()->orderBy('date', 'DESC')->first(); - $last = $account->transactionjournals()->orderBy('date', 'ASC')->first(); - if (is_null($first)) { - $start = Session::get('start',Carbon::now()->startOfMonth()); - } else { - $start = clone $first->date; - } - if (is_null($last)) { - $end = Session::get('end'); - } else { - $end = clone $last->date; - } - break; - } - - - $transactions = $account->transactions()->with( - ['transactionjournal', 'transactionjournal.transactions' => function ($q) { - $q->where('amount', '<', 0); - }, 'transactionjournal.budgets', 'transactionjournal.transactiontype', 'transactionjournal.categories'] - )->before($end)->after($start)->get(); - - /** @var Transaction $transaction */ - foreach ($transactions as $transaction) { - $amount = floatval($transaction->amount); - $type = $transaction->transactionJournal->transactionType->type; - - if ($amount > 0 && $type != 'Transfer') { - - $otherAccount = $transaction->transactionJournal->transactions[0]->account->name; - $categoryName = isset($transaction->transactionJournal->categories[0]) ? $transaction->transactionJournal->categories[0]->name : '(no cat)'; - $set[] = [$otherAccount, $categoryName, $amount]; - $set[] = [$categoryName, $account->name, $amount]; - } - } - // loop the set, group everything together: - $grouped = []; - foreach ($set as $entry) { - $key = $entry[0] . $entry[1]; - if (isset($grouped[$key])) { - $grouped[$key][2] += $entry[2]; - } else { - $grouped[$key] = $entry; - } - } - - // add rows to the chart: - foreach ($grouped as $entry) { - $chart->addRow($entry[0], $entry[1], $entry[2]); - } - - $chart->generate(); - - return Response::json($chart->getData()); - - } - - /** - * @param Account $account - * @param string $view - * - * @return \Illuminate\Http\JsonResponse - */ - public function accountSankeyOutChart(Account $account, $view = 'session') - { - // collect all relevant entries. - $set = []; - - /** @var \Grumpydictator\Gchart\GChart $chart */ - $chart = App::make('gchart'); - $chart->addColumn('From', 'string'); - $chart->addColumn('To', 'string', 'domain'); - $chart->addColumn('Weight', 'number'); - - $transactions = $account->transactions()->with( - ['transactionjournal', 'transactionjournal.transactions', 'transactionjournal.budgets', 'transactionjournal.transactiontype', - 'transactionjournal.categories'] - )->before(Session::get('end'))->after( - Session::get('start',Carbon::now()->startOfMonth()) - )->get(); - - /** @var Transaction $transaction */ - foreach ($transactions as $transaction) { - $amount = floatval($transaction->amount); - $type = $transaction->transactionJournal->transactionType->type; - - if ($amount < 0 && $type != 'Transfer') { - - // from account to a budget (if present). - $budgetName = isset($transaction->transactionJournal->budgets[0]) ? $transaction->transactionJournal->budgets[0]->name : '(no budget)'; - $set[] = [$account->name, $budgetName, $amount * -1]; - - // from budget to category. - $categoryName = isset($transaction->transactionJournal->categories[0]) ? ' ' . $transaction->transactionJournal->categories[0]->name - : '(no cat)'; - $set[] = [$budgetName, $categoryName, $amount * -1]; - } - } - // loop the set, group everything together: - $grouped = []; - foreach ($set as $entry) { - $key = $entry[0] . $entry[1]; - if (isset($grouped[$key])) { - $grouped[$key][2] += $entry[2]; - } else { - $grouped[$key] = $entry; - } - } - - // add rows to the chart: - foreach ($grouped as $entry) { - $chart->addRow($entry[0], $entry[1], $entry[2]); - } - - $chart->generate(); - - return Response::json($chart->getData()); - - } - /** * This method renders the b */ @@ -235,7 +93,7 @@ class GoogleChartController extends BaseController /* * Loop the date, then loop the accounts, then add balance. */ - $start = Session::get('start',Carbon::now()->startOfMonth()); + $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end'); $current = clone $start; @@ -281,14 +139,14 @@ class GoogleChartController extends BaseController * Is there a repetition starting on this particular date? We can use that. */ /** @var \LimitRepetition $repetition */ - $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start',Carbon::now()->startOfMonth())); + $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start', Carbon::now()->startOfMonth())); /* * If there is, use it. Otherwise, forget it. */ if (is_null($repetition)) { // use the session start and end for our search query - $searchStart = Session::get('start',Carbon::now()->startOfMonth()); + $searchStart = Session::get('start', Carbon::now()->startOfMonth()); $searchEnd = Session::get('end'); // the limit is zero: $limit = 0; @@ -315,7 +173,7 @@ class GoogleChartController extends BaseController * Finally, get all transactions WITHOUT a budget and add those as well. * (yes this method is oddly specific). */ - $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start',Carbon::now()->startOfMonth()), Session::get('end')); + $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start', Carbon::now()->startOfMonth()), Session::get('end')); $sum = $noBudgetSet->sum('amount') * -1; $chart->addRow('No budget', 0, $sum); @@ -343,7 +201,7 @@ class GoogleChartController extends BaseController /* * Get the journals: */ - $journals = $tj->getInDateRange(Session::get('start',Carbon::now()->startOfMonth()), Session::get('end')); + $journals = $tj->getInDateRange(Session::get('start', Carbon::now()->startOfMonth()), Session::get('end')); /** @var \TransactionJournal $journal */ foreach ($journals as $journal) { @@ -627,7 +485,7 @@ class GoogleChartController extends BaseController /* * In the current session range? */ - if (\Session::get('end') >= $current and $currentEnd >= \Session::get('start',Carbon::now()->startOfMonth())) { + if (\Session::get('end') >= $current and $currentEnd >= \Session::get('start', Carbon::now()->startOfMonth())) { /* * Lets see if we've already spent money on this recurring transaction (it hath recurred). */ diff --git a/app/lib/Firefly/Database/SingleTableInheritanceEntity.php b/app/lib/Firefly/Database/SingleTableInheritanceEntity.php deleted file mode 100644 index 762ee14ad6..0000000000 --- a/app/lib/Firefly/Database/SingleTableInheritanceEntity.php +++ /dev/null @@ -1,121 +0,0 @@ -mapData((array)$attributes)->newInstance([], true); - $instance->setRawAttributes((array)$attributes, true); - - return $instance; - } - - - /** - * if no subclass is defined, function as normal - * - * @param array $attributes - * - * @return \Illuminate\Database\Eloquent\Model|static - */ - public function mapData(array $attributes) - { - if (!$this->subclassField) { - return $this->newInstance(); - } - - return new $attributes[$this->subclassField]; - } - - - /** - * - * instead of using $this->newInstance(), call - * newInstance() on the object from mapData - * - * @param bool $excludeDeleted - * - * @return \Illuminate\Database\Eloquent\Builder|static - */ - public function newQuery($excludeDeleted = true) - { - // If using Laravel 4.0.x then use the following commented version of this command - // $builder = new Builder($this->newBaseQueryBuilder()); - // newEloquentBuilder() was added in 4.1 - $builder = $this->newEloquentBuilder($this->newBaseQueryBuilder()); - - // Once Firefly has the query builders, it will set the model instances so the - // builder can easily access any information it may need from the model - // while it is constructing and executing various queries against it. - $builder->setModel($this)->with($this->with); - - if ($excludeDeleted && $this->softDelete) { - $builder->whereNull($this->getQualifiedDeletedAtColumn()); - } - - if ($this->subclassField && $this->isSubclass()) { - $builder->where($this->subclassField, '=', get_class($this)); - } - - return $builder; - } - - /** - * @return bool - */ - public function isSubclass() - { - return $this->isSubclass; - } - - /** - * ensure that the subclass field is assigned on save - * - * @param array $rules - * @param array $customMessages - * @param array $options - * @param callable $beforeSave - * @param callable $afterSave - * - * @return bool - */ - public function save( - array $rules = [], - array $customMessages = [], - array $options = [], - \Closure $beforeSave = null, - \Closure $afterSave = null - ) { - if ($this->subclassField) { - $this->attributes[$this->subclassField] = get_class($this); - } - - return parent::save($rules, $customMessages, $options, $beforeSave, $afterSave); - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Exception/FireflyException.php b/app/lib/Firefly/Exception/FireflyException.php deleted file mode 100644 index eb0f038fa3..0000000000 --- a/app/lib/Firefly/Exception/FireflyException.php +++ /dev/null @@ -1,14 +0,0 @@ - 'Amount (min)', - 'amount_max' => 'Amount (max)', - 'match' => 'Matches on', - 'repeat_freq' => 'Repetition', - 'account_from_id' => 'Account from', - 'account_to_id' => 'Account to', - 'account_id' => 'Asset account' - ]; - - return isset($labels[$name]) ? $labels[$name] : str_replace('_', ' ', ucfirst($name)); - - } - - /** - * Return buttons for update/validate/return. - * - * @param $type - * @param $name - */ - public static function ffOptionsList($type, $name) - { - $previousValue = \Input::old('post_submit_action'); - $previousValue = is_null($previousValue) ? 'store' : $previousValue; - /* - * Store. - */ - $store = ''; - switch ($type) { - case 'create': - $store = '
'; - $store .= '
'; - break; - case 'update': - $store = '
'; - $store .= '
'; - break; - default: - throw new FireflyException('Cannot create ffOptionsList for option (store) ' . $type); - break; - } - - /* - * validate is always the same: - */ - $validate = '
'; - - /* - * Store & return: - */ - switch ($type) { - case 'create': - $return = '
'; - break; - case 'update': - $return = '
'; - break; - default: - throw new FireflyException('Cannot create ffOptionsList for option (store+return) ' . $type); - break; - } - return $store . $validate . $return; - } - - /** - * @param $type - * @param $name - * @param null $value - * @param array $options - * @param array $list - * - * @return string - * @throws FireflyException - */ - public static function ffInput($type, $name, $value = null, array $options = array(), $list = []) - { - /* - * add some defaults to this method: - */ - $options['class'] = 'form-control'; - $options['id'] = 'ffInput_' . $name; - $options['autocomplete'] = 'off'; - $label = self::label($name, $options); - /* - * Make label and placeholder look nice. - */ - $options['placeholder'] = ucfirst($name); - - /* - * Get pre filled value: - */ - if (\Session::has('prefilled')) { - $preFilled = \Session::get('preFilled'); - $value = isset($prefilled[$name]) && is_null($value) ? $prefilled[$name] : $value; - } - - /* - * Get the value. - */ - if (!is_null(\Input::old($name))) { - /* - * Old value overrules $value. - */ - $value = \Input::old($name); - } - - /* - * Get errors, warnings and successes from session: - */ - /** @var MessageBag $errors */ - $errors = \Session::get('errors'); - - /** @var MessageBag $warnings */ - $warnings = \Session::get('warnings'); - - /** @var MessageBag $successes */ - $successes = \Session::get('successes'); - - - /* - * If errors, add some more classes. - */ - switch (true) { - case (!is_null($errors) && $errors->has($name)): - $classes = 'form-group has-error has-feedback'; - break; - case (!is_null($warnings) && $warnings->has($name)): - $classes = 'form-group has-warning has-feedback'; - break; - case (!is_null($successes) && $successes->has($name)): - $classes = 'form-group has-success has-feedback'; - break; - default: - $classes = 'form-group'; - break; - } - - /* - * Add some HTML. - */ - $html = '
'; - $html .= ''; - $html .= '
'; - - - /* - * Switch input type: - */ - unset($options['label']); - switch ($type) { - case 'text': - $html .= \Form::input('text', $name, $value, $options); - break; - case 'amount': - $html .= '
€
'; - $html .= \Form::input('number', $name, $value, $options); - $html .= '
'; - break; - case 'number': - $html .= \Form::input('number', $name, $value, $options); - break; - case 'checkbox': - $checked = $options['checked']; - unset($options['checked'], $options['placeholder'], $options['autocomplete'], $options['class']); - $html .= '
'; - - - break; - case 'date': - $html .= \Form::input('date', $name, $value, $options); - break; - case 'select': - $html .= \Form::select($name, $list, $value, $options); - break; - default: - throw new FireflyException('Cannot handle type "' . $type . '" in FFFormBuilder.'); - break; - } - - /* - * If errors, respond to them: - */ - - if (!is_null($errors)) { - if ($errors->has($name)) { - $html .= ''; - $html .= '

' . e($errors->first($name)) . '

'; - } - } - unset($errors); - /* - * If warnings, respond to them: - */ - - if (!is_null($warnings)) { - if ($warnings->has($name)) { - $html .= ''; - $html .= '

' . e($warnings->first($name)) . '

'; - } - } - unset($warnings); - - /* - * If successes, respond to them: - */ - - if (!is_null($successes)) { - if ($successes->has($name)) { - $html .= ''; - $html .= '

' . e($successes->first($name)) . '

'; - } - } - unset($successes); - - $html .= '
'; - $html .= '
'; - - return $html; - - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/Account.php b/app/lib/Firefly/Helper/Controllers/Account.php deleted file mode 100644 index 93dd3b12d7..0000000000 --- a/app/lib/Firefly/Helper/Controllers/Account.php +++ /dev/null @@ -1,154 +0,0 @@ -accountIs($account) - ->leftJoin( - 'transaction_types', 'transaction_types.id', '=', - 'transaction_journals.transaction_type_id' - ) - ->where('transaction_types.type', 'Opening balance') - ->first(['transaction_journals.*']); - } - - /** - * Since it is entirely possible the database is messed up somehow it might be that a transaction - * journal has only one transaction. This is mainly caused by wrong deletions and other artefacts from the past. - * - * If it is the case, Firefly removes $item and continues like nothing ever happened. This will however, - * mess up some statisics but it's decided everybody should learn to live with that. - * - * Firefly might be needing some cleanup routine in the future. - * - * For now, Firefly simply warns the user of this. - * - * @param \Account $account - * @param $perPage - * - * @return array|mixed - * @throws \Firefly\Exception\FireflyException - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - */ - public function show(\Account $account, $perPage) - { - $start = \Session::get('start'); - $end = \Session::get('end'); - $stats = [ - 'accounts' => [] - ]; - $items = []; - - // build a query: - $query = \TransactionJournal::withRelevantData() - ->defaultSorting() - ->accountIs($account) - ->after($start) - ->before($end); - // filter some: - switch (\Input::get('type')) { - case 'transactions': - $query->transactionTypes(['Deposit', 'Withdrawal']); - break; - case 'transfers': - $query->transactionTypes(['Transfer']); - break; - } - - switch (\Input::get('show')) { - case 'expenses': - case 'out': - $query->lessThan(0); - break; - case 'income': - case 'in': - $query->moreThan(0); - break; - } - - - // build paginator: - $totalItems = $query->count(); - $page = max(1, intval(\Input::get('page'))); - $skip = ($page - 1) * $perPage; - $result = $query->skip($skip)->take($perPage)->get(['transaction_journals.*']); - - - // get the relevant budgets, categories and accounts from this list: - /** @var $item \TransactionJournal */ - foreach ($result as $index => $item) { - - foreach ($item->components as $component) { - $stats[$component->class][$component->id] = $component; - } - - if (count($item->transactions) < 2) { - \Session::flash('warning', 'Some transactions are incomplete; they will not be shown.'); - unset($result[$index]); - continue; - } - $items[] = $item; - $fromAccount = $item->transactions[0]->account; - $toAccount = $item->transactions[1]->account; - $stats['accounts'][$fromAccount->id] = $fromAccount; - $stats['accounts'][$toAccount->id] = $toAccount; - } - $paginator = \Paginator::make($items, $totalItems, $perPage); - unset($result, $page, $item, $fromAccount, $toAccount); - - - // statistics (transactions) - $trIn = floatval( - \Transaction::before($end)->after($start)->accountIs($account)->moreThan(0) - ->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount') - ); - $trOut = floatval( - \Transaction::before($end)->after($start)->accountIs($account)->lessThan(0) - ->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount') - ); - $trDiff = $trIn + $trOut; - - // statistics (transfers) - $trfIn = floatval( - \Transaction::before($end)->after($start)->accountIs($account)->moreThan(0) - ->transactionTypes(['Transfer'])->sum('transactions.amount') - ); - $trfOut = floatval( - \Transaction::before($end)->after($start)->accountIs($account)->lessThan(0) - ->transactionTypes(['Transfer'])->sum('transactions.amount') - ); - $trfDiff = $trfIn + $trfOut; - - $stats['period'] = [ - 'in' => $trIn, - 'out' => $trOut, - 'diff' => $trDiff, - 't_in' => $trfIn, - 't_out' => $trfOut, - 't_diff' => $trfDiff - - ]; - - $return = [ - 'journals' => $paginator, - 'statistics' => $stats - ]; - - return $return; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/AccountInterface.php b/app/lib/Firefly/Helper/Controllers/AccountInterface.php deleted file mode 100644 index 4c2e378845..0000000000 --- a/app/lib/Firefly/Helper/Controllers/AccountInterface.php +++ /dev/null @@ -1,30 +0,0 @@ -limits as $limit) { - - /** @var \LimitRepetition $repetition */ - foreach ($limit->limitrepetitions as $repetition) { - $repetition->left = $repetition->leftInRepetition(); - $periodOrder = $repetition->periodOrder(); - $period = $repetition->periodShow(); - if (!isset($return[$periodOrder])) { - - $return[$periodOrder] = [ - 'date' => $period, - 'start' => $repetition->startdate, - 'end' => $repetition->enddate, - 'budget_id' => $budget->id, - 'limitrepetitions' => [$repetition] - ]; - } else { - $return[$periodOrder]['limitrepetitions'][] = $repetition; - } - - } - } - } - krsort($return); - - return $return; - } - - /** - * Get a repetition (complex because of user check) - * and then get the transactions in it. - * @param $repetitionId - * - * @return array - */ - public function organizeRepetition(\LimitRepetition $repetition) - { - $result = []; - // get transactions: - $set = $repetition->limit->budget - ->transactionjournals() - ->withRelevantData() - ->transactionTypes(['Withdrawal']) - ->after($repetition->startdate) - ->before($repetition->enddate) - ->defaultSorting() - ->get(['transaction_journals.*']); - - $result[0] = [ - 'date' => $repetition->periodShow(), - 'limit' => $repetition->limit, - 'limitrepetition' => $repetition, - 'journals' => $set, - 'paginated' => false - ]; - - return $result; - } - - /** - * - * - * @param \Budget $budget - * @param bool $useSessionDates - * - * @return array|mixed - * @throws \Firefly\Exception\FireflyException - */ - public function organizeRepetitions(\Budget $budget, $useSessionDates = false) - { - $sessionStart = \Session::get('start'); - $sessionEnd = \Session::get('end'); - - $result = []; - $inRepetition = []; - - // get the limits: - if ($useSessionDates) { - $limits = $budget->limits()->where('startdate', '>=', $sessionStart->format('Y-m-d'))->where( - 'startdate', '<=', $sessionEnd->format('Y-m-d') - )->get(); - } else { - $limits = $budget->limits; - } - - /** @var \Limit $limit */ - foreach ($limits as $limit) { - foreach ($limit->limitrepetitions as $repetition) { - $order = $repetition->periodOrder(); - $result[$order] = [ - 'date' => $repetition->periodShow(), - 'limitrepetition' => $repetition, - 'limit' => $limit, - 'journals' => [], - 'paginated' => false - ]; - $transactions = []; - $set = $budget->transactionjournals() - ->withRelevantData() - ->transactionTypes(['Withdrawal']) - ->after($repetition->startdate) - ->before($repetition->enddate) - ->defaultSorting() - ->get(['transaction_journals.*']); - foreach ($set as $entry) { - $transactions[] = $entry; - $inRepetition[] = $entry->id; - } - $result[$order]['journals'] = $transactions; - } - - } - if ($useSessionDates === false) { - $query = $budget->transactionjournals()->withRelevantData()->defaultSorting(); - if (count($inRepetition) > 0) { - $query->whereNotIn('transaction_journals.id', $inRepetition); - } - - // build paginator: - $perPage = 25; - $totalItems = $query->count(); - $page = intval(\Input::get('page')) > 1 ? intval(\Input::get('page')) : 1; - $skip = ($page - 1) * $perPage; - $set = $query->skip($skip)->take($perPage)->get(); - - // stupid paginator! - $items = []; - /** @var $item \TransactionJournal */ - foreach ($set as $item) { - $items[] = $item; - } - $paginator = \Paginator::make($items, $totalItems, $perPage); - $result['0000'] = [ - 'date' => 'Not in an envelope', - 'limit' => null, - 'paginated' => true, - 'journals' => $paginator]; - } - krsort($result); - - return $result; - } - - /** - * @param \Budget $budget - * - * @return mixed|void - */ - public function outsideRepetitions(\Budget $budget) - { - $inRepetitions = []; - foreach ($budget->limits as $limit) { - foreach ($limit->limitrepetitions as $repetition) { - $set = $budget->transactionjournals() - ->transactionTypes(['Withdrawal']) - ->after($repetition->startdate) - ->before($repetition->enddate) - ->defaultSorting() - ->get(['transaction_journals.id']); - foreach ($set as $item) { - $inRepetitions[] = $item->id; - } - } - - } - - $query = $budget->transactionjournals() - ->withRelevantData() - ->whereNotIn('transaction_journals.id', $inRepetitions) - ->defaultSorting(); - - // build paginator: - $perPage = 25; - $totalItems = $query->count(); - $page = intval(\Input::get('page')) > 1 ? intval(\Input::get('page')) : 1; - $skip = ($page - 1) * $perPage; - $set = $query->skip($skip)->take($perPage)->get(); - - // stupid paginator! - $items = []; - /** @var $item \TransactionJournal */ - foreach ($set as $item) { - $items[] = $item; - } - $paginator = \Paginator::make($items, $totalItems, $perPage); - $result = [0 => [ - 'date' => 'Not in an envelope', - 'limit' => null, - 'paginated' => true, - 'journals' => $paginator - ]]; - - return $result; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/BudgetInterface.php b/app/lib/Firefly/Helper/Controllers/BudgetInterface.php deleted file mode 100644 index 8fc25c10f8..0000000000 --- a/app/lib/Firefly/Helper/Controllers/BudgetInterface.php +++ /dev/null @@ -1,44 +0,0 @@ -transactionjournals()->with( - ['transactions', 'transactions.account', 'transactiontype', 'components'] - )->orderBy('date', 'DESC')->orderBy('id', 'DESC')->before($end)->after($start)->get(); - - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/CategoryInterface.php b/app/lib/Firefly/Helper/Controllers/CategoryInterface.php deleted file mode 100644 index 6e95583bd7..0000000000 --- a/app/lib/Firefly/Helper/Controllers/CategoryInterface.php +++ /dev/null @@ -1,25 +0,0 @@ - $account->name, - 'id' => $account->id, - 'type' => 'spline', - 'pointStart' => $start->timestamp * 1000, - 'pointInterval' => 24 * 3600 * 1000, // one day - 'data' => [] - ]; - - while ($current <= $end) { - if ($current > $today) { - $return['data'][] = $account->predict(clone $current); - } else { - $return['data'][] = $account->balance(clone $current); - } - - $current->addDay(); - } - - return $return; - } - - /** - * @param \Account $account - * @param Carbon $date - * - * @return array - */ - public function accountDailySummary(\Account $account, Carbon $date) - { - $result = [ - 'rows' => [], - 'sum' => 0 - ]; - if ($account) { - // get journals in range: - $journals = \Auth::user()->transactionjournals()->with( - [ - 'transactions', - 'transactions.account', - 'transactioncurrency', - 'transactiontype' - ] - ) - ->distinct() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->where('transactions.account_id', $account->id) - ->where('transaction_journals.date', $date->format('Y-m-d')) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.id', 'DESC') - ->get(['transaction_journals.*']); - - // loop all journals: - foreach ($journals as $journal) { - foreach ($journal->transactions as $transaction) { - $name = $transaction->account->name; - if ($transaction->account->id != $account->id) { - if (!isset($result['rows'][$name])) { - $result['rows'][$name] = [ - 'name' => $name, - 'id' => $transaction->account->id, - 'amount' => floatval($transaction->amount) - ]; - } else { - $result['rows'][$name]['amount'] += floatval($transaction->amount); - } - $result['sum'] += floatval($transaction->amount); - } - } - } - } - - return $result; - - } - - /** - * @param Carbon $start - * @param Carbon $end - * - * @return array - * @throws \Firefly\Exception\FireflyException - */ - public function categories(Carbon $start, Carbon $end) - { - - $result = []; - // grab all transaction journals in this period: - $journals = \TransactionJournal:: - with( - ['components', 'transactions' => function ($q) { - $q->where('amount', '>', 0); - }] - ) - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->where('transaction_types.type', 'Withdrawal') - ->after($start)->before($end) - ->where('completed', 1) - ->get(['transaction_journals.*']); - foreach ($journals as $journal) { - // has to be one: - - if (!isset($journal->transactions[0])) { - throw new FireflyException('Journal #' . $journal->id . ' has ' . count($journal->transactions) - . ' transactions!'); - } - $transaction = $journal->transactions[0]; - $amount = floatval($transaction->amount); - - // get budget from journal: - $category = $journal->categories()->first(); - $categoryName = is_null($category) ? '(no category)' : $category->name; - - $result[$categoryName] = isset($result[$categoryName]) ? $result[$categoryName] + floatval($amount) - : $amount; - - } - unset($journal, $transaction, $category, $amount); - - // sort - arsort($result); - $chartData = []; - foreach ($result as $name => $value) { - $chartData[] = [$name, $value]; - } - - - return $chartData; - } - - /** - * @param \Category $category - * @param $range - * @param Carbon $start - * @param Carbon $end - * - * @return array - * @throws \Firefly\Exception\FireflyException - */ - public function categoryShowChart(\Category $category, $range, Carbon $start, Carbon $end) - { - $data = ['name' => $category->name . ' per ' . $range, 'data' => []]; - // go back twelve periods. Skip if empty. - $beginning = clone $start; - switch ($range) { - default: - throw new FireflyException('No beginning for range ' . $range); - break; - case '1D': - $beginning->subDays(12); - break; - case '1W': - $beginning->subWeeks(12); - break; - case '1M': - $beginning->subYear(); - break; - case '3M': - $beginning->subYears(3); - break; - case '6M': - $beginning->subYears(6); - break; - case 'custom': - $diff = $start->diff($end); - $days = $diff->days; - $beginning->subDays(12 * $days); - break; - } - - // loop over the periods: - while ($beginning <= $start) { - // increment currentEnd to fit beginning: - $currentEnd = clone $beginning; - // increase beginning for next round: - switch ($range) { - default: - throw new FireflyException('No currentEnd incremental for range ' . $range); - break; - case '1D': - break; - case '1W': - $currentEnd->addWeek()->subDay(); - break; - case '1M': - $currentEnd->addMonth()->subDay(); - break; - case '3M': - $currentEnd->addMonths(3)->subDay(); - break; - case '6M': - $currentEnd->addMonths(6)->subDay(); - break; - case 'custom': - $diff = $start->diff($end); - $days = $diff->days; - $days = $days == 1 ? 2 : $days; - $currentEnd->addDays($days)->subDay(); - break; - } - - - // now format the current range: - $title = ''; - switch ($range) { - default: - throw new FireflyException('No date formats for frequency "' . $range . '"!'); - break; - case '1D': - $title = $beginning->format('j F Y'); - break; - case '1W': - $title = $beginning->format('\W\e\e\k W, Y'); - break; - case '1M': - $title = $beginning->format('F Y'); - break; - case '3M': - case '6M': - $title = $beginning->format('M Y') . ' - ' . $currentEnd->format('M Y'); - break; - case 'custom': - $title = $beginning->format('d-m-Y') . ' - ' . $currentEnd->format('d-m-Y'); - break; - case 'yearly': -// return $this->startdate->format('Y'); - break; - } - - - // get sum for current range: - $journals = \TransactionJournal:: - with( - ['transactions' => function ($q) { - $q->where('amount', '>', 0); - }] - ) - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->where('transaction_types.type', 'Withdrawal') - ->leftJoin( - 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', - 'transaction_journals.id' - ) - ->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id') - ->where('components.id', '=', $category->id) - //->leftJoin() - ->after($beginning)->before($currentEnd) - ->where('completed', 1) - ->get(['transaction_journals.*']); - $currentSum = 0; - foreach ($journals as $journal) { - if (!isset($journal->transactions[0])) { - throw new FireflyException('Journal #' . $journal->id . ' has ' . count($journal->transactions) - . ' transactions!'); - } - $transaction = $journal->transactions[0]; - $amount = floatval($transaction->amount); - $currentSum += $amount; - - } - $data['data'][] = [$title, $currentSum]; - - // increase beginning for next round: - switch ($range) { - default: - throw new FireflyException('No incremental for range ' . $range); - break; - case '1D': - $beginning->addDay(); - break; - case '1W': - $beginning->addWeek(); - break; - case '1M': - $beginning->addMonth(); - break; - case '3M': - $beginning->addMonths(3); - break; - case '6M': - $beginning->addMonths(6); - break; - case 'custom': - $diff = $start->diff($end); - $days = $diff->days; - - $beginning->addDays($days); - break; - - } - } - - return $data; - - - } - - /** - * @param \Budget $budget - * @param Carbon $date - * - * @return float|null - */ - public function spentOnDay(\Budget $budget, Carbon $date) - { - return floatval( - \Transaction:: - leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin( - 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', - 'transaction_journals.id' - )->where('component_transaction_journal.component_id', '=', $budget->id)->where( - 'transaction_journals.date', $date->format('Y-m-d') - )->where('amount', '>', 0)->sum('amount') - ); - } - - /** - * @param \Budget $budget - * - * @return int[] - */ - public function allJournalsInBudgetEnvelope(\Budget $budget) - { - $inRepetitions = []; - - foreach ($budget->limits as $limit) { - foreach ($limit->limitrepetitions as $repetition) { - $set = $budget - ->transactionjournals() - ->transactionTypes(['Withdrawal']) - ->after($repetition->startdate) - ->before($repetition->enddate) - ->get(['transaction_journals.id']); - - foreach ($set as $item) { - $inRepetitions[] = $item->id; - } - } - } - return $inRepetitions; - } - - /** - * @param \Budget $budget - * @param array $ids - * - * @return mixed|void - */ - public function journalsNotInSet(\Budget $budget, array $ids) - { - $query = $budget->transactionjournals() - ->whereNotIn('transaction_journals.id', $ids) - ->orderBy('date', 'DESC') - ->orderBy('transaction_journals.id', 'DESC'); - - $result = $query->get(['transaction_journals.id']); - $set = []; - foreach ($result as $entry) { - $set[] = $entry->id; - } - return $set; - } - - /** - * @param array $set - * - * @return mixed - */ - public function transactionsByJournals(array $set) - { - $transactions = \Transaction::whereIn('transaction_journal_id', $set) - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->groupBy('transaction_journals.date') - ->where('amount', '>', 0)->get(['transaction_journals.date', \DB::Raw('SUM(`amount`) as `aggregate`')]); - return $transactions; - } - - /** - * Get all limit (LimitRepetitions) for a budget falling in a certain date range. - * - * @param \Budget $budget - * @param Carbon $start - * @param Carbon $end - * - * @return Collection - */ - public function limitsInRange(\Budget $budget, Carbon $start, Carbon $end) - { - $reps = new Collection; - /** @var \Limit $limit */ - foreach ($budget->limits as $limit) { - $set = $limit->limitrepetitions()->where( - function ($q) use ($start, $end) { - // startdate is between range - $q->where( - function ($q) use ($start, $end) { - $q->where('startdate', '>=', $start->format('Y-m-d')); - $q->where('startdate', '<=', $end->format('Y-m-d')); - } - ); - - // or enddate is between range. - $q->orWhere( - function ($q) use ($start, $end) { - $q->where('enddate', '>=', $start->format('Y-m-d')); - $q->where('enddate', '<=', $end->format('Y-m-d')); - } - ); - } - )->get(); - - $reps = $reps->merge($set); - } - return $reps; - } - - /** - * Firefly checks how much money has been spend on the limitrepetition (aka: the current envelope) in - * the period denoted. Aka, the user has a certain amount of money in an envelope and wishes to know how - * much he has spent between the dates entered. This date range can be a partial match with the date range - * of the envelope or no match at all. - * - * @param \LimitRepetition $repetition - * @param Carbon $start - * @param Carbon $end - * - * @return mixed - */ - public function spentOnLimitRepetitionBetweenDates(\LimitRepetition $repetition, Carbon $start, Carbon $end) - { - return floatval( - \Transaction:: - leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin( - 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', - 'transaction_journals.id' - )->where('component_transaction_journal.component_id', '=', $repetition->limit->budget->id)->where( - 'transaction_journals.date', '>=', $start->format('Y-m-d') - )->where('transaction_journals.date', '<=', $end->format('Y-m-d'))->where( - 'amount', '>', 0 - )->sum('amount') - ); - } - - -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/ChartInterface.php b/app/lib/Firefly/Helper/Controllers/ChartInterface.php deleted file mode 100644 index 1706fde96f..0000000000 --- a/app/lib/Firefly/Helper/Controllers/ChartInterface.php +++ /dev/null @@ -1,108 +0,0 @@ - intval(\Input::get('start')), - 'length' => $length, - 'draw' => intval(\Input::get('draw')), - ]; - - - /* - * Columns: - */ - if (!is_null(\Input::get('columns')) && is_array(\Input::get('columns'))) { - foreach (\Input::get('columns') as $column) { - $parameters['columns'][] = [ - 'data' => $column['data'], - 'name' => $column['name'], - 'searchable' => $column['searchable'] == 'true' ? true : false, - 'orderable' => $column['orderable'] == 'true' ? true : false, - 'search' => [ - 'value' => $column['search']['value'], - 'regex' => $column['search']['regex'] == 'true' ? true : false, - ] - ]; - } - } - - - /* - * Sorting. - */ - $parameters['orderOnAccount'] = false; - if (!is_null(\Input::get('order')) && is_array(\Input::get('order'))) { - foreach (\Input::get('order') as $order) { - $columnIndex = intval($order['column']); - $columnName = $parameters['columns'][$columnIndex]['name']; - $parameters['order'][] = [ - 'name' => $columnName, - 'dir' => strtoupper($order['dir']) - ]; - if ($columnName == 'to' || $columnName == 'from') { - $parameters['orderOnAccount'] = true; - } - } - } - /* - * Search parameters: - */ - $parameters['search'] = [ - 'value' => '', - 'regex' => false - ]; - if (!is_null(\Input::get('search')) && is_array(\Input::get('search'))) { - $search = \Input::get('search'); - $parameters['search'] = [ - 'value' => $search['value'], - 'regex' => $search['regex'] == 'true' ? true : false - ]; - } - return $parameters; - } - - /** - * Do some sorting, counting and ordering on the query and return a nicely formatted array - * that can be used by the DataTables JQuery plugin. - * - * @param array $parameters - * @param Builder $query - * - * @return array - */ - public function journalDataset(array $parameters, Builder $query) - { - /* - * Count query: - */ - $count = $query->count(); - - /* - * Update the selection: - */ - - $query->take($parameters['length']); - if ($parameters['start'] > 0) { - $query->skip($parameters['start']); - } - - /* - * Input search parameters: - */ - $filtered = $count; - if (strlen($parameters['search']['value']) > 0) { - $query->where('transaction_journals.description', 'LIKE', '%' . e($parameters['search']['value']) . '%'); - $filtered = $query->count(); - } - - - /* - * Build return array: - */ - $data = [ - 'draw' => $parameters['draw'], - 'recordsTotal' => $count, - 'recordsFiltered' => $filtered, - 'data' => [], - - ]; - - /* - * Get paginated result set: - */ - if ($parameters['orderOnAccount'] === true) { - /** @var Collection $set */ - $set = $query->get( - [ - 'transaction_journals.*', - 't1.amount', - 't1.account_id AS from_id', - 'a1.name AS from', - 't2.account_id AS to_id', - 'a2.name AS to', - ] - ); - } else { - /** @var Collection $set */ - $set = $query->get( - [ - 'transaction_journals.*', - 'transactions.amount', - ] - ); - } - - /* - * Loop set and create entries to return. - */ - /** @var \TransactionJournal $entry */ - foreach ($set as $entry) { - $from = $entry->transactions[0]->account; - $to = $entry->transactions[1]->account; - $budget = $entry->budgets()->first(); - $category = $entry->categories()->first(); - $recurring = $entry->recurringTransaction()->first(); - $arr = [ - 'date' => $entry->date->format('j F Y'), - 'description' => [ - 'description' => $entry->description, - 'url' => route('transactions.show', $entry->id) - ], - 'amount' => floatval($entry->amount), - 'from' => ['name' => $from->name, 'url' => route('accounts.show', $from->id)], - 'to' => ['name' => $to->name, 'url' => route('accounts.show', $to->id)], - 'components' => [ - 'budget_id' => 0, - 'budget_url' => '', - 'budget_name' => '', - 'category_id' => 0, - 'category_url' => '', - 'category_name' => '' - ], - 'id' => [ - 'edit' => route('transactions.edit', $entry->id), - 'delete' => route('transactions.delete', $entry->id) - ] - ]; - if ($budget) { - $arr['components']['budget_id'] = $budget->id; - $arr['components']['budget_name'] = $budget->name; - $arr['components']['budget_url'] = route('budgets.show', $budget->id); - } - if ($category) { - $arr['components']['category_id'] = $category->id; - $arr['components']['category_name'] = $category->name; - $arr['components']['category_url'] = route('categories.show', $category->id); - } - if ($recurring) { - $arr['components']['recurring_id'] = $recurring->id; - $arr['components']['recurring_name'] = e($recurring->name); - $arr['components']['recurring_url'] = route('recurring.show', $recurring->id); - } - - $data['data'][] = $arr; - - } - return $data; - } - - /** - * Builds most of the query required to grab transaction journals from the database. - * This is useful because all three pages showing different kinds of transactions use - * the exact same query with only slight differences. - * - * @param array $parameters - * - * @return Builder - */ - public function journalQuery(array $parameters) - { - /* - * We need the following vars to fine tune the query: - */ - if ($parameters['amount'] == 'negative') { - $operator = '<'; - $operatorNegated = '>'; - $function = 'lessThan'; - } else { - $operator = '>'; - $operatorNegated = '<'; - $function = 'moreThan'; - } - - /* - * Build query: - */ - $query = \TransactionJournal::transactionTypes($parameters['transactionTypes'])->withRelevantData(); - $query->where('user_id', \Auth::user()->id); - $query->where('completed', 1); - /* - * This is complex. Join `transactions` twice, once for the "to" account and once for the - * "from" account. Then get the amount from one of these (depends on type). - * - * Only need to do this when there's a sort order for "from" or "to". - * - * Also need the table prefix for this to work. - */ - if ($parameters['orderOnAccount'] === true) { - $connection = \Config::get('database.default'); - $prefix = \Config::get('database.connections.' . $connection . '.prefix'); - // left join first table for "from" account: - $query->leftJoin( - 'transactions AS ' . $prefix . 't1', function ($join) use ($operator) { - $join->on('t1.transaction_journal_id', '=', 'transaction_journals.id') - ->on('t1.amount', $operator, \DB::Raw(0)); - } - ); - // left join second table for "to" account: - $query->leftJoin( - 'transactions AS ' . $prefix . 't2', function ($join) use ($operatorNegated) { - $join->on('t2.transaction_journal_id', '=', 'transaction_journals.id') - ->on('t2.amount', $operatorNegated, \DB::Raw(0)); - } - ); - - // also join accounts twice to get the account's name, which we need for sorting. - $query->leftJoin('accounts as ' . $prefix . 'a1', 'a1.id', '=', 't1.account_id'); - $query->leftJoin('accounts as ' . $prefix . 'a2', 'a2.id', '=', 't2.account_id'); - } else { - // less complex - $query->$function(0); - } - - /* - * Add sort parameters to query: - */ - if (isset($parameters['order']) && count($parameters['order']) > 0) { - foreach ($parameters['order'] as $order) { - $query->orderBy($order['name'], $order['dir']); - } - } else { - $query->defaultSorting(); - } - return $query; - } - - /** - * Do some sorting, counting and ordering on the query and return a nicely formatted array - * that can be used by the DataTables JQuery plugin. - * - * @param array $parameters - * @param Builder $query - * - * @return array - */ - public function recurringTransactionsDataset(array $parameters, Builder $query) - { - /* - * Count query: - */ - $count = $query->count(); - - /* - * Update the selection: - */ - - $query->take($parameters['length']); - if ($parameters['start'] > 0) { - $query->skip($parameters['start']); - } - - /* - * Input search parameters: - */ - $filtered = $count; - if (strlen($parameters['search']['value']) > 0) { - $query->where('recurring_transactions.description', 'LIKE', '%' . e($parameters['search']['value']) . '%'); - $filtered = $query->count(); - } - - - /* - * Build return array: - */ - $data = [ - 'draw' => $parameters['draw'], - 'recordsTotal' => $count, - 'recordsFiltered' => $filtered, - 'data' => [], - - ]; - - /* - * Get paginated result set: - */ - /** @var Collection $set */ - $set = $query->get( - [ - 'recurring_transactions.*', - ] - ); - - /* - * Loop set and create entries to return. - */ - foreach ($set as $entry) { - $set = [ - - 'name' => ['name' => $entry->name, 'url' => route('recurring.show', $entry->id)], - 'match' => explode(' ', $entry->match), - 'amount_max' => floatval($entry->amount_max), - 'amount_min' => floatval($entry->amount_min), - 'date' => $entry->date->format('j F Y'), - 'active' => intval($entry->active), - 'automatch' => intval($entry->automatch), - 'repeat_freq' => $entry->repeat_freq, - 'id' => [ - 'edit' => route('recurring.edit', $entry->id), - 'delete' => route('recurring.delete', $entry->id) - ] - ]; - if (intval($entry->skip) > 0) { - $set['repeat_freq'] = $entry->repeat_freq . ' (skip ' . $entry->skip . ')'; - } - $data['data'][] = $set; - - - } - return $data; - } - - /** - * Create a query that will pick up all recurring transactions from the database. - * - * @param array $parameters - * - * @return Builder - */ - public function recurringTransactionsQuery(array $parameters) - { - $query = \RecurringTransaction::where('user_id', \Auth::user()->id); - - if (isset($parameters['order']) && count($parameters['order']) > 0) { - foreach ($parameters['order'] as $order) { - $query->orderBy($order['name'], $order['dir']); - } - } else { - $query->orderBy('name', 'ASC'); - } - return $query; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/JsonInterface.php b/app/lib/Firefly/Helper/Controllers/JsonInterface.php deleted file mode 100644 index 4e05d2f02e..0000000000 --- a/app/lib/Firefly/Helper/Controllers/JsonInterface.php +++ /dev/null @@ -1,64 +0,0 @@ -add('name', 'The name should not be this short.'); - } - if (strlen($data['name']) > 250) { - $errors->add('name', 'The name should not be this long.'); - } - if (! isset($data['id'])) { - $count = \Auth::user()->recurringtransactions()->whereName($data['name'])->count(); - } else { - $count = \Auth::user()->recurringtransactions()->whereName($data['name'])->where('id', '!=', $data['id'])->count(); - } - if ($count > 0) { - $errors->add('name', 'A recurring transaction with this name already exists.'); - } - if (count($errors->get('name')) == 0) { - $successes->add('name', 'OK!'); - } - - /* - * Match - */ - if (count(explode(',', $data['match'])) > 10) { - $warnings->add('match', 'This many matches is pretty pointless'); - } - if (strlen($data['match']) == 0) { - $errors->add('match', 'Cannot match on nothing.'); - } - if (count($errors->get('match')) == 0) { - $successes->add('match', 'OK!'); - } - - /* - * Amount - */ - if (floatval($data['amount_max']) == 0 && floatval($data['amount_min']) == 0) { - $errors->add('amount_min', 'Amount max and min cannot both be zero.'); - $errors->add('amount_max', 'Amount max and min cannot both be zero.'); - } - - if (floatval($data['amount_max']) < floatval($data['amount_min'])) { - $errors->add('amount_max', 'Amount max must be more than amount min.'); - } - - if (floatval($data['amount_min']) > floatval($data['amount_max'])) { - $errors->add('amount_max', 'Amount min must be less than amount max.'); - } - if (count($errors->get('amount_min')) == 0) { - $successes->add('amount_min', 'OK!'); - } - if (count($errors->get('amount_max')) == 0) { - $successes->add('amount_max', 'OK!'); - } - - - /* - * Date - */ - try { - $date = new Carbon($data['date']); - } catch (Exception $e) { - $errors->add('date', 'The date entered was invalid'); - } - if (strlen($data['date']) == 0) { - $errors->add('date', 'The date entered was invalid'); - } - if (!$errors->has('date')) { - $successes->add('date', 'OK!'); - } - - $successes->add('active', 'OK!'); - $successes->add('automatch', 'OK!'); - - if (intval($data['skip']) < 0) { - $errors->add('skip', 'Cannot be below zero.'); - } else if (intval($data['skip']) > 31) { - $errors->add('skip', 'Cannot be above 31.'); - } - if (count($errors->get('skip')) == 0) { - $successes->add('skip', 'OK!'); - } - - $set = \Config::get('firefly.budget_periods'); - if (!in_array($data['repeat_freq'], $set)) { - $errors->add('repeat_freq', 'Invalid value.'); - } - if (count($errors->get('repeat_freq')) == 0) { - $successes->add('repeat_freq', 'OK!'); - } - - return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes]; - - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/RecurringInterface.php b/app/lib/Firefly/Helper/Controllers/RecurringInterface.php deleted file mode 100644 index b14183201c..0000000000 --- a/app/lib/Firefly/Helper/Controllers/RecurringInterface.php +++ /dev/null @@ -1,15 +0,0 @@ -transactionjournals()->withRelevantData()->where( - function ($q) use ($words) { - foreach ($words as $word) { - $q->orWhere('description', 'LIKE', '%' . e($word) . '%'); - } - } - )->get(); - } - - /** - * @param array $words - * - * @return Collection - */ - public function searchAccounts(array $words) - { - return \Auth::user()->accounts()->with('accounttype')->where( - function ($q) use ($words) { - foreach ($words as $word) { - $q->orWhere('name', 'LIKE', '%' . e($word) . '%'); - } - } - )->get(); - } - - /** - * @param array $words - * - * @return Collection - */ - public function searchCategories(array $words) - { - /** @var Collection $set */ - $set = \Auth::user()->categories()->get(); - $newSet = $set->filter( - function (\Category $c) use ($words) { - $found = 0; - foreach ($words as $word) { - if (!(strpos(strtolower($c->name), strtolower($word)) === false)) { - $found++; - } - } - return $found > 0; - } - ); - return $newSet; - } - - /** - * @param array $words - * - * @return Collection - */ - public function searchBudgets(array $words) - { - /** @var Collection $set */ - $set = \Auth::user()->budgets()->get(); - $newSet = $set->filter( - function (\Budget $b) use ($words) { - $found = 0; - foreach ($words as $word) { - if (!(strpos(strtolower($b->name), strtolower($word)) === false)) { - $found++; - } - } - return $found > 0; - } - ); - return $newSet; - } - - /** - * @param array $words - * - * @return Collection - */ - public function searchTags(array $words) - { - return new Collection; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/SearchInterface.php b/app/lib/Firefly/Helper/Controllers/SearchInterface.php deleted file mode 100644 index 2af4e8918f..0000000000 --- a/app/lib/Firefly/Helper/Controllers/SearchInterface.php +++ /dev/null @@ -1,36 +0,0 @@ -_journals = $journals; - $this->_categories = $categories; - $this->_budgets = $budgets; - $this->_piggybanks = $piggybanks; - $this->_accounts = $accounts; - $this->overruleUser(\Auth::user()); - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - $this->_journals->overruleUser($user); - $this->_categories->overruleUser($user); - $this->_budgets->overruleUser($user); - $this->_piggybanks->overruleUser($user); - $this->_accounts->overruleUser($user); - return true; - } - - /** - * @param \TransactionJournal $journal - * @param array $data - * - * @return MessageBag|\TransactionJournal - */ - public function update(\TransactionJournal $journal, array $data) - { - /* - * Update the journal using the repository. - */ - $journal = $this->_journals->update($journal, $data); - - /* - * If invalid, return the message bag: - */ - if (!$journal->validate()) { - return $journal->errors(); - } - - /* - * find budget using repository - */ - - if (isset($data['budget_id'])) { - $budget = $this->_budgets->find($data['budget_id']); - } - - /* - * find category using repository - */ - $category = $this->_categories->firstOrCreate($data['category']); - - /* - * Find piggy bank using repository: - */ - $piggybank = null; - if (isset($data['piggybank_id'])) { - $piggybank = $this->_piggybanks->find($data['piggybank_id']); - } - - /* - * save accounts using repositories - * this depends on the kind of transaction and i've yet to fix this. - */ - - if (isset($data['account_id'])) { - $from = $this->_accounts->findAssetAccountById($data['account_id']); - } - if (isset($data['expense_account'])) { - $to = $this->_accounts->findExpenseAccountByName($data['expense_account']); - } - if (isset($data['revenue_account'])) { - $from = $this->_accounts->findRevenueAccountByName($data['revenue_account']); - $to = $this->_accounts->findAssetAccountById($data['account_id']); - } - if (isset($data['account_from_id'])) { - $from = $this->_accounts->findAssetAccountById($data['account_from_id']); - } - if (isset($data['account_to_id'])) { - $to = $this->_accounts->findAssetAccountById($data['account_to_id']); - } - - - /* - * Add a custom error when they are the same. - */ - if ($to->id == $from->id) { - $bag = new MessageBag; - $bag->add('account_from_id', 'The account from cannot be the same as the account to.'); - return $bag; - } - - /* - * Check if the transactions need new data: - */ - $transactions = $journal->transactions()->orderBy('amount', 'ASC')->get(); - /** @var \Transaction $transaction */ - foreach ($transactions as $index => $transaction) { - switch (true) { - case ($index == 0): // FROM account - $transaction->account()->associate($from); - $transaction->amount = floatval($data['amount']) * -1; - break; - case ($index == 1): // TO account. - $transaction->account()->associate($to); - $transaction->amount = floatval($data['amount']); - break; - } - $transaction->save(); - // either way, try to attach the piggy bank: - if (!is_null($piggybank)) { - if ($piggybank->account_id == $transaction->account_id) { - $transaction->piggybank()->associate($piggybank); - } - } - } - - /* - * Connect budget and category: - */ - $budgetids = !isset($budget) || (isset($budget) && is_null($budget)) ? [] : [$budget->id]; - $catids = is_null($category) ? [] : [$category->id]; - $components = array_merge($budgetids,$catids); - $journal->components()->sync($components); - $journal->save(); - - if (isset($data['return_journal']) && $data['return_journal'] == true) { - return $journal; - } - return $journal->errors(); - - } - - /** - * Returns messages about the validation. - * - * @param array $data - * @return array - * @throws FireflyException - */ - public function validate(array $data) - { - $errors = new MessageBag; - $warnings = new MessageBag; - $successes = new MessageBag; - - /* - * Description: - */ - if (strlen($data['description']) == 0) { - $errors->add('description', 'The description should not be this short.'); - } - if (strlen($data['description']) > 250) { - $errors->add('description', 'The description should not be this long.'); - } - - /* - * Amount - */ - if (floatval($data['amount']) <= 0) { - $errors->add('amount', 'The amount cannot be zero or less than zero.'); - } - if (floatval($data['amount']) > 10000) { - $warnings->add('amount', 'OK, but that\'s a lot of money dude.'); - } - - /* - * Date - */ - try { - $date = new Carbon($data['date']); - } catch (Exception $e) { - $errors->add('date', 'The date entered was invalid'); - } - if (strlen($data['date']) == 0) { - $errors->add('date', 'The date entered was invalid'); - } - if (!$errors->has('date')) { - $successes->add('date', 'OK!'); - } - - /* - * Category - */ - $category = $this->_categories->findByName($data['category']); - if (strlen($data['category']) == 0) { - $warnings->add('category', 'No category will be created.'); - } else { - if (is_null($category)) { - $warnings->add('category', 'Will have to be created.'); - } else { - $successes->add('category', 'OK!'); - } - } - - switch ($data['what']) { - default: - throw new FireflyException('Cannot validate a ' . $data['what']); - break; - case 'deposit': - /* - * Tests for deposit - */ - // asset account - $accountId = isset($data['account_id']) ? intval($data['account_id']) : 0; - $account = $this->_accounts->find($accountId); - if (is_null($account)) { - $errors->add('account_id', 'Cannot find this asset account.'); - } else { - $successes->add('account_id', 'OK!'); - } - - // revenue account: - if (strlen($data['revenue_account']) == 0) { - $warnings->add('revenue_account', 'Revenue account will be "cash".'); - } else { - $exp = $this->_accounts->findRevenueAccountByName($data['revenue_account'], false); - if (is_null($exp)) { - $warnings->add('revenue_account', 'Expense account will be created.'); - } else { - $successes->add('revenue_account', 'OK!'); - } - } - - break; - case 'transfer': - // account from - $accountId = isset($data['account_from_id']) ? intval($data['account_from_id']) : 0; - $account = $this->_accounts->find($accountId); - if (is_null($account)) { - $errors->add('account_from_id', 'Cannot find this asset account.'); - } else { - $successes->add('account_from_id', 'OK!'); - } - unset($accountId); - // account to - $accountId = isset($data['account_to_id']) ? intval($data['account_to_id']) : 0; - $account = $this->_accounts->find($accountId); - if (is_null($account)) { - $errors->add('account_to_id', 'Cannot find this asset account.'); - } else { - $successes->add('account_to_id', 'OK!'); - } - unset($accountId); - - // piggy bank - $piggybankId = isset($data['piggybank_id']) ? intval($data['piggybank_id']) : 0; - $piggybank = $this->_piggybanks->find($piggybankId); - if (is_null($piggybank)) { - $warnings->add('piggybank_id', 'No piggy bank will be modified.'); - } else { - $successes->add('piggybank_id', 'OK!'); - } - - break; - case 'withdrawal': - /* - * Tests for withdrawal - */ - // asset account - $accountId = isset($data['account_id']) ? intval($data['account_id']) : 0; - $account = $this->_accounts->find($accountId); - if (is_null($account)) { - $errors->add('account_id', 'Cannot find this asset account.'); - } else { - $successes->add('account_id', 'OK!'); - } - - // expense account - if (strlen($data['expense_account']) == 0) { - $warnings->add('expense_account', 'Expense account will be "cash".'); - } else { - $exp = $this->_accounts->findExpenseAccountByName($data['expense_account'], false); - if (is_null($exp)) { - $warnings->add('expense_account', 'Expense account will be created.'); - } else { - $successes->add('expense_account', 'OK!'); - } - } - - // budget - if (!isset($data['budget_id']) || (isset($data['budget_id']) && intval($data['budget_id']) == 0)) { - $warnings->add('budget_id', 'No budget selected.'); - } else { - $budget = $this->_budgets->find(intval($data['budget_id'])); - if (is_null($budget)) { - $errors->add('budget_id', 'This budget does not exist'); - } else { - $successes->add('budget_id', 'OK!'); - } - } - - break; - } - - if (count($errors->get('description')) == 0) { - $successes->add('description', 'OK!'); - } - - if (count($errors->get('amount')) == 0) { - $successes->add('amount', 'OK!'); - } - - return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes]; - /* - * Tests for deposit - */ - /* - * Tests for transfer - */ - - } - - /** - * Store a full transaction journal and associated stuff - * - * @param array $data - * - * @return MessageBag|\TransactionJournal - * - * @SuppressWarnings(PHPMD.ShortVariable) - */ - public function store(array $data) - { - /* - * save journal using repository - */ - $journal = $this->_journals->store($data); - - /* - * If invalid, return the message bag: - */ - if (!$journal->validate()) { - return $journal->errors(); - } - - /* - * find budget using repository - */ - if (isset($data['budget_id'])) { - $budget = $this->_budgets->find($data['budget_id']); - } - - /* - * find category using repository - */ - $category = $this->_categories->firstOrCreate($data['category']); - - /* - * Find piggy bank using repository: - */ - $piggybank = null; - if (isset($data['piggybank_id'])) { - $piggybank = $this->_piggybanks->find($data['piggybank_id']); - } - - /* - * save accounts using repositories - * this depends on the kind of transaction and i've yet to fix this. - */ - if (isset($data['account_id'])) { - $from = $this->_accounts->findAssetAccountById($data['account_id']); - } - if (isset($data['expense_account'])) { - $to = $this->_accounts->findExpenseAccountByName($data['expense_account']); - - } - if (isset($data['revenue_account'])) { - $from = $this->_accounts->findRevenueAccountByName($data['revenue_account']); - $to = $this->_accounts->findAssetAccountById($data['account_id']); - } - if (isset($data['account_from_id'])) { - $from = $this->_accounts->findAssetAccountById($data['account_from_id']); - } - if (isset($data['account_to_id'])) { - $to = $this->_accounts->findAssetAccountById($data['account_to_id']); - } - - /* - * Add a custom error when they are the same. - */ - if ($to->id == $from->id) { - $bag = new MessageBag; - $bag->add('account_from_id', 'The account from cannot be the same as the account to.'); - return $bag; - } - - /* - * Save transactions using repository. We try to connect the (possibly existing) - * piggy bank to either transaction, knowing it will only work with one of them. - */ - /** @var \Transaction $one */ - $one = $this->_journals->saveTransaction($journal, $from, floatval($data['amount']) * -1); - $one->connectPiggybank($piggybank); - $two = $this->_journals->saveTransaction($journal, $to, floatval($data['amount'])); - $two->connectPiggybank($piggybank); - /* - * Count for $journal is zero? Then there were errors! - */ - if ($journal->transactions()->count() < 2) { - /* - * Join message bags and return them: - */ - $bag = $one->errors(); - $bag->merge($two->errors()); - return $bag; - } - - /* - * Connect budget, category and piggy bank: - */ - if (isset($budget) && !is_null($budget)) { - $journal->budgets()->save($budget); - } - if (!is_null($category)) { - $journal->categories()->save($category); - } - $journal->completed = true; - $journal->save(); - - /* - * Trigger recurring transaction event. - */ - \Event::fire('journals.store',[$journal]); - - if (isset($data['return_journal']) && $data['return_journal'] == true) { - return ['journal' => $journal, 'messagebag' => $journal->errors()]; - } - return $journal->errors(); - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Controllers/TransactionInterface.php b/app/lib/Firefly/Helper/Controllers/TransactionInterface.php deleted file mode 100644 index 0c481b1494..0000000000 --- a/app/lib/Firefly/Helper/Controllers/TransactionInterface.php +++ /dev/null @@ -1,48 +0,0 @@ -reset = $reset; - $user->forceSave(); - $email = $user->email; - $data = ['reset' => $reset]; - - \Mail::send( - ['emails.user.verify-html', 'emails.user.verify-text'], $data, function ($message) use ($email) { - $message->to($email, $email)->subject('Verify your e-mail address.'); - } - ); - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function sendPasswordMail(\User $user) - { - - $password = \Str::random(12); - $user->password = $password; - $user->reset = \Str::random(32); // new one. - $user->forceSave(); - $email = $user->email; - - - $data = ['password' => $password]; - \Mail::send( - ['emails.user.register-html', 'emails.user.register-text'], $data, function ($message) use ($email) { - $message->to($email, $email)->subject('Welcome to Firefly!'); - } - ); - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function sendResetVerification(\User $user) - { - $reset = \Str::random(32); - $user->reset = $reset; - $user->forceSave(); - $email = $user->email; - - $data = ['reset' => $reset]; - \Mail::send( - ['emails.user.remindme-html', 'emails.user.remindme-text'], $data, function ($message) use ($email) { - $message->to($email, $email)->subject('Forgot your password?'); - } - ); - - - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Email/EmailHelperInterface.php b/app/lib/Firefly/Helper/Email/EmailHelperInterface.php deleted file mode 100644 index 48a49d0d02..0000000000 --- a/app/lib/Firefly/Helper/Email/EmailHelperInterface.php +++ /dev/null @@ -1,34 +0,0 @@ -app->bind( - 'Firefly\Helper\Controllers\AccountInterface', - 'Firefly\Helper\Controllers\Account' - ); - $this->app->bind( - 'Firefly\Helper\Controllers\ChartInterface', - 'Firefly\Helper\Controllers\Chart' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\JsonInterface', - 'Firefly\Helper\Controllers\Json' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\RecurringInterface', - 'Firefly\Helper\Controllers\Recurring' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\SearchInterface', - 'Firefly\Helper\Controllers\Search' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\TransactionInterface', - 'Firefly\Helper\Controllers\Transaction' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\CategoryInterface', - 'Firefly\Helper\Controllers\Category' - ); - - $this->app->bind( - 'Firefly\Helper\Controllers\BudgetInterface', - 'Firefly\Helper\Controllers\Budget' - ); - - // mail: - $this->app->bind( - 'Firefly\Helper\Email\EmailHelperInterface', - 'Firefly\Helper\Email\EmailHelper' - ); - - // settings: - $this->app->bind( - 'Firefly\Helper\Preferences\PreferencesHelperInterface', - 'Firefly\Helper\Preferences\PreferencesHelper' - ); - // settings: - $this->app->bind( - 'Firefly\Helper\Toolkit\ToolkitInterface', - 'Firefly\Helper\Toolkit\Toolkit' - ); - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Preferences/PreferencesHelper.php b/app/lib/Firefly/Helper/Preferences/PreferencesHelper.php deleted file mode 100644 index e212fca757..0000000000 --- a/app/lib/Firefly/Helper/Preferences/PreferencesHelper.php +++ /dev/null @@ -1,58 +0,0 @@ -id)->where('name', $name)->first(); - if (is_null($default) && is_null($pref)) { - // return NULL - return null; - } - if (!is_null($pref)) { - return $pref; - } - if (!is_null($default) && is_null($pref)) { - // create preference, return that: - return $this->set($name, $default); - } - - return null; - - } - - /** - * @param $name - * @param $value - * - * @return mixed|\Preference - */ - public function set($name, $value) - { - $pref = \Preference::where('user_id', \Auth::user()->id)->where('name', $name)->first(); - if (is_null($pref)) { - $pref = new \Preference; - $pref->name = $name; - $pref->user()->associate(\Auth::user()); - - } - $pref->data = $value; - $pref->save(); - - - return $pref; - - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Preferences/PreferencesHelperInterface.php b/app/lib/Firefly/Helper/Preferences/PreferencesHelperInterface.php deleted file mode 100644 index cb6d279825..0000000000 --- a/app/lib/Firefly/Helper/Preferences/PreferencesHelperInterface.php +++ /dev/null @@ -1,29 +0,0 @@ -_getRange(); - #\Log::debug('Range is: ' . $range); - $start = \Session::has('start') ? \Session::get('start') : new Carbon; - - #\Log::debug('Session start is: ' . $start->format('Y-m-d')); - $end = \Session::has('end') ? \Session::get('end') : new Carbon; - #\Log::debug('Session end is : ' . $end->format('Y-m-d')); - - /* - * Force start date to at the start of the $range. - * Ie. the start of the week, month, year. - */ - $start = $this->_updateStartDate($range, $start); - #\Log::debug('After update, session start is: ' . $start->format('Y-m-d')); - - /* - * Force end date to at the END of the $range. Always based on $start. - * Ie. the END of the week, month, year. - */ - $end = $this->_updateEndDate($range, $start); - #\Log::debug('After update, session end is : ' . $end->format('Y-m-d')); - - /* - * get the name of the month, depending on the range. Purely for astetics - */ - $period = $this->_periodName($range, $start); - - /* - * Get the date for the previous and next period. - * Ie. next week, next month, etc. - */ - $prev = $this->_previous($range, clone $start); - $next = $this->_next($range, clone $start); - - /* - * Save everything in the session: - */ - \Session::put('start', $start); - \Session::put('end', $end); - \Session::put('range', $range); - \Session::put('period', $period); - \Session::put('prev', $this->_periodName($range, $prev)); - \Session::put('next', $this->_periodName($range, $next)); - return null; - - } - - /** - * - */ - public function checkImportJobs() - { - /* - * Get all jobs. - */ - /** @var \Importmap $importJob */ - $importJob = \Importmap::where('user_id', \Auth::user()->id) - ->where('totaljobs', '>', \DB::Raw('`jobsdone`')) - ->orderBy('created_at', 'DESC') - ->first(); - if (!is_null($importJob)) { - $diff = intval($importJob->totaljobs) - intval($importJob->jobsdone); - $date = new Carbon; - $today = new Carbon; - $date->addSeconds($diff); - \Session::put('job_pct', $importJob->pct()); - \Session::put('job_text', $date->diffForHumans()); - } else { - \Session::forget('job_pct'); - \Session::forget('job_text'); - } - } - - protected function _getRange() - { - if (!is_null(\Session::get('range'))) { - $range = \Session::get('range'); - } else { - /** @noinspection PhpUndefinedClassInspection */ - $preferences = \App::make('Firefly\Helper\Preferences\PreferencesHelperInterface'); - $viewRange = $preferences->get('viewRange', '1M'); - - // default range: - $range = $viewRange->data; - \Session::put('range', $range); - } - return $range; - - } - - /** - * @param $range - * @param Carbon $start - * - * @return Carbon - */ - protected function _updateStartDate($range, Carbon $start) - { - switch ($range) { - case '1D': - $start->startOfDay(); - break; - case '1W': - $start->startOfWeek(); - break; - case '1M': - $start->startOfMonth(); - break; - case '3M': - $start->firstOfQuarter(); - break; - case '6M': - if (intval($start->format('m')) >= 7) { - $start->startOfYear()->addMonths(6); - } else { - $start->startOfYear(); - } - break; - case '1Y': - $start->startOfYear(); - break; - } - - return $start; - - } - - /** - * @param $range - * @param Carbon $start - * @param Carbon $end - * - * @return Carbon - */ - protected function _updateEndDate($range, Carbon $start) - { - $end = clone $start; - switch ($range) { - default: - throw new FireflyException('_updateEndDate cannot handle $range ' . $range); - break; - case '1D': - $end->endOfDay(); - break; - case '1W': - $end->endOfWeek(); - break; - case '1M': - $end->endOfMonth(); - break; - case '3M': - $end->lastOfQuarter(); - break; - case '6M': - if (intval($start->format('m')) >= 7) { - $end->endOfYear(); - } else { - $end->startOfYear()->addMonths(6); - } - break; - case '1Y': - $end->endOfYear(); - break; - - } - - return $end; - } - - protected function _periodName($range, Carbon $date) - { - switch ($range) { - default: - throw new FireflyException('No _periodName() for range "' . $range . '"'); - break; - case '1D': - return $date->format('jS F Y'); - break; - case '1W': - return 'week ' . $date->format('W, Y'); - break; - case '1M': - return $date->format('F Y'); - break; - case '3M': - $month = intval($date->format('m')); - return 'Q' . ceil(($month / 12) * 4) . ' ' . $date->format('Y'); - break; - case '6M': - $month = intval($date->format('m')); - $half = ceil(($month / 12) * 2); - $halfName = $half == 1 ? 'first' : 'second'; - return $halfName . ' half of ' . $date->format('d-m-Y'); - break; - case '1Y': - return $date->format('Y'); - break; - - - } - } - - protected function _previous($range, Carbon $date) - { - switch ($range) { - default: - throw new FireflyException('Cannot do _previous() on ' . $range); - break; - case '1D': - $date->startOfDay()->subDay(); - break; - case '1W': - $date->startOfWeek()->subWeek(); - break; - case '1M': - $date->startOfMonth()->subMonth(); - break; - case '3M': - $date->firstOfQuarter()->subMonths(3)->firstOfQuarter(); - break; - case '6M': - $month = intval($date->format('m')); - if ($month <= 6) { - $date->startOfYear()->subMonths(6); - } else { - $date->startOfYear(); - } - break; - case '1Y': - $date->startOfYear()->subYear(); - break; - - } - return $date; - } - - protected function _next($range, Carbon $date) - { - switch ($range) { - case '1D': - $date->endOfDay()->addDay(); - break; - case '1W': - $date->endOfWeek()->addDay()->startOfWeek(); - break; - case '1M': - $date->endOfMonth()->addDay()->startOfMonth(); - break; - case '3M': - $date->lastOfQuarter()->addDay(); - break; - case '6M': - if (intval($date->format('m')) >= 7) { - $date->startOfYear()->addYear(); - } else { - $date->startOfYear()->addMonths(6); - } - break; - case '1Y': - $date->startOfYear()->addYear(); - break; - default: - throw new FireflyException('Cannot do _next() on ' . $range); - break; - } - return $date; - } - - public function next() - { - /* - * Get the start date and the range from the session - */ - $range = $this->_getRange(); - $start = \Session::get('start'); - - /* - * Add some period to $start. - */ - $next = $this->_next($range, clone $start); - - /* - * Save in session: - */ - \Session::put('start', $next); - return true; - } - - public function prev() - { - /* - * Get the start date and the range from the session - */ - $range = $this->_getRange(); - $start = \Session::get('start'); - - /* - * Substract some period to $start. - */ - $prev = $this->_previous($range, clone $start); - - /* - * Save in session: - */ - \Session::put('start', $prev); - return true; - } - - /** - * Takes any collection and tries to make a sensible select list compatible array of it. - * - * @param Collection $set - * @param null $titleField - * - * @return mixed - */ - public function makeSelectList(Collection $set, $titleField = null) - { - $selectList = []; - /** @var Model $entry */ - foreach ($set as $entry) { - $id = intval($entry->id); - $title = null; - if (is_null($titleField)) { - // try 'title' field. - if (isset($entry->title)) { - $title = $entry->title; - } - // try 'name' field - if (is_null($title)) { - $title = $entry->name; - } - - // try 'description' field - if (is_null($title)) { - $title = $entry->description; - } - } else { - $title = $entry->$titleField; - } - $selectList[$id] = $title; - } - return $selectList; - } - - /** - * @param string $start - * @param string $end - * @param int $steps - */ - public function colorRange($start, $end, $steps = 5) - { - if (strlen($start) != 6) { - throw new FireflyException('Start, ' . e($start) . ' should be a six character HTML colour.'); - } - if (strlen($end) != 6) { - throw new FireflyException('End, ' . e($end) . ' should be a six character HTML colour.'); - } - if ($steps < 1) { - throw new FireflyException('Steps must be > 1'); - } - - $start = '#' . $start; - $end = '#' . $end; - /* - * Split html colours. - */ - list($rs, $gs, $bs) = sscanf($start, "#%02x%02x%02x"); - list($re, $ge, $be) = sscanf($end, "#%02x%02x%02x"); - - $stepr = ($re - $rs) / $steps; - $stepg = ($ge - $gs) / $steps; - $stepb = ($be - $bs) / $steps; - - $return = []; - for ($i = 0; $i <= $steps; $i++) { - $cr = $rs + ($stepr * $i); - $cg = $gs + ($stepg * $i); - $cb = $bs + ($stepb * $i); - - $return[] = $this->rgb2html($cr, $cg, $cb); - } - - return $return; - } - - protected function rgb2html($r, $g = -1, $b = -1) - { - $r = dechex($r < 0 ? 0 : ($r > 255 ? 255 : $r)); - $g = dechex($g < 0 ? 0 : ($g > 255 ? 255 : $g)); - $b = dechex($b < 0 ? 0 : ($b > 255 ? 255 : $b)); - - $color = (strlen($r) < 2 ? '0' : '') . $r; - $color .= (strlen($g) < 2 ? '0' : '') . $g; - $color .= (strlen($b) < 2 ? '0' : '') . $b; - return '#' . $color; - } - - /** - * @param Carbon $currentEnd - * @param $repeatFreq - * @throws FireflyException - */ - public function endOfPeriod(Carbon $currentEnd, $repeatFreq) - { - switch ($repeatFreq) { - default: - throw new FireflyException('Cannot do getFunctionForRepeatFreq for $repeat_freq ' . $repeatFreq); - break; - case 'daily': - $currentEnd->addDay(); - break; - case 'weekly': - $currentEnd->addWeek()->subDay(); - break; - case 'monthly': - $currentEnd->addMonth()->subDay(); - break; - case 'quarterly': - $currentEnd->addMonths(3)->subDay(); - break; - case 'half-year': - $currentEnd->addMonths(6)->subDay(); - break; - case 'yearly': - $currentEnd->addYear()->subDay(); - break; - } - } - - /** - * @param Carbon $date - * @param $repeatFreq - * @param $skip - * @return Carbon - * @throws FireflyException - */ - public function addPeriod(Carbon $date, $repeatFreq, $skip) - { - $add = ($skip + 1); - switch ($repeatFreq) { - default: - throw new FireflyException('Cannot do getFunctionForRepeatFreq for $repeat_freq ' . $repeatFreq); - break; - case 'daily': - $date->addDays($add); - break; - case 'weekly': - $date->addWeeks($add); - break; - case 'monthly': - $date->addMonths($add); - break; - case 'quarterly': - $months = $add * 3; - $date->addMonths($months); - break; - case 'half-year': - $months = $add * 6; - $date->addMonths($months); - break; - case 'yearly': - $date->addYears($add); - break; - } - return $date; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Helper/Toolkit/ToolkitInterface.php b/app/lib/Firefly/Helper/Toolkit/ToolkitInterface.php deleted file mode 100644 index aa02c9bca9..0000000000 --- a/app/lib/Firefly/Helper/Toolkit/ToolkitInterface.php +++ /dev/null @@ -1,52 +0,0 @@ -_accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $this->_repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - $this->_piggybanks = \App::make('Firefly\Storage\Piggybank\PiggybankRepositoryInterface'); - - - } - - /** - * The final step in the import routine is to get all transactions which have one of their accounts - * still set to "import", which means it is a cash transaction. This routine will set them all to cash instead. - * - * If there was no account present for these accounts in the import routine (no beneficiary set), Firefly - * II would fall back to the import account. - * - * @param Job $job - * @param array $payload - */ - public function cleanImportAccount(Job $job, array $payload) - { - - /** @var \Importmap $importMap */ - $importMap = $this->_repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - // two import account types. - $importAccountType = $this->_accounts->findAccountType('Import account'); - $cashAccountType = $this->_accounts->findAccountType('Cash account'); - - // find or create import account: - $importAccount = $this->_accounts->firstOrCreate( - [ - 'name' => 'Import account', - 'account_type_id' => $importAccountType->id, - 'active' => 1, - 'user_id' => $user->id, - ] - ); - - // find or create cash account: - $cashAccount = $this->_accounts->firstOrCreate( - [ - 'name' => 'Cash account', - 'account_type_id' => $cashAccountType->id, - 'active' => 1, - 'user_id' => $user->id, - ] - ); - - // update all users transactions: - $count = \DB::table('transactions') - ->where('account_id', $importAccount->id)->count(); - - \DB::table('transactions') - ->where('account_id', $importAccount->id) - ->update(['account_id' => $cashAccount->id]); - - \Log::debug('Updated ' . $count . ' transactions from Import Account to cash.'); - $job->delete(); // no count fix - } - - /** - * @param \User $user - */ - protected function overruleUser(\User $user) - { - $this->_accounts->overruleUser($user); - $this->_repository->overruleUser($user); - $this->_piggybanks->overruleUser($user); - } - - /** - * This job queues new jobs that will connect components to their proper transactions and updates the - * expense account: categories, budgets an beneficiaries used to be components. - * - * @param Job $job - * @param array $payload - */ - public function importComponentTransaction(Job $job, array $payload) - { - /** @var \Importmap $importMap */ - $importMap = $this->_repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * Took too long to fix this: - */ - if ($job->attempts() > 10) { - \Log::error('Could not map transaction to component after 10 tries. KILL'); - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - return; - } - - - /* - * Prep some vars from the payload - */ - $transactionId = intval($payload['data']['transaction_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * We don't know what kind of component we have. So we search for it. We have a specific function - * for this: - */ - $oldComponentMap = $this->_repository->findImportComponentMap($importMap, $componentId); - - /* - * If the map is null, the component (whatever it is) is not imported yet, and we release the job. - */ - if (is_null($oldComponentMap)) { - \Log::notice('No map for this component, release transaction/component import.'); - - /* - * When in sync, its pointless to release jobs. Simply remove them. - */ - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - - return; - } - - /* - * Switch on the class found in the map, and push a new job to update the transaction journal: - */ - switch ($oldComponentMap->class) { - default: - \Log::error('Cannot handle "' . $oldComponentMap->class . '" in component<>transaction routine!'); - $job->delete(); - break; - case 'Budget': - \Log::debug('Push job to connect budget to transaction #' . $transactionId); - \Queue::push( // count fixed - 'Firefly\Storage\Budget\BudgetRepositoryInterface@importUpdateTransaction', $payload - ); - $importMap->totaljobs++; - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - break; - case 'Category': - \Log::debug('Push job to connect category to transaction #' . $transactionId); - \Queue::push( // count fixed - 'Firefly\Storage\Category\CategoryRepositoryInterface@importUpdateTransaction', $payload - ); - - $importMap->totaljobs++; - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - break; - case 'Account': - \Log::debug('Push job to connect account to transaction #' . $transactionId); - \Queue::push( // count fixed - 'Firefly\Storage\Account\AccountRepositoryInterface@importUpdateTransaction', $payload - ); - - $importMap->totaljobs++; - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - break; - } - return; - - - } - - /** - * This job queues new jobs that will connect components to their proper transfers and updates the - * expense account: categories, budgets an beneficiaries used to be components. Even though not all - * of the transfers used to have these components, we check for them all. - * - * @param Job $job - * @param array $payload - */ - public function importComponentTransfer(Job $job, array $payload) - { - /** @var \Importmap $importMap */ - $importMap = $this->_repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * Took too long to fix this: - */ - if ($job->attempts() > 10) { - \Log::error('Could not map transaction to component after 10 tries. KILL'); - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - return; - } - - /* - * Prep some vars from the payload - */ - $transferId = intval($payload['data']['transfer_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * We don't know what kind of component we have. So we search for it. We have a specific function - * for this: - */ - $oldComponentMap = $this->_repository->findImportComponentMap($importMap, $componentId); - - /* - * If the map is null, the component (whatever it is) is not imported yet, and we release the job. - */ - if (is_null($oldComponentMap)) { - \Log::notice('No map for this component, release transfer/component import.'); - /* - * When in sync, its pointless to release jobs. Simply remove them. - */ - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Switch on the class found in the map, and push a new job to update the transaction journal: - */ - switch ($oldComponentMap->class) { - default: - \Log::error('Cannot handle "' . $oldComponentMap->class . '" in component<>transfer routine!'); - $job->delete(); - break; - case 'Category': - \Log::debug('Push job to connect category to transfer #' . $transferId); - \Queue::push( // count fixed - 'Firefly\Storage\Category\CategoryRepositoryInterface@importUpdateTransfer', $payload - ); - - $importMap->totaljobs++; - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - break; - case 'Budget': - \Log::debug('Push job to connect budget to transfer #' . $transferId); - \Queue::push( // count fixed - 'Firefly\Storage\Budget\BudgetRepositoryInterface@importUpdateTransfer', $payload - ); - $importMap->totaljobs++; - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - break; - } - - - } - - /** - * This job will see if the particular setting is a 'piggyAccount' setting, - * one we need to fix all imported piggy banks. - * - * @param Job $job - * @param array $payload - */ - public function importSetting(Job $job, array $payload) - { - /** @var \Importmap $importMap */ - $importMap = $this->_repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('No account found for piggyAccount setting after 10 tries. KILL!'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - $name = $payload['data']['name']; - switch ($name) { - default: - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed. - return; - break; - case 'piggyAccount': - - /* - * If user has this account, update all piggy banks: - */ - $accountID = intval($payload['data']['value']); - - /* - * Is account imported already? - */ - $importEntry = $this->_repository->findImportEntry($importMap, 'Account', $accountID); - - /* - * We imported this account already. - */ - if ($importEntry) { - $all = $this->_piggybanks->get(); - $account = $this->_accounts->find($importEntry->new); - /* - * Update all piggy banks. - */ - if (!is_null($account)) { - \Log::debug('Updating all piggybanks, found the right setting.'); - foreach ($all as $piggy) { - $piggy->account()->associate($account); - unset($piggy->leftInAccount); - $piggy->save(); - } - } - } else { - \Log::notice('Account not yet imported, hold or 5 minutes.'); - /* - * When in sync, its pointless to release jobs. Simply remove them. - */ - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - } - break; - } - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - - } - - /** - * This job will loop and queue jobs for the import file; almost every set of records will be imported. - * - * @param Job $job - * @param $payload - * - * @SuppressWarnings(PHPMD.CamelCasePropertyName) - */ - public function start(Job $job, array $payload) - { - \Log::debug('Start with job "start"'); - $user = \User::find($payload['user']); - $filename = $payload['file']; - if (file_exists($filename) && !is_null($user)) { - /* - * Make an import map. Need it to refer back to import. - */ - $importMap = new \Importmap; - $importMap->user()->associate($user); - $importMap->file = $filename; - $importMap->totaljobs = 0; - $importMap->jobsdone = 0; - $importMap->save(); - - $totalJobs = 0; - - /* - * Loop over all data in the JSON file, then create jobs. - */ - $raw = file_get_contents($filename); - $JSON = json_decode($raw); - - // first import all asset accounts: - foreach ($JSON->accounts as $entry) { - \Log::debug('Create job to import asset account'); - \Queue::push( // count fixed - 'Firefly\Storage\Account\AccountRepositoryInterface@importAccount', [ - 'data' => $entry, - 'class' => 'Account', - 'account_type' => 'Asset account', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // then import all beneficiaries: - foreach ($JSON->components as $entry) { - if ($entry->type->type == 'beneficiary') { - \Log::debug('Create job to import expense account'); - \Queue::push( // count fixed - 'Firefly\Storage\Account\AccountRepositoryInterface@importAccount', [ - 'data' => $entry, - 'class' => 'Account', - 'account_type' => 'Expense account', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - } - - // then import all categories. - foreach ($JSON->components as $entry) { - if ($entry->type->type == 'category') { - \Log::debug('Create job to import category'); - \Queue::push( // count fixed - 'Firefly\Storage\Category\CategoryRepositoryInterface@importCategory', [ - 'data' => $entry, - 'class' => 'Category', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - } - - // then import all budgets: - foreach ($JSON->components as $entry) { - if ($entry->type->type == 'budget') { - \Log::debug('Create job to import budget'); - \Queue::push( // count fixed - 'Firefly\Storage\Budget\BudgetRepositoryInterface@importBudget', [ - 'data' => $entry, - 'class' => 'Budget', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - } - - // then import all limits. - foreach ($JSON->limits as $entry) { - \Log::debug('Create job to import limit'); - \Queue::push( // count fixed - 'Firefly\Storage\Limit\LimitRepositoryInterface@importLimit', [ - 'data' => $entry, - 'class' => 'Limit', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // all piggy banks - foreach ($JSON->piggybanks as $entry) { - \Log::debug('Create job to import piggy bank'); - \Queue::push( // count fixed - 'Firefly\Storage\Piggybank\PiggybankRepositoryInterface@importPiggybank', [ - 'data' => $entry, - 'class' => 'Piggybank', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // all predictables. - foreach ($JSON->predictables as $entry) { - \Log::debug('Create job to import predictable'); - \Queue::push( // count fixed - 'Firefly\Storage\RecurringTransaction\RecurringTransactionRepositoryInterface@importPredictable', [ - 'data' => $entry, - 'class' => 'Predictable', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // all settings (to fix the piggy banks) - foreach ($JSON->settings as $entry) { - \Log::debug('Create job to import setting'); - \Queue::push( // count fixed - 'Firefly\Queue\Import@importSetting', [ - 'data' => $entry, - 'class' => 'Setting', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // all transactions - foreach ($JSON->transactions as $entry) { - - \Log::debug('Create job to import transaction'); - \Queue::push( // count fixed - 'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface@importTransaction', [ - 'data' => $entry, - 'class' => 'Transaction', - 'mapID' => $importMap->id - ] - ); - - $totalJobs++; - } - - // all transfers - foreach ($JSON->transfers as $entry) { - \Log::debug('Create job to import transfer'); - \Queue::push( // count fixed - 'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface@importTransfer', [ - 'data' => $entry, - 'class' => 'Transfer', - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - // then, fix all component <> transaction links - foreach ($JSON->component_transaction as $entry) { - \Log::debug('Create job to import components_transaction'); - \Queue::push( // count fixed - 'Firefly\Queue\Import@importComponentTransaction', - [ - 'data' => $entry, - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - - // then, fix all component <> transfer links - foreach ($JSON->component_transfer as $entry) { - \Log::debug('Create job to import components_transfer'); - \Queue::push( // count fixed - 'Firefly\Queue\Import@importComponentTransfer', - [ - 'data' => $entry, - 'mapID' => $importMap->id - ] - ); - $totalJobs++; - } - - $importMap->totaljobs = $totalJobs; - $importMap->save(); - /* - * We save the import map which now holds the number of jobs we've got planned. - */ - - \Queue::push('Firefly\Queue\Import@cleanImportAccount', ['mapID' => $importMap->id]); - - $job->delete(); // count fixed - - \Log::debug('Done with job "start"'); - } - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Account/AccountRepositoryInterface.php b/app/lib/Firefly/Storage/Account/AccountRepositoryInterface.php deleted file mode 100644 index 147aacaaff..0000000000 --- a/app/lib/Firefly/Storage/Account/AccountRepositoryInterface.php +++ /dev/null @@ -1,146 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @return mixed - */ - public function count() - { - return $this->_user->accounts()->count(); - - } - - /** - * @param \Account $account - * - * @return bool|mixed - */ - public function destroy(\Account $account) - { - // find all transaction journals related to this account: - $journals = \TransactionJournal::withRelevantData()->accountIs($account)->get(['transaction_journals.*']); - $accountIDs = []; - - /** @var \TransactionJournal $journal */ - foreach ($journals as $journal) { - // remember the account id's of the transactions involved: - foreach ($journal->transactions as $t) { - $accountIDs[] = $t->account_id; - } - $journal->delete(); - - } - $accountIDs = array_unique($accountIDs); - if (count($accountIDs) > 0) { - // find the "initial balance" type accounts in this list. Should be just 1. - $query = $this->_user->accounts()->accountTypeIn(['Initial balance account']) - ->whereIn('accounts.id', $accountIDs); - if ($query->count() == 1) { - $iba = $query->first(['accounts.*']); - $iba->delete(); - } - } - $account->delete(); - - /** - * - * - * Also delete: initial balance, initial balance account, and transactions - */ - - return true; - } - - /** - * @param $id - * - * @return |Account|null - */ - public function findAssetAccountById($id) - { - return $this->_user->accounts()->find($id); - } - - /** - * This method finds the expense account mentioned by name. This method is a sneaky little hobbits, - * because when you feed it "Import account" it will always return an import account of that type. - * - * @param $name - * @param $create - * - * @return null|\Account - */ - public function findExpenseAccountByName($name, $create = true) - { - $cashType = $this->findAccountType('Cash account'); - $importType = $this->findAccountType('Import account'); - // catch Import account: - if ($name == 'Import account') { - - $import = $this->firstOrCreate( - [ - 'name' => 'Import account', - 'user_id' => $this->_user->id, - 'account_type_id' => $importType->id, - 'active' => 1 - ] - ); - return $import; - } - - // find account: - - $account = $this->_user->accounts()->where('name', $name)->accountTypeIn( - ['Expense account', 'Beneficiary account'] - )->first(['accounts.*']); - - // create if not found: - if (strlen($name) > 0 && is_null($account) && $create === true) { - $type = $this->findAccountType('Expense account'); - $set = [ - 'name' => $name, - 'user_id' => $this->_user->id, - 'active' => 1, - 'account_type_id' => $type->id - ]; - $account = $this->firstOrCreate($set); - } else if (strlen($name) > 0 && is_null($account) && $create === false) { - return null; - } - - - // find cash account as fall back: - if (is_null($account)) { - - $account = $this->_user->accounts()->where('account_type_id', $cashType->id)->first(); - } - - // create cash account as ultimate fall back: - if (is_null($account)) { - $set = [ - 'name' => 'Cash account', - 'user_id' => $this->_user->id, - 'active' => 1, - 'account_type_id' => $cashType->id - ]; - $account = $this->firstOrCreate($set); - } - - if ($account->active == 0 && $account->account_type_id != $cashType->id) { - return null; - } - - return $account; - } - - /** - * @param $type - * - * @return \AccountType|null - */ - public function findAccountType($type) - { - return \AccountType::where('type', $type)->first(); - } - - public function firstOrCreate(array $data) - { - return \Account::firstOrCreate($data); - } - - /** - * @param $name - * @param $create - * - * @return |Account|null - */ - public function findRevenueAccountByName($name, $create = true) - { - // catch Import account: - if ($name == 'Import account') { - $importType = $this->findAccountType('Import account'); - $import = $this->firstOrCreate( - [ - 'name' => 'Import account', - 'user_id' => $this->_user->id, - 'account_type_id' => $importType->id, - 'active' => 1 - ] - ); - return $import; - } - - // find account: - $type = $this->findAccountType('Revenue account'); - $account = $this->_user->accounts()->where('name', $name)->where('account_type_id', $type->id)->first(); - - // create if not found: - if (strlen($name) > 0 && is_null($account) && $create === true) { - $set = [ - 'name' => $name, - 'user_id' => $this->_user->id, - 'active' => 1, - 'account_type_id' => $type->id - ]; - $account = $this->firstOrCreate($set); - } else if (strlen($name) > 0 && is_null($account) && $create === false) { - return null; - } - - // find cash account as fall back: - if (is_null($account)) { - $cashType = $this->findAccountType('Cash account'); - $account = $this->_user->accounts()->where('account_type_id', $cashType->id)->first(); - } - - // create cash account as ultimate fall back: - if (is_null($account)) { - $set = [ - 'name' => 'Cash account', - 'user_id' => $this->_user->id, - 'active' => 1, - 'account_type_id' => $cashType->id - ]; - $account = $this->firstOrCreate($set); - } - - if ($account->active == 0) { - return null; - } - - return $account; - } - - public function getByAccountType(\AccountType $type) - { - return $this->_user->accounts()->with('accounttype')->orderBy('name', 'ASC') - ->where('account_type_id', $type->id)->get(); - } - - /** - * @param $ids - * - * @return array|mixed - */ - public function getByIds(array $ids) - { - if (count($ids) > 0) { - return $this->_user->accounts()->with('accounttype')->whereIn('id', $ids)->orderBy('name', 'ASC')->get(); - } else { - return $this->getActiveDefault(); - } - } -// -// /** -// * @param $name -// * -// * @return \Account|mixed|null -// */ -// public function createOrFindBeneficiary($name) -// { -// if (is_null($name) || strlen($name) == 0) { -// return null; -// } -// $type = \AccountType::where('type', 'Expense account')->first(); -// return $this->createOrFind($name, $type); -// } -// -// /** -// * @param $name -// * @param \AccountType $type -// * -// * @return \Account|mixed -// */ -// public function createOrFind($name, \AccountType $type = null) -// { -// $account = $this->findByName($name, $type); -// if (!$account) { -// $data = [ -// 'name' => $name, -// 'account_type' => $type -// ]; -// -// return $this->store($data); -// } -// -// return $account; -// } -// -// /** -// * @param $name -// * @param \AccountType $type -// * -// * @return mixed -// */ -// public function findByName($name, \AccountType $type = null) -// { -// $type = is_null($type) ? \AccountType::where('type', 'Asset account')->first() : $type; -// -// return $this->_user->accounts()->where('account_type_id', $type->id) -// ->where('name', 'like', '%' . $name . '%') -// ->first(); -// } - - /** - * @return mixed - */ - public function getActiveDefault() - { - return $this->_user->accounts()->accountTypeIn(['Default account', 'Asset account'])->where( - 'accounts.active', 1 - ) - ->get(['accounts.*']); - } - - /** - * @return mixed - */ - public function getDefault() - { - return $this->_user->accounts()->accountTypeIn(['Default account', 'Asset account']) - ->orderBy('accounts.name', 'ASC')->get(['accounts.*']); - } - - /** - * Gets a list of accounts that have the mentioned type. Will automatically convert - * strings in this array to actual (model) account types. - * - * @param array $types - * - * @return Collection - */ - public function getOfTypes(array $types) - { - $accounts = $this->_user->accounts()->accountTypeIn($types)->get(['accounts.*']); - return $accounts; - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importAccount(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * maybe Account is already imported: - */ - $importEntry = $repository->findImportEntry($importMap, 'Account', intval($payload['data']['id'])); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported ' . $payload['data']['name'] . ' of type ' . $payload['account_type']); - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - return; - } - - /* - * find the payload's account type: - */ - $payload['account_type'] = isset($payload['account_type']) ? $payload['account_type'] : 'Expense account'; - $type = $this->findAccountType($payload['account_type']); - - /* - * Create data array for store() procedure. - */ - $data = [ - 'account_type' => $type, - 'name' => $payload['data']['name'], - ]; - if (isset($payload['data']['openingbalance'])) { - $data['openingbalance'] = floatval($payload['data']['openingbalance']); - $data['openingbalancedate'] = $payload['data']['openingbalancedate']; - } - if (isset($payload['data']['inactive'])) { - $data['active'] = intval($payload['data']['inactive']) == 0 ? 1 : 0; - } - - /* - * Try to store: - */ - $account = $this->store($data); - - /* - * Check for failure. - */ - if (count($account->errors()) > 0) { - \Log::error('Account creation error: ' . $account->errors()->first()); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - \Log::debug('Imported ' . $payload['account_type'] . ': ' . $payload['data']['name']); - - /* - * Save meta data - */ - $repository->store($importMap, 'Account', intval($payload['data']['id']), $account->id); - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed. - return; - } - -// /** -// * Used for import -// * -// * @param $name -// * -// * @return mixed -// */ -// public function findByNameAny($name) -// { -// return $this->_user->accounts() -// ->where('name', 'like', '%' . $name . '%') -// ->first(); -// } - - /** - * @param $data - * - * @return \Account - * @throws \Firefly\Exception\FireflyException - */ - public function store($data) - { - /** - * If the AccountType has been passed through, use it: - */ - if (isset($data['account_type']) && is_object($data['account_type']) - && get_class($data['account_type']) == 'AccountType' - ) { - $accountType = $data['account_type']; - } else if (isset($data['account_type']) && is_string($data['account_type'])) { - // if it isnt but set as string, find it: - $accountType = \AccountType::where('type', $data['account_type'])->first(); - - } else { - $accountType = \AccountType::where('type', 'Asset account')->first(); - } - $active = isset($data['active']) && intval($data['active']) >= 0 && intval($data['active']) <= 1 ? intval( - $data['active'] - ) : 1; - - /** - * Create new account: - */ - $account = new \Account; - $account->accountType()->associate($accountType); - $account->user()->associate($this->_user); - - $account->name = $data['name']; - $account->active - = isset($data['active']) && intval($data['active']) >= 0 && intval($data['active']) <= 1 ? intval( - $data['active'] - ) : 1; - - // try to save it: - try { - if ($account->save()) { - // create initial balance, if necessary: - if (isset($data['openingbalance']) && isset($data['openingbalancedate'])) { - $amount = floatval($data['openingbalance']); - $date = new Carbon($data['openingbalancedate']); - if ($amount != 0) { - $this->_createInitialBalance($account, $amount, $date); - } - } - } - } catch (QueryException $e) { - // do nothing - } - - - // whatever the result, return the account. - return $account; - } - - /** - * @param \Account $account - * @param int $amount - * @param Carbon $date - * - * @return bool - * @SuppressWarnings(PHPMD.CamelCaseMethodName) - */ - protected function _createInitialBalance(\Account $account, $amount = 0, Carbon $date) - { - /* - * The repositories we need: - */ - /** @var \Firefly\Helper\Controllers\TransactionInterface $transactions */ - $transactions = \App::make('Firefly\Helper\Controllers\TransactionInterface'); - $transactions->overruleUser($this->_user); - - - /* - * get account type: - */ - $initialBalanceAT = $this->findAccountType('Initial balance account'); - - /* - * create new account - */ - $initial = new \Account; - $initial->accountType()->associate($initialBalanceAT); - $initial->user()->associate($this->_user); - $initial->name = $account->name . ' initial balance'; - $initial->active = 0; - if ($initial->validate()) { - $initial->save(); - /* - * create new transaction journal (and transactions): - */ - - $set = [ - 'account_from_id' => $initial->id, - 'account_to_id' => $account->id, - 'description' => 'Initial Balance for ' . $account->name, - 'what' => 'Opening balance', - 'amount' => $amount, - 'category' => '', - 'date' => $date->format('Y-m-d') - ]; - $transactions->store($set); - - return true; - } - - return false; - } - - /** - * Takes a transaction/account component and updates the transaction journal to match. - * - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importUpdateTransaction(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('Never found budget/account combination "' . $payload['data']['transaction_id'] . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - return; - } - - /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $journals */ - $journals = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'); - $journals->overruleUser($user); - - /* - * Prep some vars from the payload - */ - $transactionId = intval($payload['data']['transaction_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * Find the import map for both: - */ - $accountMap = $repository->findImportEntry($importMap, 'Account', $componentId); - $transactionMap = $repository->findImportEntry($importMap, 'Transaction', $transactionId); - - /* - * Either may be null: - */ - if (is_null($accountMap) || is_null($transactionMap)) { - \Log::notice('No map found in account/transaction mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find the account and the transaction: - */ - $account = $this->find($accountMap->new); - /** @var \TransactionJournal $journal */ - $journal = $journals->find($transactionMap->new); - - /* - * If either is null, release: - */ - if (is_null($account) || is_null($journal)) { - \Log::notice('Map is incorrect in account/transaction mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Update one of the journal's transactions to have the right account: - */ - $importType = $this->findAccountType('Import account'); - /** @var \Transaction $transaction */ - $updated = false; - \Log::debug( - 'Connect "' . $account->name . '" (#' . $account->id . ') to "' . $journal->description . '" (#' - . $journal->id . ')' - ); - foreach ($journal->transactions as $index => $transaction) { - /* - * If it's of the right type, update it! - */ - \Log::debug( - 'Transaction ' . $index . ' (#' . $transaction->id . '): [' . $transaction->account->account_type_id - . ' vs. ' . $importType->id . ']' - ); - if ($transaction->account->account_type_id == $importType->id) { - $transaction->account()->associate($account); - $transaction->save(); - $updated = true; - \Log::debug( - 'Connected expense account "' . $account->name . '" to journal "' . $journal->description . '"' - ); - } - } - if ($updated === false) { - \Log::error( - 'Did not connect transactions of journal #' . $journal->id . ' to expense account ' . $account->id - ); - - } - - $journal->save(); - - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - /** - * @param $accountId - * - * @return mixed - */ - public function find($accountId) - { - return $this->_user->accounts()->where('id', $accountId)->first(); - } - - /** - * @param \Account $account - * @param $data - * - * @return \Account|mixed - */ - public function update(\Account $account, $data) - { - // update account accordingly: - $account->name = $data['name']; - if ($account->validate()) { - $account->save(); - } - // update initial balance if necessary: - if (isset($data['openingbalance']) && floatval($data['openingbalance']) != 0) { - - /** @var \Firefly\Helper\Controllers\AccountInterface $interface */ - $interface = \App::make('Firefly\Helper\Controllers\AccountInterface'); - - if ($account->accounttype->type == 'Default account' || $account->accounttype->type == 'Asset account') { - - - $journal = $interface->openingBalanceTransaction($account); - if ($journal) { - $journal->date = new Carbon($data['openingbalancedate']); - $journal->transactions[0]->amount = floatval($data['openingbalance']) * -1; - $journal->transactions[1]->amount = floatval($data['openingbalance']); - $journal->transactions[0]->save(); - $journal->transactions[1]->save(); - $journal->save(); - } - } - } - - return $account; - } - - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Budget/BudgetRepositoryInterface.php b/app/lib/Firefly/Storage/Budget/BudgetRepositoryInterface.php deleted file mode 100644 index 87de3a6ed9..0000000000 --- a/app/lib/Firefly/Storage/Budget/BudgetRepositoryInterface.php +++ /dev/null @@ -1,88 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importBudget(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * maybe Budget is already imported: - */ - $importEntry = $repository->findImportEntry($importMap, 'Budget', intval($payload['data']['id'])); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported budget ' . $payload['data']['name']); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /* - * maybe Budget is already imported. - */ - $budget = $this->findByName($payload['data']['name']); - - if (is_null($budget)) { - /* - * Not imported yet. - */ - $budget = $this->store($payload['data']); - $repository->store($importMap, 'Budget', $payload['data']['id'], $budget->id); - \Log::debug('Imported budget "' . $payload['data']['name'] . '".'); - } else { - /* - * already imported. - */ - $repository->store($importMap, 'Budget', $payload['data']['id'], $budget->id); - \Log::debug('Already had budget "' . $payload['data']['name'] . '".'); - } - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - // delete job. - $job->delete(); // count fixed - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - /** - * @param $budgetName - * - * @return \Budget|null - */ - public function findByName($budgetName) - { - - return $this->_user->budgets()->whereName($budgetName)->first(); - } - - /** - * @param $data - * - * @return \Budget - */ - public function store($data) - { - $budget = new \Budget; - $budget->name = $data['name']; - $budget->user()->associate($this->_user); - $budget->save(); - - // if limit, create limit (repetition itself will be picked up elsewhere). - if (isset($data['amount']) && floatval($data['amount']) > 0) { - $startDate = new Carbon; - $limitData = [ - 'budget_id' => $budget->id, - 'startdate' => $startDate->format('Y-m-d'), - 'period' => $data['repeat_freq'], - 'amount' => floatval($data['amount']), - 'repeats' => 0 - ]; - /** @var \Firefly\Storage\Limit\LimitRepositoryInterface $limitRepository */ - $limitRepository = \App::make('Firefly\Storage\Limit\LimitRepositoryInterface'); - $limitRepository->overruleUser($this->_user); - $limit = $limitRepository->store($limitData); - \Event::fire('limits.store', [$limit]); - } - - if ($budget->validate()) { - $budget->save(); - } - - return $budget; - } - - /** - * Takes a transfer/budget component and updates the transaction journal to match. - * - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importUpdateTransfer(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('Never found budget/transfer combination "' . $payload['data']['transfer_id'] . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - - /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $journals */ - $journals = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'); - $journals->overruleUser($user); - - /* - * Prep some vars from the payload - */ - $transferId = intval($payload['data']['transfer_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * Find the import map for both: - */ - $budgetMap = $repository->findImportEntry($importMap, 'Budget', $componentId); - $transferMap = $repository->findImportEntry($importMap, 'Transfer', $transferId); - - /* - * Either may be null: - */ - if (is_null($budgetMap) || is_null($transferMap)) { - \Log::notice('No map found in budget/transfer mapper. Release.'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find the budget and the transaction: - */ - $budget = $this->find($budgetMap->new); - /** @var \TransactionJournal $journal */ - $journal = $journals->find($transferMap->new); - - /* - * If either is null, release: - */ - if (is_null($budget) || is_null($journal)) { - \Log::notice('Map is incorrect in budget/transfer mapper. Release.'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Update journal to have budget: - */ - $journal->budgets()->save($budget); - $journal->save(); - \Log::debug('Connected budget "' . $budget->name . '" to journal "' . $journal->description . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - - return; - } - - /** - * Takes a transaction/budget component and updates the transaction journal to match. - * - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importUpdateTransaction(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('Never found budget/transaction combination "' . $payload['data']['transaction_id'] . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - - /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $journals */ - $journals = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'); - $journals->overruleUser($user); - - /* - * Prep some vars from the payload - */ - $transactionId = intval($payload['data']['transaction_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * Find the import map for both: - */ - $budgetMap = $repository->findImportEntry($importMap, 'Budget', $componentId); - $transactionMap = $repository->findImportEntry($importMap, 'Transaction', $transactionId); - - /* - * Either may be null: - */ - if (is_null($budgetMap) || is_null($transactionMap)) { - \Log::notice('No map found in budget/transaction mapper. Release.'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find the budget and the transaction: - */ - $budget = $this->find($budgetMap->new); - /** @var \TransactionJournal $journal */ - $journal = $journals->find($transactionMap->new); - - /* - * If either is null, release: - */ - if (is_null($budget) || is_null($journal)) { - \Log::notice('Map is incorrect in budget/transaction mapper. Release.'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Update journal to have budget: - */ - $journal->budgets()->save($budget); - $journal->save(); - \Log::debug('Connected budget "' . $budget->name . '" to journal "' . $journal->description . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - - return; - } - - /** - * @param $budgetId - * - * @return \Budget|null - */ - public function find($budgetId) - { - - return $this->_user->budgets()->find($budgetId); - } - - /** - * @param \Budget $budget - * - * @return bool - */ - public function destroy(\Budget $budget) - { - $budget->delete(); - - return true; - } - - /** - * @return Collection - */ - public function get() - { - $set = $this->_user->budgets()->with( - ['limits' => function ($q) { - $q->orderBy('limits.startdate', 'DESC'); - }, 'limits.limitrepetitions' => function ($q) { - $q->orderBy('limit_repetitions.startdate', 'ASC'); - }] - )->orderBy('name', 'ASC')->get(); - return $set; - } - - /** - * @param \Budget $budget - * @param $data - * - * @return \Budget|mixed - */ - public function update(\Budget $budget, $data) - { - // update account accordingly: - $budget->name = $data['name']; - if ($budget->validate()) { - $budget->save(); - } - - return $budget; - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Category/CategoryRepositoryInterface.php b/app/lib/Firefly/Storage/Category/CategoryRepositoryInterface.php deleted file mode 100644 index 15c6785548..0000000000 --- a/app/lib/Firefly/Storage/Category/CategoryRepositoryInterface.php +++ /dev/null @@ -1,95 +0,0 @@ -_user = \Auth::user(); - } - - /** - * Takes a transfer/category component and updates the transaction journal to match. - * - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importUpdateTransfer(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - - if ($job->attempts() > 10) { - \Log::error('Never found category/transfer combination "' . $payload['data']['transfer_id'] . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - return; - } - - - /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $journals */ - $journals = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'); - $journals->overruleUser($user); - - /* - * Prep some vars from the payload - */ - $transferId = intval($payload['data']['transfer_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * Find the import map for both: - */ - $categoryMap = $repository->findImportEntry($importMap, 'Category', $componentId); - $transferMap = $repository->findImportEntry($importMap, 'Transfer', $transferId); - - /* - * Either may be null: - */ - if (is_null($categoryMap) || is_null($transferMap)) { - \Log::notice('No map found in category/transfer mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find the budget and the transaction: - */ - $category = $this->find($categoryMap->new); - /** @var \TransactionJournal $journal */ - $journal = $journals->find($transferMap->new); - - /* - * If either is null, release: - */ - if (is_null($category) || is_null($journal)) { - \Log::notice('Map is incorrect in category/transfer mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Update journal to have budget: - */ - $journal->categories()->save($category); - $journal->save(); - \Log::debug('Connected category "' . $category->name . '" to journal "' . $journal->description . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - - return; - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - /** - * @param $categoryId - * - * @return mixed - */ - public function find($categoryId) - { - return $this->_user->categories()->find($categoryId); - } - - /** - * Takes a transaction/category component and updates the transaction journal to match. - * - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importUpdateTransaction(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - - if ($job->attempts() > 10) { - \Log::error('Never found category/transaction combination "' . $payload['data']['transaction_id'] . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - return; - } - - - /** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $journals */ - $journals = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface'); - $journals->overruleUser($user); - - /* - * Prep some vars from the payload - */ - $transactionId = intval($payload['data']['transaction_id']); - $componentId = intval($payload['data']['component_id']); - - /* - * Find the import map for both: - */ - $categoryMap = $repository->findImportEntry($importMap, 'Category', $componentId); - $transactionMap = $repository->findImportEntry($importMap, 'Transaction', $transactionId); - - /* - * Either may be null: - */ - if (is_null($categoryMap) || is_null($transactionMap)) { - \Log::notice('No map found in category/transaction mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find the budget and the transaction: - */ - $category = $this->find($categoryMap->new); - /** @var \TransactionJournal $journal */ - $journal = $journals->find($transactionMap->new); - - /* - * If either is null, release: - */ - if (is_null($category) || is_null($journal)) { - \Log::notice('Map is incorrect in category/transaction mapper. Release.'); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Update journal to have budget: - */ - $journal->categories()->save($category); - $journal->save(); - \Log::debug('Connected category "' . $category->name . '" to journal "' . $journal->description . '"'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - - return; - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importCategory(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * Maybe the category has already been imported - */ - $importEntry = $repository->findImportEntry($importMap, 'Category', intval($payload['data']['id'])); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported category ' . $payload['data']['name']); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /* - * try to find category first - */ - $current = $this->findByName($payload['data']['name']); - - /* - * If not found, create it: - */ - if (is_null($current)) { - $category = $this->store($payload['data']); - $repository->store($importMap, 'Category', $payload['data']['id'], $category->id); - \Log::debug('Imported category "' . $payload['data']['name'] . '".'); - } else { - $repository->store($importMap, 'Category', $payload['data']['id'], $current->id); - \Log::debug('Already had category "' . $payload['data']['name'] . '".'); - } - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /** - * @param $name - * - * @return mixed - */ - public function findByName($name) - { - if ($name == '' || strlen($name) == 0) { - return null; - } - - return $this->_user->categories()->where('name', $name)->first(); - - } - - /** - * @param $data - * - * @return \Category|mixed - */ - public function store($data) - { - $category = new \Category; - $category->name = $data['name']; - - $category->user()->associate($this->_user); - $category->save(); - - return $category; - } - - /** - * @param $name - * - * @return \Category|mixed - */ - public function firstOrCreate($name) - { - if (strlen($name) == 0) { - return null; - } - $data = [ - 'name' => $name, - 'user_id' => $this->_user->id, - ]; - return \Category::firstOrCreate($data); - - } - - /** - * @param $category - * - * @return bool|mixed - */ - public function destroy($category) - { - $category->delete(); - - return true; - } - - /** - * @return mixed - */ - public function get() - { - return $this->_user->categories()->orderBy('name', 'ASC')->get(); - } - - /** - * @param $category - * @param $data - * - * @return mixed - */ - public function update($category, $data) - { - // update account accordingly: - $category->name = $data['name']; - if ($category->validate()) { - $category->save(); - } - - return $category; - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Import/EloquentImportRepository.php b/app/lib/Firefly/Storage/Import/EloquentImportRepository.php deleted file mode 100644 index 2cc1139fa1..0000000000 --- a/app/lib/Firefly/Storage/Import/EloquentImportRepository.php +++ /dev/null @@ -1,58 +0,0 @@ -_user = \Auth::user(); - } - - public function findImportComponentMap(\Importmap $map, $oldComponentId) - { - $entry = \Importentry::where('importmap_id', $map->id) - ->whereIn('class', ['Budget', 'Category', 'Account', 'Component']) - ->where('old', intval($oldComponentId))->first(); - - return $entry; - } - - public function findImportEntry(\Importmap $map, $class, $oldID) - { - - return \Importentry::where('importmap_id', $map->id)->where('class', $class)->where('old', $oldID)->first(); - } - - public function findImportMap($id) - { - return \Importmap::find($id); - } - - /** - * @param \User $user - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - public function store(\Importmap $map, $class, $oldID, $newID) - { - $entry = new \Importentry; - $entry->importmap()->associate($map); - $entry->class = $class; - $entry->old = intval($oldID); - $entry->new = intval($newID); - $entry->save(); - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Import/ImportRepositoryInterface.php b/app/lib/Firefly/Storage/Import/ImportRepositoryInterface.php deleted file mode 100644 index e5a12eeb48..0000000000 --- a/app/lib/Firefly/Storage/Import/ImportRepositoryInterface.php +++ /dev/null @@ -1,51 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importLimit(Job $job, array $payload) - { - - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error( - 'No budget found for limit #' . $payload['data']['id'] . '. Prob. for another component. KILL!' - ); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - return; - } - - /** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgets */ - $budgets = \App::make('Firefly\Storage\Budget\BudgetRepositoryInterface'); - $budgets->overruleUser($user); - - /* - * Find the budget this limit is part of: - */ - $importEntry = $repository->findImportEntry($importMap, 'Budget', intval($payload['data']['component_id'])); - - /* - * There is no budget (yet?) - */ - if (is_null($importEntry)) { - $componentId = intval($payload['data']['component_id']); - \Log::warning('Budget #' . $componentId . ' not found. Requeue import job.'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * Find budget import limit is for: - */ - $budget = $budgets->find($importEntry->new); - if (!is_null($budget)) { - /* - * Is actual limit already imported? - */ - $limit = $this->findByBudgetAndDate($budget, new Carbon($payload['data']['date'])); - if (is_null($limit)) { - /* - * It isn't imported yet. - */ - $payload['data']['budget_id'] = $budget->id; - $payload['data']['startdate'] = $payload['data']['date']; - $payload['data']['period'] = 'monthly'; - /* - * Store limit, and fire event for LimitRepetition. - */ - $limit = $this->store($payload['data']); - $repository->store($importMap, 'Limit', $payload['data']['id'], $limit->id); - \Event::fire('limits.store', [$limit]); - \Log::debug('Imported limit for budget ' . $budget->name); - } else { - /* - * Limit already imported: - */ - $repository->store($importMap, 'Budget', $payload['data']['id'], $limit->id); - } - } else { - \Log::error(print_r($importEntry,true)); - \Log::error('Cannot import limit! Big bad error!'); - } - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - public function findByBudgetAndDate(\Budget $budget, Carbon $date) - { - return \Limit::whereComponentId($budget->id)->where('startdate', $date->format('Y-m-d'))->first(); - } - - /** - * @param $data - * - * @return \Limit - */ - public function store($data) - { - $budget = \Budget::find($data['budget_id']); - if (is_null($budget)) { - \Session::flash('error', 'No such budget.'); - - return new \Limit; - } - // set the date to the correct start period: - $date = new Carbon($data['startdate']); - switch ($data['period']) { - case 'daily': - $date->startOfDay(); - break; - case 'weekly': - $date->startOfWeek(); - break; - case 'monthly': - $date->startOfMonth(); - break; - case 'quarterly': - $date->firstOfQuarter(); - break; - case 'half-year': - - if (intval($date->format('m')) >= 7) { - $date->startOfYear(); - $date->addMonths(6); - } else { - $date->startOfYear(); - } - break; - case 'yearly': - $date->startOfYear(); - break; - } - // find existing: - $count = \Limit:: - leftJoin('components', 'components.id', '=', 'limits.component_id')->where( - 'components.user_id', $this->_user->id - )->where('startdate', $date->format('Y-m-d'))->where('component_id', $data['budget_id'])->where( - 'repeat_freq', $data['period'] - )->count(); - if ($count > 0) { - \Session::flash('error', 'There already is an entry for these parameters.'); - - return new \Limit; - } - // create new limit: - $limit = new \Limit; - $limit->budget()->associate($budget); - $limit->startdate = $date; - $limit->amount = floatval($data['amount']); - $limit->repeats = isset($data['repeats']) ? intval($data['repeats']) : 0; - $limit->repeat_freq = $data['period']; - if (!$limit->save()) { - \Session::flash('error', 'Could not save: ' . $limit->errors()->first()); - } - - return $limit; - } - - /** - * @param \Limit $limit - * - * @return bool - */ - public function destroy(\Limit $limit) - { - $limit->delete(); - - return true; - } - - /** - * @param \Budget $budget - * @param Carbon $start - * @param Carbon $end - * - * @return mixed - */ - public function getTJByBudgetAndDateRange(\Budget $budget, Carbon $start, Carbon $end) - { - $result = $budget->transactionjournals()->with('transactions')->after($start)->before($end)->get(); - - return $result; - - } - - /** - * @param \Limit $limit - * @param $data - * - * @return mixed|void - */ - public function update(\Limit $limit, $data) - { - $limit->startdate = new Carbon($data['startdate']); - $limit->repeat_freq = $data['period']; - $limit->repeats = isset($data['repeats']) && $data['repeats'] == '1' ? 1 : 0; - $limit->amount = floatval($data['amount']); - - $limit->save(); - - return $limit; - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Limit/LimitRepositoryInterface.php b/app/lib/Firefly/Storage/Limit/LimitRepositoryInterface.php deleted file mode 100644 index 92a88a3279..0000000000 --- a/app/lib/Firefly/Storage/Limit/LimitRepositoryInterface.php +++ /dev/null @@ -1,70 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importPiggybank(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('No account available for piggy bank "' . $payload['data']['name'] . '". KILL!'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - - - /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */ - $accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts->overruleUser($user); - - /* - * Maybe the piggy bank has already been imported - */ - $importEntry = $repository->findImportEntry($importMap, 'Piggybank', intval($payload['data']['id'])); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported piggy bank ' . $payload['data']['name']); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /* - * Try to find related piggybank: - */ - $piggyBank = $this->findByName($payload['data']['name']); - - /* - * Find an account (any account, really, at this point). - */ - $accountType = $accounts->findAccountType('Asset account'); - - /** @var Collection $set */ - $set = $accounts->getByAccountType($accountType); - - /* - * If there is an account to attach to this piggy bank, simply use that one. - */ - if ($set->count() > 0) { - /** @var \Account $account */ - $account = $set->first(); - $payload['data']['account_id'] = $account->id; - } else { - \Log::notice('No account available yet for piggy bank "' . $payload['data']['name'] . '".'); - if(\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - /* - * No existing piggy bank, create it: - */ - if (is_null($piggyBank)) { - $payload['data']['targetamount'] = floatval($payload['data']['target']); - $payload['data']['repeats'] = 0; - $payload['data']['rep_every'] = 1; - $payload['data']['reminder_skip'] = 1; - $payload['data']['rep_times'] = 1; - $piggyBank = $this->store($payload['data']); - /* - * Store and fire event. - */ - $repository->store($importMap, 'Piggybank', intval($payload['data']['id']), $piggyBank->id); - \Log::debug('Imported piggy "' . $payload['data']['name'] . '".'); - \Event::fire('piggybanks.store', [$piggyBank]); - } else { - /* - * Already have a piggy bank with this name, we skip it. - */ - $repository->store($importMap, 'Piggybank', $payload['data']['id'], $piggyBank->id); - \Log::debug('Already imported piggy "' . $payload['data']['name'] . '".'); - } - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - public function findByName($piggyBankName) - { - return \Piggybank::leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where( - 'accounts.user_id', $this->_user->id - )->where('piggybanks.name', $piggyBankName)->first(['piggybanks.*']); - } - - public function countNonrepeating() - { - return \Piggybank::leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where( - 'accounts.user_id', $this->_user->id - )->where('repeats', 0)->count(); - - } - - public function countRepeating() - { - return \Piggybank::leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where( - 'accounts.user_id', $this->_user->id - )->where('repeats', 1)->count(); - } - - /** - * @param \Piggybank $piggyBank - * - * @return mixed|void - */ - public function destroy(\Piggybank $piggyBank) - { - $piggyBank->delete(); - - return true; - } - - /** - * @param $piggyBankId - * - * @return mixed - */ - public function find($piggyBankId) - { - return \Piggybank::leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where( - 'accounts.user_id', $this->_user->id - )->where('piggybanks.id', $piggyBankId)->first(['piggybanks.*']); - } - - /** - * @return mixed - */ - public function get() - { - $piggies = $this->_user->piggybanks()->with(['account', 'piggybankrepetitions'])->get(); - - return $piggies; - } - - /** - * @param \Account $account - * - * @return mixed|void - */ - public function leftOnAccount(\Account $account) - { - $balance = $account->balance(); - /** @var \Piggybank $p */ - foreach ($account->piggybanks()->get() as $p) { - $balance -= $p->currentRelevantRep()->currentamount; - } - - return $balance; - - } - - /** - * @param \Piggybank $piggyBank - * @param $amount - * - * @return bool|mixed - */ - public function modifyAmount(\Piggybank $piggyBank, $amount) - { - $rep = $piggyBank->currentRelevantRep(); - if (!is_null($rep)) { - $rep->currentamount += $amount; - $rep->save(); - } - - - return true; - - } - - /** - * @param $data - * - * @return \Piggybank - */ - public function store($data) - { - if (isset($data['targetdate']) && $data['targetdate'] == '') { - unset($data['targetdate']); - } - if (isset($data['reminder']) && $data['reminder'] == 'none') { - unset($data['reminder']); - } - if (isset($data['startdate']) && $data['startdate'] == '') { - unset($data['startdate']); - } - - /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */ - $accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts->overruleUser($this->_user); - $account = isset($data['account_id']) ? $accounts->find($data['account_id']) : null; - - - $piggyBank = new \Piggybank($data); - - if (!is_null($piggyBank->reminder) && is_null($piggyBank->startdate) && is_null($piggyBank->targetdate)) { - - $piggyBank->errors()->add('reminder', 'Cannot create reminders without start ~ AND target date.'); - \Log::error('PiggyBank create-error: ' . $piggyBank->errors()->first()); - return $piggyBank; - - } - - - if ($piggyBank->repeats && !isset($data['targetdate'])) { - $piggyBank->errors()->add('targetdate', 'Target date is mandatory!'); - \Log::error('PiggyBank create-error: ' . $piggyBank->errors()->first()); - - return $piggyBank; - } - if (!is_null($account)) { - $piggyBank->account()->associate($account); - } - $today = new Carbon; - - if ($piggyBank->validate()) { - if (!is_null($piggyBank->targetdate) && $piggyBank->targetdate < $today) { - $piggyBank->errors()->add('targetdate', 'Target date cannot be in the past.'); - \Log::error('PiggyBank create-error: ' . $piggyBank->errors()->first()); - - return $piggyBank; - } - - if (!is_null($piggyBank->reminder) && !is_null($piggyBank->targetdate)) { - // first period for reminder is AFTER target date. - $reminderSkip = $piggyBank->reminder_skip < 1 ? 1 : intval($piggyBank->reminder_skip); - $firstReminder = new Carbon; - switch ($piggyBank->reminder) { - case 'day': - $firstReminder->addDays($reminderSkip); - break; - case 'week': - $firstReminder->addWeeks($reminderSkip); - break; - case 'month': - $firstReminder->addMonths($reminderSkip); - break; - case 'year': - $firstReminder->addYears($reminderSkip); - break; - default: - throw new FireflyException('Invalid reminder period'); - break; - } - if ($firstReminder > $piggyBank->targetdate) { - $piggyBank->errors()->add( - 'reminder', 'The reminder has been set to remind you after the piggy bank will expire.' - ); - \Log::error('PiggyBank create-error: ' . $piggyBank->errors()->first()); - - return $piggyBank; - } - } - $piggyBank->save(); - } - - - return $piggyBank; - } - - /** - * @param \Piggybank $piggy - * @param $data - * - * @return mixed - */ - public function update(\Piggybank $piggy, $data) - { - /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */ - $accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts->overruleUser($this->_user); - $account = isset($data['account_id']) ? $accounts->find($data['account_id']) : null; - - if (!is_null($account)) { - $piggy->account()->associate($account); - } - - $piggy->name = $data['name']; - $piggy->targetamount = floatval($data['targetamount']); - $piggy->reminder = isset($data['reminder']) && $data['reminder'] != 'none' ? $data['reminder'] : null; - $piggy->reminder_skip = $data['reminder_skip']; - $piggy->targetdate = strlen($data['targetdate']) > 0 ? new Carbon($data['targetdate']) : null; - $piggy->startdate - = - isset($data['startdate']) && strlen($data['startdate']) > 0 ? new Carbon($data['startdate']) : null; - - - foreach ($piggy->piggybankrepetitions()->get() as $rep) { - $rep->delete(); - } - - if ($piggy->repeats == 1) { - $piggy->rep_every = intval($data['rep_every']); - $piggy->rep_length = $data['rep_length']; - } - - if ($piggy->validate()) { - // check the things we check for new piggies - $piggy->save(); - } - - - return $piggy; - - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Piggybank/PiggybankRepositoryInterface.php b/app/lib/Firefly/Storage/Piggybank/PiggybankRepositoryInterface.php deleted file mode 100644 index 5e9af3409c..0000000000 --- a/app/lib/Firefly/Storage/Piggybank/PiggybankRepositoryInterface.php +++ /dev/null @@ -1,95 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @param \RecurringTransaction $recurringTransaction - * - * @return bool|mixed - */ - public function destroy(\RecurringTransaction $recurringTransaction) - { - $recurringTransaction->delete(); - - return true; - } - - /** - * @return mixed - */ - public function get() - { - return $this->_user->recurringtransactions()->get(); - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importPredictable(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - /* - * maybe the recurring transaction is already imported: - */ - $oldId = intval($payload['data']['id']); - $description = $payload['data']['description']; - $importEntry = $repository->findImportEntry($importMap, 'RecurringTransaction', $oldId); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported recurring transaction #' . $payload['data']['id']); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - // try to find related recurring transaction: - $recurringTransaction = $this->findByName($payload['data']['description']); - if (is_null($recurringTransaction)) { - $amount = floatval($payload['data']['amount']); - $pct = intval($payload['data']['pct']); - - $set = [ - 'name' => $description, - 'match' => join(',', explode(' ', $description)), - 'amount_min' => $amount * ($pct / 100) * -1, - 'amount_max' => $amount * (1 + ($pct / 100)) * -1, - 'date' => date('Y-m-') . $payload['data']['dom'], - 'repeat_freq' => 'monthly', - 'active' => intval($payload['data']['inactive']) == 1 ? 0 : 1, - 'automatch' => 1, - ]; - - $recurringTransaction = $this->store($set); - $this->store($importMap, 'RecurringTransaction', $oldId, $recurringTransaction->id); - \Log::debug('Imported predictable ' . $description); - } else { - $this->store($importMap, 'RecurringTransaction', $oldId, $recurringTransaction->id); - \Log::debug('Already had predictable ' . $description); - } - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - public function findByName($name) - { - return $this->_user->recurringtransactions()->where('name', 'LIKE', '%' . $name . '%')->first(); - } - - /** - * @param $data - * - * @return MessageBag - */ - public function store($data) - { - $messageBag = new MessageBag; - $recurringTransaction = new \RecurringTransaction( - [ - 'user_id' => $this->_user->id, - 'name' => $data['name'], - 'match' => join(' ', explode(',', $data['match'])), - 'amount_max' => floatval($data['amount_max']), - 'amount_min' => floatval($data['amount_min']), - 'date' => new Carbon($data['date']), - 'active' => isset($data['active']) ? intval($data['active']) : 0, - 'automatch' => isset($data['automatch']) ? intval($data['automatch']) : 0, - 'skip' => isset($data['skip']) ? intval($data['skip']) : 0, - 'repeat_freq' => $data['repeat_freq'], - ] - ); - - // unique name? - $count = $this->_user->recurringtransactions()->whereName($data['name'])->count(); - if ($count > 0) { - $messageBag->add('name', 'A recurring transaction with this name already exists.'); - return $messageBag; - } - - // both amounts zero?: - if ($recurringTransaction->amount_max == 0 && $recurringTransaction->amount_min == 0) { - $messageBag->add('amount_max', 'Amount max and min cannot both be zero.'); - return $messageBag; - } - - if ($recurringTransaction->amount_max < $recurringTransaction->amount_min) { - $messageBag->add('amount_max', 'Amount max must be more than amount min.'); - return $messageBag; - } - - if ($recurringTransaction->amount_min > $recurringTransaction->amount_max) { - $messageBag->add('amount_max', 'Amount min must be less than amount max.'); - return $messageBag; - } - - if ($recurringTransaction->validate()) { - $recurringTransaction->save(); - } else { - $messageBag = $recurringTransaction->errors(); - } - - return $messageBag; - } - - /** - * @param \RecurringTransaction $recurringTransaction - * @param $data - * - * @return MessageBag - */ - public function update(\RecurringTransaction $recurringTransaction, $data) - { - $messageBag = new MessageBag; - $recurringTransaction->name = $data['name']; - $recurringTransaction->match = join(' ', explode(',', $data['match'])); - $recurringTransaction->amount_max = floatval($data['amount_max']); - $recurringTransaction->amount_min = floatval($data['amount_min']); - - // both amounts zero: - if ($recurringTransaction->amount_max == 0 && $recurringTransaction->amount_min == 0) { - $messageBag->add('amount_max', 'Amount max and min cannot both be zero.'); - - return $messageBag; - } - $recurringTransaction->date = new Carbon($data['date']); - $recurringTransaction->active = isset($data['active']) ? intval($data['active']) : 0; - $recurringTransaction->automatch = isset($data['automatch']) ? intval($data['automatch']) : 0; - $recurringTransaction->skip = isset($data['skip']) ? intval($data['skip']) : 0; - $recurringTransaction->repeat_freq = $data['repeat_freq']; - - if ($recurringTransaction->validate()) { - $recurringTransaction->save(); - } else { - $messageBag = $recurringTransaction->errors(); - } - - return $messageBag; - - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/RecurringTransaction/RecurringTransactionRepositoryInterface.php b/app/lib/Firefly/Storage/RecurringTransaction/RecurringTransactionRepositoryInterface.php deleted file mode 100644 index 0e753f3e3d..0000000000 --- a/app/lib/Firefly/Storage/RecurringTransaction/RecurringTransactionRepositoryInterface.php +++ /dev/null @@ -1,64 +0,0 @@ -_user = $user; - return true; - } - - protected $_user = null; - - /** - * - */ - public function __construct() - { - $this->_user = \Auth::user(); - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Reminder/ReminderRepositoryInterface.php b/app/lib/Firefly/Storage/Reminder/ReminderRepositoryInterface.php deleted file mode 100644 index 05e6c77a54..0000000000 --- a/app/lib/Firefly/Storage/Reminder/ReminderRepositoryInterface.php +++ /dev/null @@ -1,19 +0,0 @@ -app->bind( - 'Firefly\Storage\User\UserRepositoryInterface', - 'Firefly\Storage\User\EloquentUserRepository' - ); - $this->app->bind( - 'Firefly\Storage\Transaction\TransactionRepositoryInterface', - 'Firefly\Storage\Transaction\EloquentTransactionRepository' - ); - $this->app->bind( - 'Firefly\Storage\Import\ImportRepositoryInterface', - 'Firefly\Storage\Import\EloquentImportRepository' - ); - - - $this->app->bind( - 'Firefly\Storage\Piggybank\PiggybankRepositoryInterface', - 'Firefly\Storage\Piggybank\EloquentPiggybankRepository' - ); - - $this->app->bind( - 'Firefly\Storage\RecurringTransaction\RecurringTransactionRepositoryInterface', - 'Firefly\Storage\RecurringTransaction\EloquentRecurringTransactionRepository' - ); - - $this->app->bind( - 'Firefly\Storage\Reminder\ReminderRepositoryInterface', - 'Firefly\Storage\Reminder\EloquentReminderRepository' - ); - - $this->app->bind( - 'Firefly\Storage\Account\AccountRepositoryInterface', - 'Firefly\Storage\Account\EloquentAccountRepository' - ); - $this->app->bind( - 'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface', - 'Firefly\Storage\TransactionJournal\EloquentTransactionJournalRepository' - ); - - $this->app->bind( - 'Firefly\Storage\Limit\LimitRepositoryInterface', - 'Firefly\Storage\Limit\EloquentLimitRepository' - ); - - $this->app->bind( - 'Firefly\Storage\Budget\BudgetRepositoryInterface', - 'Firefly\Storage\Budget\EloquentBudgetRepository' - ); - $this->app->bind( - 'Firefly\Storage\Category\CategoryRepositoryInterface', - 'Firefly\Storage\Category\EloquentCategoryRepository' - ); - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Transaction/EloquentTransactionRepository.php b/app/lib/Firefly/Storage/Transaction/EloquentTransactionRepository.php deleted file mode 100644 index a4307a2e50..0000000000 --- a/app/lib/Firefly/Storage/Transaction/EloquentTransactionRepository.php +++ /dev/null @@ -1,32 +0,0 @@ -_user = \Auth::user(); - } - - /** - * @param \User $user - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/Transaction/TransactionRepositoryInterface.php b/app/lib/Firefly/Storage/Transaction/TransactionRepositoryInterface.php deleted file mode 100644 index 314f72b0c4..0000000000 --- a/app/lib/Firefly/Storage/Transaction/TransactionRepositoryInterface.php +++ /dev/null @@ -1,19 +0,0 @@ -_user = \Auth::user(); - } - - /** - * Get them ALL - * - * @return Collection - */ - public function get() { - return $this->_user->transactionjournals()->with('transactions')->get(); - } - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importTransfer(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - - if ($job->attempts() > 10) { - \Log::error('Never found accounts for transfer "' . $payload['data']['description'] . '". KILL!'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /** @var \Firefly\Helper\Controllers\TransactionInterface $transactions */ - $transactions = \App::make('Firefly\Helper\Controllers\TransactionInterface'); - $transactions->overruleUser($this->_user); - - /* - * Prep some variables from the payload: - */ - $fromAccountId = intval($payload['data']['accountfrom_id']); - $toAccountId = intval($payload['data']['accountto_id']); - $description = $payload['data']['description']; - $transferId = intval($payload['data']['id']); - $amount = floatval($payload['data']['amount']); - $date = new Carbon($payload['data']['date']); - - /* - * maybe Journal is already imported: - */ - $importEntry = $repository->findImportEntry($importMap, 'Transfer', $transferId); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported transfer ' . $description); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /* - * Find the 'from' account: - */ - $oldFromAccountEntry = $repository->findImportEntry($importMap, 'Account', $fromAccountId); - - /* - * Find the 'to' account: - */ - $oldToAccountEntry = $repository->findImportEntry($importMap, 'Account', $toAccountId); - - /* - * Import transfer: - */ - $set = [ - 'account_from_id' => $oldFromAccountEntry->new, - 'account_to_id' => $oldToAccountEntry->new, - 'amount' => $amount, - 'description' => $description, - 'date' => $date->format('Y-m-d'), - 'category' => '', - 'what' => 'transfer', - 'return_journal' => true - ]; - $returnSet = $transactions->store($set); - $journal = $returnSet['journal']; - - /* - * Validate the store action: - */ - if ($journal instanceof MessageBag) { - /* - * It's a message bag; clearly something went wrong. - */ - \Log::notice('Could not import TJ "' . $description . '": ' . $journal->first()); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } else if ($journal instanceof \TransactionJournal && $journal->errors()->count() > 0) { - /* - * It's a journal but it still failed somehow. - */ - \Log::notice('Could not import TJ "' . $description . '": ' . $journal->errors()->first()); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - $repository->store($importMap, 'Transfer', $transferId, $journal->id); - \Log::debug('Imported transfer "' . $description . '" (' . $amount . ') (' . $date->format('Y-m-d') . ')'); - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed. - - } - - /** - * @param \User $user - * - * @return mixed|void - */ - public function overruleUser(\User $user) - { - $this->_user = $user; - return true; - } - - /** - * @param array $data - * - * @return \TransactionJournal - */ - public function store(array $data) - { - /* - * Create the journal and fill relevant fields. - */ - $journal = new \TransactionJournal; - $journal->description = trim($data['description']); - $journal->date = new Carbon($data['date']); - $journal->user_id = $this->_user->id; - $journal->completed = false; - - /* - * Find the more complex fields and fill those: - */ - $currency = \TransactionCurrency::where('code', 'EUR')->first(); - $journal->transaction_currency_id = $currency->id; - $transactionType = \TransactionType::where('type', $data['what'])->first(); - $journal->transaction_type_id = $transactionType->id; - - /* - * Validate & save journal - */ - $journal->validate(); - $journal->save(); - - /* - * Return regardless. - */ - return $journal; - } - - /** - * @param \TransactionJournal $journal - * @param \Account $account - * @param $amount - * - * @return \Transaction|null - */ - public function saveTransaction(\TransactionJournal $journal, \Account $account, $amount) - { - $transaction = new \Transaction; - $transaction->account_id = $account->id; - $transaction->transaction_journal_id = $journal->id; - $transaction->amount = $amount; - if ($transaction->validate()) { - $transaction->save(); - } - return $transaction; - - } - - - /** - * @param Job $job - * @param array $payload - * - * @return mixed - */ - public function importTransaction(Job $job, array $payload) - { - /** @var \Firefly\Storage\Import\ImportRepositoryInterface $repository */ - $repository = \App::make('Firefly\Storage\Import\ImportRepositoryInterface'); - - /** @var \Importmap $importMap */ - $importMap = $repository->findImportmap($payload['mapID']); - $user = $importMap->user; - $this->overruleUser($user); - - if ($job->attempts() > 10) { - \Log::error('Never found asset account for transaction "' . $payload['data']['description'] . '". KILL!'); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */ - $accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts->overruleUser($user); - - /** @var \Firefly\Helper\Controllers\TransactionInterface $transactions */ - $transactions = \App::make('Firefly\Helper\Controllers\TransactionInterface'); - $transactions->overruleUser($this->_user); - - - /* - * Prep some vars coming out of the pay load: - */ - $amount = floatval($payload['data']['amount']); - $date = new Carbon($payload['data']['date']); - $description = $payload['data']['description']; - $transactionId = intval($payload['data']['id']); - $accountId = intval($payload['data']['account_id']); - - /* - * maybe Journal is already imported: - */ - $importEntry = $repository->findImportEntry($importMap, 'Transaction', $transactionId); - - /* - * if so, delete job and return: - */ - if (!is_null($importEntry)) { - \Log::debug('Already imported transaction ' . $description); - - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - } - - /* - * Find or create the "import account" which is used because at this point, Firefly - * doesn't know which beneficiary (expense account) should be connected to this transaction. - */ - $accountType = $accounts->findAccountType('Import account'); - $importAccount = $accounts->firstOrCreate( - [ - 'account_type_id' => $accountType->id, - 'name' => 'Import account', - 'user_id' => $user->id, - 'active' => 1, - ] - ); - unset($accountType); - - /* - * Find the asset account this transaction is paid from / paid to: - */ - $accountEntry = $repository->findImportEntry($importMap, 'Account', $accountId); - - /* - * Prep some data for the import routine: - */ - $set = [ - 'category' => '', - 'description' => $description, - 'date' => $date->format('Y-m-d'), - 'return_journal' => true, - 'account_id' => $accountEntry->new - ]; - - - /* - * If the amount is less than zero, we move money to the $importAccount. Otherwise, - * we move it from the $importAccount. - */ - - if ($amount < 0) { - // if amount is less than zero, move to $importAccount - $set['what'] = 'withdrawal'; - $set['expense_account'] = $importAccount->name; - } else { - $set['what'] = 'deposit'; - $set['revenue_account'] = $importAccount->name; - } - - /* - * Modify the amount so it will work with or new transaction journal structure. - */ - $set['amount'] = $amount < 0 ? $amount * -1 : $amount; - - /* - * Import it: - */ - $returnSet = $transactions->store($set); - $journal = $returnSet['journal']; - - /* - * Validate the store action: - */ - if ($journal instanceof MessageBag) { - - /* - * It's a message bag; clearly something went wrong. - */ - \Log::notice('Could not import transfer "' . $description . '": ' . $journal->first()); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } else if ($journal instanceof \TransactionJournal && $journal->errors()->count() > 0) { - /* - * It's a journal but it still failed somehow. - */ - \Log::notice('Could not import transfer "' . $description . '": ' . $journal->errors()->first()); - if (\Config::get('queue.default') == 'sync') { - $importMap->jobsdone++; - $importMap->save(); - $job->delete(); // count fixed - } else { - $job->release(300); // proper release. - } - return; - } - - $repository->store($importMap, 'Transaction', $transactionId, $journal->id); - \Log::debug('Imported transaction "' . $description . '" (' . $amount . ') (' . $date->format('Y-m-d') . ')'); - - // update map: - $importMap->jobsdone++; - $importMap->save(); - - $job->delete(); // count fixed - return; - - } - - /** - * @param $journalId - * - * @return mixed - */ - public function find($journalId) - { - return $this->_user->transactionjournals()->with( - ['transactions' => function ($q) { - return $q->orderBy('amount', 'ASC'); - }, 'transactioncurrency', 'transactiontype', 'components', 'transactions.account', - 'transactions.account.accounttype'] - ) - ->where('id', $journalId)->first(); - } - - /** - * @param \Account $account - * @param int $count - * @param Carbon $start - * @param Carbon $end - * - * @return mixed - */ - public function getByAccountInDateRange(\Account $account, $count = 25, Carbon $start, Carbon $end) - { - $accountID = $account->id; - $query = $this->_user->transactionjournals()->with( - [ - 'transactions', - 'transactioncurrency', - 'transactiontype' - ] - ) - ->leftJoin( - 'transactions', 'transactions.transaction_journal_id', '=', - 'transaction_journals.id' - ) - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->where('accounts.id', $accountID) - ->where('date', '>=', $start->format('Y-m-d')) - ->where('date', '<=', $end->format('Y-m-d')) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.id', 'DESC') - ->take($count) - ->get(['transaction_journals.*']); - - return $query; - } - /** - * @param \TransactionJournal $journal - * @param $data - * - * @return mixed|\TransactionJournal - * @throws \Firefly\Exception\FireflyException - */ - public function update(\TransactionJournal $journal, $data) - { - /* - * Update the basic fields: - */ - $journal->description = trim($data['description']); - $journal->date = new Carbon($data['date']); - - /* - * Validate & save journal - */ - $journal->validate(); - $journal->save(); - - /* - * Return regardless. - */ - return $journal; - - - } -// /* -// * Grab some of the repositories we need: -// */ -// /** @var \Firefly\Storage\Category\CategoryRepositoryInterface $catRepository */ -// $catRepository = \App::make('Firefly\Storage\Category\CategoryRepositoryInterface'); -// $catRepository->overruleUser($this->_user); -// -// /** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgetRepository */ -// $budRepository = \App::make('Firefly\Storage\Budget\BudgetRepositoryInterface'); -// $budRepository->overruleUser($this->_user); -// -// /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */ -// $accountRepository = \App::make('Firefly\Storage\Account\AccountRepositoryInterface'); -// $accountRepository->overruleUser($this->_user); -// -// -// update basics first: -// $journal->description = $data['description']; -// $journal->date = $data['date']; -// $amount = floatval($data['amount']); -// -// // remove previous category, if any: -// if (!is_null($journal->categories()->first())) { -// $journal->categories()->detach($journal->categories()->first()->id); -// } -// // remove previous budget, if any: -// if (!is_null($journal->budgets()->first())) { -// $journal->budgets()->detach($journal->budgets()->first()->id); -// } -// // remove previous piggy bank, if any: -// -// -// $category = isset($data['category']) ? $catRepository->findByName($data['category']) : null; -// if (!is_null($category)) { -// $journal->categories()->attach($category); -// } -// // update the amounts: -// $transactions = $journal->transactions()->orderBy('amount', 'ASC')->get(); -// -// // remove previous piggy bank, if any: -// /** @var \Transaction $transaction */ -// foreach ($transactions as $transaction) { -// if (!is_null($transaction->piggybank()->first())) { -// $transaction->piggybank_id = null; -// $transaction->save(); -// } -// } -// unset($transaction); -// -// $transactions[0]->amount = $amount * -1; -// $transactions[1]->amount = $amount; -// -// // switch on type to properly change things: -// $fireEvent = false; -// switch ($journal->transactiontype->type) { -// case 'Withdrawal': -// // means transaction[0] is the users account. -// $account = $accountRepository->find($data['account_id']); -// $beneficiary = $accountRepository->createOrFindBeneficiary($data['beneficiary']); -// $transactions[0]->account()->associate($account); -// $transactions[1]->account()->associate($beneficiary); -// -// // do budget: -// $budget = $budRepository->find($data['budget_id']); -// if (!is_null($budget)) { -// $journal->budgets()->attach($budget); -// } -// -// break; -// case 'Deposit': -// // means transaction[0] is the beneficiary. -// $account = $accountRepository->find($data['account_id']); -// $beneficiary = $accountRepository->createOrFindBeneficiary($data['beneficiary']); -// $journal->transactions[0]->account()->associate($beneficiary); -// $journal->transactions[1]->account()->associate($account); -// break; -// case 'Transfer': -// // means transaction[0] is account that sent the money (from). -// /** @var \Account $fromAccount */ -// $fromAccount = $accountRepository->find($data['account_from_id']); -// /** @var \Account $toAccount */ -// $toAccount = $accountRepository->find($data['account_to_id']); -// $journal->transactions[0]->account()->associate($fromAccount); -// $journal->transactions[1]->account()->associate($toAccount); -// -// // attach the new piggy bank, if valid: -// /** @var \Firefly\Storage\Piggybank\PiggybankRepositoryInterface $piggyRepository */ -// $piggyRepository = \App::make('Firefly\Storage\Piggybank\PiggybankRepositoryInterface'); -// $piggyRepository->overruleUser($this->_user); -// -// if (isset($data['piggybank_id'])) { -// /** @var \Piggybank $piggyBank */ -// $piggyBank = $piggyRepository->find(intval($data['piggybank_id'])); -// -// // loop transactions and re-attach the piggy bank: -// -// if ($piggyBank) { -// -// $connected = false; -// foreach ($journal->transactions()->get() as $transaction) { -// if ($transaction->account_id == $piggyBank->account_id) { -// $connected = true; -// $transaction->piggybank()->associate($piggyBank); -// $transaction->save(); -// $fireEvent = true; -// break; -// } -// } -// if ($connected === false) { -// \Session::flash( -// 'warning', 'Piggy bank "' . e($piggyBank->name) -// . '" is not set to draw money from any of the accounts in this transfer' -// ); -// } -// } -// } -// -// -// break; -// default: -// throw new FireflyException('Cannot edit this!'); -// break; -// } -// -// $transactions[0]->save(); -// $transactions[1]->save(); -// if ($journal->validate()) { -// $journal->save(); -// } -// if ($fireEvent) { -// \Event::fire('piggybanks.updateRelatedTransfer', [$piggyBank]); -// } -// -// return $journal; -// -// -// } - - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php b/app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php deleted file mode 100644 index 2d01a7884d..0000000000 --- a/app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php +++ /dev/null @@ -1,88 +0,0 @@ -first(); - } - - /** - * @param $reset - * - * @return mixed - */ - public function findByReset($reset) - { - return \User::where('reset', $reset)->first(); - } - - /** - * @param $array - * - * @return bool|\User - */ - public function register($array) - { - $user = new \User; - $user->email = isset($array['email']) ? $array['email'] : null; - $user->migrated = 0; - $user->reset = \Str::random(32); - $user->password = \Hash::make(\Str::random(12)); - - if (!$user->save()) { - \Log::error('Invalid user'); - \Session::flash('error', 'Input invalid, please try again: ' . $user->errors()->first()); - - return false; - } - $user->save(); - - return $user; - } - - /** - * @param \User $user - * @param $password - * - * @return bool - */ - public function updatePassword(\User $user, $password) - { - /** @noinspection PhpUndefinedFieldInspection */ - $user->password = $password; - /** @noinspection PhpUndefinedMethodInspection */ - $user->forceSave(); - - return true; - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Storage/User/UserRepositoryInterface.php b/app/lib/Firefly/Storage/User/UserRepositoryInterface.php deleted file mode 100644 index d74b9cbae9..0000000000 --- a/app/lib/Firefly/Storage/User/UserRepositoryInterface.php +++ /dev/null @@ -1,43 +0,0 @@ -listen('budgets.destroy', 'Firefly\Trigger\Budgets\EloquentBudgetTrigger@destroy'); -// $events->listen('budgets.store', 'Firefly\Trigger\Budgets\EloquentBudgetTrigger@store'); -// $events->listen('budgets.update', 'Firefly\Trigger\Budgets\EloquentBudgetTrigger@update'); - - } - - /** - * Same. Doesn't do much. - * - * @param \Budget $budget - * - * @return bool - */ - public function update(\Budget $budget) - { - return true; - - } -} diff --git a/app/lib/Firefly/Trigger/Journals/EloquentJournalTrigger.php b/app/lib/Firefly/Trigger/Journals/EloquentJournalTrigger.php deleted file mode 100644 index cbb5196fae..0000000000 --- a/app/lib/Firefly/Trigger/Journals/EloquentJournalTrigger.php +++ /dev/null @@ -1,64 +0,0 @@ -user()->first()->recurringtransactions()->get(); - $result = []; - /* - * Prep vars - */ - $description = strtolower($journal->description); - $result = [0 => 0]; - - /** @var \RecurringTransaction $recurring */ - foreach ($set as $recurring) { - \Event::fire('recurring.rescan', [$recurring, $journal]); - } - - return true; - - } - - /** - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { -// $events->listen('journals.store', 'Firefly\Trigger\Journals\EloquentJournalTrigger@store'); -// $events->listen('journals.update', 'Firefly\Trigger\Journals\EloquentJournalTrigger@update'); - - } - - /** - * @param \TransactionJournal $journal - * - * @return bool - */ - public function update(\TransactionJournal $journal) - { - return true; - - } - -} \ No newline at end of file diff --git a/app/lib/Firefly/Trigger/Limits/EloquentLimitTrigger.php b/app/lib/Firefly/Trigger/Limits/EloquentLimitTrigger.php deleted file mode 100644 index 2633684c14..0000000000 --- a/app/lib/Firefly/Trigger/Limits/EloquentLimitTrigger.php +++ /dev/null @@ -1,133 +0,0 @@ -where('components.user_id', \Auth::user()->id) - ->where('limits.repeats', 1) - ->get(['limits.*']); - } else { - $limits = []; - } - - /** @var \Limit $limit */ - foreach ($limits as $limit) { - // the limit repeats, and there should be at least one repetition already. - /** @var \LimitRepetition $primer */ - $primer = $limit->limitrepetitions()->orderBy('startdate', 'DESC')->first(); - $today = new Carbon; - $start = clone $primer->enddate; - // from the primer onwards. - while ($start <= $today) { - $start->addDay(); - $end = clone $start; - - // add period to determin end of limitrepetition: - switch ($limit->repeat_freq) { - case 'daily': - $end->addDay(); - break; - case 'weekly': - $end->addWeek(); - break; - case 'monthly': - $end->addMonth(); - break; - case 'quarterly': - $end->addMonths(3); - break; - case 'half-year': - $end->addMonths(6); - break; - case 'yearly': - $end->addYear(); - break; - } - $end->subDay(); - // create repetition: - $limit->createRepetition($start); - $start = clone $end; - } - } - } - - /** - * @param \Limit $limit - * - * @return bool - */ - public function destroy(\Limit $limit) - { - return true; - - } - - /** - * @param \LimitRepetition $repetition - */ - public function madeRepetition(\LimitRepetition $repetition) - { - \Log::debug('TRIGGER: Created a limit repetition (#' . $repetition->id . ')'); - } - - /** - * @param \Limit $limit - * - * @return bool - */ - public function store(\Limit $limit) - { - // create a repetition (repetitions) for this limit (we ignore "repeats"): - $limit->createRepetition($limit->startdate); - - return true; - } - - /** - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { - //$events->listen('budgets.change', 'Firefly\Trigger\Limits\EloquentLimitTrigger@updateLimitRepetitions'); -// $events->listen('limits.destroy', 'Firefly\Trigger\Limits\EloquentLimitTrigger@destroy'); -// $events->listen('limits.store', 'Firefly\Trigger\Limits\EloquentLimitTrigger@store'); -// $events->listen('limits.update', 'Firefly\Trigger\Limits\EloquentLimitTrigger@update'); -// $events->listen('limits.check', 'Firefly\Trigger\Limits\EloquentLimitTrigger@checkRepeatingLimits'); -// $events->listen('limits.repetition', 'Firefly\Trigger\Limits\EloquentLimitTrigger@madeRepetition'); - //\Event::fire('limits.repetition', [$repetition]); - - } - - /** - * @param \Limit $limit - * - * @return bool - */ - public function update(\Limit $limit) - { - // remove and recreate limit repetitions. - // if limit is not repeating, simply update the repetition to match the limit, - // even though deleting everything is easier. - $limit->createRepetition($limit->startdate); - - return true; - } -} diff --git a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php b/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php deleted file mode 100644 index 5a51efe653..0000000000 --- a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php +++ /dev/null @@ -1,239 +0,0 @@ -piggybanks()->where('repeats', 1)->get(); - } else { - $piggies = []; - } - - \Log::debug('Now in checkRepeatingPiggies with ' . count($piggies) . ' piggies found.'); - - /** @var \Piggybank $piggyBank */ - foreach ($piggies as $piggyBank) { - \Log::debug('Now working on ' . $piggyBank->name); - - /* - * Get the latest repetition, see if Firefly needs to create more. - */ - /** @var \PiggybankRepetition $primer */ - $primer = $piggyBank->piggybankrepetitions()->orderBy('targetdate', 'DESC')->first(); - \Log::debug('Last target date is: ' . $primer->targetdate); - - $today = new Carbon; - - // the next repetition must be created starting at the day after the target date of the previous one. - /* - * A repeated expense runs from day 1 to day X. Since it repeats, the next repetition starts at day X+1 - * until however often the repeated expense is set to repeat: a month, a week, a year. - */ - $start = clone $primer->targetdate; - $start->addDay(); - - while ($start <= $today) { - \Log::debug('Looping! Start is: ' . $start); - - // to get to the end of the current repetition, we switch on the piggy bank's - // repetition period: - $end = clone $start; - switch ($piggyBank->rep_length) { - case 'day': - $end->addDays($piggyBank->rep_every); - break; - case 'week': - $end->addWeeks($piggyBank->rep_every); - break; - case 'month': - $end->addMonths($piggyBank->rep_every); - break; - case 'year': - $end->addYears($piggyBank->rep_every); - break; - } - $end->subDay(); - - // create repetition: - $piggyBank->createRepetition($start, $end); - - $start = clone $end; - $start->addDay(); - - - } - - } - } - - /** - * @param \Piggybank $piggyBank - * @param \TransactionJournal $journal - * @param \Transaction $transaction - * - * @return bool - */ - public function createRelatedTransfer( - \Piggybank $piggyBank, \TransactionJournal $journal, \Transaction $transaction - ) { - $repetition = $piggyBank->repetitionForDate($journal->date); - if (!is_null($repetition)) { - // get the amount transferred TO this - $amount = floatval($transaction->amount); - $repetition->currentamount += $amount; - $repetition->save(); - } else { - \Session::flash('warning', 'Cannot add transfer to piggy, outside of scope.'); - } - - return true; - } - - /** - * @param \Piggybank $piggyBank - * @param $amount - */ - public function modifyAmountAdd(\Piggybank $piggyBank, $amount) - { - $rep = $piggyBank->currentRelevantRep(); - $today = new Carbon; - - // create event: - $event = new \PiggybankEvent; - $event->date = new Carbon; - $event->amount = $amount; - $event->piggybank()->associate($piggyBank); - - // for future / past repetitions. - if (!($rep->startdate >= $today && $rep->targetdate <= $today)) { - $event->date = $rep->startdate; - } - - - $event->save(); - } - - /** - * @param \Piggybank $piggyBank - * @param $amount - */ - public function modifyAmountRemove(\Piggybank $piggyBank, $amount) - { - // create event: - $event = new \PiggybankEvent; - $event->date = new Carbon; - $event->amount = $amount; - $event->piggybank()->associate($piggyBank); - $event->save(); - } - - /** - * This method is called when a piggy bank or repeated expense is created. It will create the first - * repetition which by default is equal to the PB / RE itself. After that, other triggers will take over. - * - * @param \Piggybank $piggyBank - * - * @return bool - */ - public function store(\Piggybank $piggyBank) - { - $piggyBank->createRepetition($piggyBank->startdate, $piggyBank->targetdate); - - return true; - } - - /** - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { -// $events->listen('piggybanks.modifyAmountAdd', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@modifyAmountAdd'); -// $events->listen('piggybanks.modifyAmountRemove', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@modifyAmountRemove'); -// $events->listen('piggybanks.store', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@store'); -// $events->listen('piggybanks.update', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@update'); -// $events->listen('piggybanks.createRelatedTransfer', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@createRelatedTransfer'); -// $events->listen('piggybanks.updateRelatedTransfer', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@updateRelatedTransfer'); -// $events->listen('piggybanks.storepiggybanks.check', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@checkRepeatingPiggies'); - - } - - /** - * When the user updates a piggy bank the repetitions, past and now, may be wrong. The best bet - * would be to delete everything and start over, but that also means past repetitions will be gone. - * - * Instead, we have disabled changing the dates when the piggy bank is repeating: a repeated expense cannot - * have its dates changed. This will prevent many problems I don't want to deal with. - * - * @param \Piggybank $piggyBank - */ - public function update(\Piggybank $piggyBank) - { - // delete all repetitions: - foreach ($piggyBank->piggybankrepetitions()->get() as $rep) { - - $rep->delete(); - } - unset($rep); - - // trigger "new" piggy bank to recreate them. - \Event::fire('piggybanks.store', [$piggyBank]); - - - // loop the repetitions and update them according to the events and the transactions: - foreach ($piggyBank->piggybankrepetitions()->get() as $rep) { - // SUM for transactions - $query = \Transaction::where('piggybank_id', $piggyBank->id)->leftJoin( - 'transaction_journals', 'transaction_journals.id', '=', - 'transactions.transaction_journal_id' - ); - if (!is_null($rep->startdate)) { - $query->where('transaction_journals.date', '>=', $rep->startdate->format('Y-m-d')); - } - if (!is_null($rep->targetdate)) { - $query->where( - 'transaction_journals.date', '<=', $rep->targetdate->format('Y-m-d') - ); - } - $sum = $query->sum('transactions.amount'); - - // get events for piggy bank, save those as well: - $eventSumQuery = $piggyBank->piggybankevents(); - if (!is_null($rep->startdate)) { - $eventSumQuery->where('date', '>=', $rep->startdate->format('Y-m-d')); - } - if (!is_null($rep->targetdate)) { - $eventSumQuery->where('date', '<=', $rep->targetdate->format('Y-m-d')); - } - $eventSum = floatval($eventSumQuery->sum('amount')); - $rep->currentamount = floatval($sum) + $eventSum; - $rep->save(); - - } - } - - public function updateRelatedTransfer(\Piggybank $piggyBank) - { - // fire the "update" trigger which should handle things just fine: - \Event::fire('piggybanks.update', [$piggyBank]); - } - - -} \ No newline at end of file diff --git a/app/lib/Firefly/Trigger/Recurring/EloquentRecurringTrigger.php b/app/lib/Firefly/Trigger/Recurring/EloquentRecurringTrigger.php deleted file mode 100644 index b29167bb48..0000000000 --- a/app/lib/Firefly/Trigger/Recurring/EloquentRecurringTrigger.php +++ /dev/null @@ -1,111 +0,0 @@ -match); - $description = strtolower($journal->description); - - /* - * Attach expense account to description for more narrow matching. - */ - $transactions = $journal->transactions()->get(); - /** @var \Transaction $transaction */ - foreach ($transactions as $transaction) { - /** @var \Account $account */ - $account = $transaction->account()->first(); - /** @var \AccountType $type */ - $type = $account->accountType()->first(); - if ($type->type == 'Expense account' || $type->type == 'Beneficiary account') { - $description .= ' ' . strtolower($account->name); - } - } - - $count = 0; - foreach ($matches as $word) { - if (!(strpos($description, strtolower($word)) === false)) { - $count++; - } - } - if ($count >= count($matches)) { - $wordMatch = true; - } - - /* - * Match amount. - */ - - $amountMatch = false; - if (count($transactions) > 1) { - - $amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount)); - $min = floatval($recurring->amount_min); - $max = floatval($recurring->amount_max); - if ($amount >= $min && $amount <= $max) { - $amountMatch = true; - } - } - - /* - * If both, update! - */ - if ($wordMatch && $amountMatch) { - $journal->recurringTransaction()->associate($recurring); - $journal->save(); - } - - } - - /** - * Trigger! - * - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { - //$events->listen('recurring.rescan', 'Firefly\Trigger\Recurring\EloquentRecurringTrigger@rescan'); - } - - /** - * @param \RecurringTransaction $recurring - */ - public function update(\RecurringTransaction $recurring) - { - } -} \ No newline at end of file diff --git a/app/lib/Firefly/Validation/FireflyValidator.php b/app/lib/Firefly/Validation/FireflyValidator.php deleted file mode 100644 index cb3bb93d8e..0000000000 --- a/app/lib/Firefly/Validation/FireflyValidator.php +++ /dev/null @@ -1,22 +0,0 @@ -app->validator->resolver( - function ($translator, $data, $rules, $messages) { - return new FireflyValidator($translator, $data, $rules, $messages); - } - ); - } - - public function register() - { - } -} \ No newline at end of file diff --git a/app/routes.php b/app/routes.php index eff0807f35..73def8cf0a 100644 --- a/app/routes.php +++ b/app/routes.php @@ -176,8 +176,6 @@ Route::group( Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']); Route::get('/chart/home/recurring', ['uses' => 'GoogleChartController@recurringTransactionsOverview']); Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']); - Route::get('/chart/sankey/{account}/out/{view?}', ['uses' => 'GoogleChartController@accountSankeyOutChart']); - Route::get('/chart/sankey/{account}/in/{view?}', ['uses' => 'GoogleChartController@accountSankeyInChart']); Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']); Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']); Route::get('/chart/recurring/{recurring}', ['uses' => 'GoogleChartController@recurringOverview']); diff --git a/app/views/accounts/show.blade.php b/app/views/accounts/show.blade.php index ce978f17bc..d54e245446 100644 --- a/app/views/accounts/show.blade.php +++ b/app/views/accounts/show.blade.php @@ -33,29 +33,6 @@
-
-
-
-
- Out -
-
-
-
-
-
-
-
-
- In -
-
-
-
-
-
-
-
diff --git a/composer.json b/composer.json index 7b3fad61ff..f551a8ccde 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,9 @@ "mockery/mockery": "@stable", "league/factory-muffin": "~2.0", "codeception/codeception": "*", - "codeception/c3": "2.*" + "codeception/c3": "2.*", + "sebastian/phpcpd": "*", + "sebastian/phpdcd": "*" }, "autoload": { diff --git a/composer.lock b/composer.lock index 0b40a3d726..3408416d1b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "4149e5d1a8b58787b3e9f68fc8cf40b9", + "hash": "54b87a48702c03e0eef7f37449f7888a", "packages": [ { "name": "classpreloader/classpreloader", @@ -3880,6 +3880,45 @@ ], "time": "2014-09-10 00:51:36" }, + { + "name": "sebastian/finder-facade", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0", + "shasum": "" + }, + "require": { + "symfony/finder": ">=2.2.0", + "theseer/fdomdocument": ">=1.3.1" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", + "homepage": "https://github.com/sebastianbergmann/finder-facade", + "time": "2013-05-28 06:10:03" + }, { "name": "sebastian/global-state", "version": "1.0.0", @@ -3931,6 +3970,111 @@ ], "time": "2014-10-06 09:23:50" }, + { + "name": "sebastian/phpcpd", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpcpd.git", + "reference": "a9462153f2dd90466a010179901d31fbff598365" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/a9462153f2dd90466a010179901d31fbff598365", + "reference": "a9462153f2dd90466a010179901d31fbff598365", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-timer": ">=1.0.4", + "sebastian/finder-facade": ">=1.1.0", + "sebastian/version": ">=1.0.3", + "symfony/console": ">=2.2.0", + "theseer/fdomdocument": "~1.4" + }, + "bin": [ + "phpcpd" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Copy/Paste Detector (CPD) for PHP code.", + "homepage": "https://github.com/sebastianbergmann/phpcpd", + "time": "2014-03-31 09:25:30" + }, + { + "name": "sebastian/phpdcd", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpdcd.git", + "reference": "10246f167713d0bd0b74540ca81e4caf30b72157" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpdcd/zipball/10246f167713d0bd0b74540ca81e4caf30b72157", + "reference": "10246f167713d0bd0b74540ca81e4caf30b72157", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-timer": ">=1.0.4", + "phpunit/php-token-stream": ">=1.1.3", + "sebastian/finder-facade": ">=1.1.0", + "sebastian/version": ">=1.0.3", + "symfony/console": ">=2.2.0" + }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, + "bin": [ + "phpdcd" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Dead Code Detector (DCD) for PHP code.", + "homepage": "https://github.com/sebastianbergmann/phpdcd", + "time": "2014-04-27 06:42:32" + }, { "name": "sebastian/version", "version": "1.0.3", @@ -4157,6 +4301,46 @@ "description": "Symfony Yaml Component", "homepage": "http://symfony.com", "time": "2014-12-02 20:19:20" + }, + { + "name": "theseer/fdomdocument", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d08cf070350f884c63fc9078d27893c2ab6c7cef", + "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2014-09-13 10:57:19" } ], "aliases": [], diff --git a/public/assets/javascript/firefly/accounts.js b/public/assets/javascript/firefly/accounts.js index 0a3ec71d4a..b63d11ca98 100644 --- a/public/assets/javascript/firefly/accounts.js +++ b/public/assets/javascript/firefly/accounts.js @@ -3,10 +3,5 @@ $(function () { if (typeof(googleLineChart) == "function" && typeof accountID != 'undefined' && typeof view != 'undefined') { googleLineChart('chart/account/' + accountID + '/' + view, 'overview-chart'); } - // - if (typeof(googleSankeyChart) == 'function' && typeof accountID != 'undefined' && typeof view != 'undefined') { - googleSankeyChart('chart/sankey/' + accountID + '/out' + '/' + view, 'account-out-sankey'); - googleSankeyChart('chart/sankey/' + accountID + '/in' + '/' + view, 'account-in-sankey'); - } }); \ No newline at end of file diff --git a/public/assets/javascript/firefly/gcharts.js b/public/assets/javascript/firefly/gcharts.js index c0bc5dd090..4aebc1a993 100644 --- a/public/assets/javascript/firefly/gcharts.js +++ b/public/assets/javascript/firefly/gcharts.js @@ -224,43 +224,3 @@ function googlePieChart(URL, container, options) { console.log('No container found called "' + container + '"'); } } - -function googleSankeyChart(URL, container, options) { - if ($('#' + container).length == 1) { - $.getJSON(URL).success(function (data) { - /* - Get the data from the JSON - */ - gdata = new google.visualization.DataTable(data); - - /* - Format as money - */ - - if (gdata.getNumberOfRows() < 1) { - $('#' + container).parent().parent().remove(); - return; - } else if (gdata.getNumberOfRows() < 6) { - defaultSankeyChartOptions.height = 100 - } else { - defaultSankeyChartOptions.height = 400 - } - - - /* - Create a new google charts object. - */ - var chart = new google.visualization.Sankey(document.getElementById(container)); - - /* - Draw it: - */ - chart.draw(gdata, options || defaultSankeyChartOptions); - - }).fail(function () { - $('#' + container).addClass('google-chart-error'); - }); - } else { - console.log('No container found called "' + container + '"'); - } -} \ No newline at end of file diff --git a/public/assets/javascript/firefly/gcharts.options.js b/public/assets/javascript/firefly/gcharts.options.js index dc18206bd1..3c1ec5a131 100644 --- a/public/assets/javascript/firefly/gcharts.options.js +++ b/public/assets/javascript/firefly/gcharts.options.js @@ -136,6 +136,3 @@ var defaultPieChartOptions = { colors: ["#4285f4", "#db4437", "#f4b400", "#0f9d58", "#ab47bc", "#00acc1", "#ff7043", "#9e9d24", "#5c6bc0", "#f06292", "#00796b", "#c2185b"] }; -var defaultSankeyChartOptions = { - height: 400 -} \ No newline at end of file From 3cfa3f3b27f959f9d2224ffdc5fb7e810954e18c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 13 Dec 2014 21:59:02 +0100 Subject: [PATCH 14/92] Code cleanup. --- app/breadcrumbs.php | 2 +- app/controllers/BudgetController.php | 20 +++++----- app/controllers/GoogleChartController.php | 19 +++++----- app/controllers/HelpController.php | 4 +- app/controllers/ReportController.php | 4 +- app/controllers/TransactionController.php | 5 ++- ...te_component_transaction_journal_table.php | 20 +++++----- ..._component_recurring_transaction_table.php | 22 +++++------ .../2014_12_13_190730_changes_for_v321.php | 35 +++++++++++++++++ app/database/seeds/TestContentSeeder.php | 8 ++-- .../FireflyIII/Collection/PiggybankPart.php | 11 ++++++ app/lib/FireflyIII/Database/Account.php | 35 ++++++++++++++--- app/lib/FireflyIII/Database/AccountType.php | 9 ++++- app/lib/FireflyIII/Database/Budget.php | 19 +++++++++- app/lib/FireflyIII/Database/Category.php | 17 ++++++++- .../Database/Ifaces/RecurringInterface.php | 9 +++-- .../Database/Ifaces/ReportInterface.php | 5 +++ app/lib/FireflyIII/Database/Piggybank.php | 13 ++++++- app/lib/FireflyIII/Database/Recurring.php | 3 ++ .../FireflyIII/Database/RepeatedExpense.php | 17 ++++++++- app/lib/FireflyIII/Database/Report.php | 5 +++ app/lib/FireflyIII/Database/Transaction.php | 9 ++++- .../Database/TransactionJournal.php | 23 +++++++++-- .../FireflyIII/Database/TransactionType.php | 10 ++++- app/lib/FireflyIII/Event/Account.php | 14 +++++++ app/lib/FireflyIII/Event/Budget.php | 23 ++++++----- app/lib/FireflyIII/Event/Event.php | 10 +++++ app/lib/FireflyIII/Event/Piggybank.php | 27 ++++++++++++- app/lib/FireflyIII/Event/Transaction.php | 14 +++++++ .../FireflyIII/Event/TransactionJournal.php | 14 ++++++- app/lib/FireflyIII/Form/Form.php | 21 +++++----- app/lib/FireflyIII/Report/Report.php | 2 + app/lib/FireflyIII/Search/Search.php | 5 +++ app/lib/FireflyIII/Shared/Facade/DateKit.php | 8 ++++ app/lib/FireflyIII/Shared/Facade/FFForm.php | 8 ++++ app/lib/FireflyIII/Shared/Facade/Filter.php | 8 ++++ .../FireflyIII/Shared/Facade/Navigation.php | 8 ++++ .../FireflyIII/Shared/Facade/Reminders.php | 8 ++++ app/lib/FireflyIII/Shared/Facade/Steam.php | 8 ++++ .../FireflyIII/Shared/Mail/Registration.php | 16 ++++---- .../Shared/SingleTableInheritanceEntity.php | 14 +++---- app/lib/FireflyIII/Shared/Toolkit/Date.php | 10 ++++- .../Shared/Validation/FireflyValidator.php | 7 ++++ app/models/Account.php | 23 +++++++---- app/models/AccountMeta.php | 5 +++ app/models/AccountType.php | 3 ++ app/models/Budget.php | 12 ++++-- app/models/{Limit.php => BudgetLimit.php} | 9 +++-- app/models/Category.php | 6 +++ app/models/Component.php | 5 +++ app/models/LimitRepetition.php | 31 ++++++++------- app/models/Piggybank.php | 9 +++++ app/models/PiggybankEvent.php | 3 ++ app/models/PiggybankRepetition.php | 11 ++++++ app/models/Preference.php | 3 ++ app/models/RecurringTransaction.php | 6 ++- app/models/Reminder.php | 17 +++++++++ app/models/Transaction.php | 27 +++++++++++++ app/models/TransactionCurrency.php | 3 ++ app/models/TransactionGroup.php | 3 ++ app/models/TransactionJournal.php | 23 +++++++++++ app/models/TransactionRelation.php | 3 ++ app/models/TransactionType.php | 3 ++ app/models/User.php | 29 +++++++------- app/routes.php | 4 +- app/start/global.php | 38 +++++++++---------- tests/functional/CategoryControllerCest.php | 3 -- 67 files changed, 651 insertions(+), 177 deletions(-) create mode 100644 app/database/migrations/2014_12_13_190730_changes_for_v321.php rename app/models/{Limit.php => BudgetLimit.php} (90%) diff --git a/app/breadcrumbs.php b/app/breadcrumbs.php index 9772319edf..3269c6e773 100644 --- a/app/breadcrumbs.php +++ b/app/breadcrumbs.php @@ -90,7 +90,7 @@ Breadcrumbs::register( $breadcrumbs->push($budget->name, route('budgets.show', $budget->id)); if (!is_null($repetition)) { $breadcrumbs->push( - DateKit::periodShow($repetition->startdate, $repetition->limit->repeat_freq), route('budgets.show', $budget->id, $repetition->id) + DateKit::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id) ); } } diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 1a90a92afd..b004435e7a 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -7,7 +7,7 @@ use FireflyIII\Shared\Preferences\PreferencesInterface as Pref; /** * Class BudgetController * - * TODO move AJAX methods to their own BudgetAjaxControlle + * TODO move AJAX methods to their own BudgetAjaxController * TODO Find out what constitutes proper camelCase * TODO How is object coupling counted? * @@ -44,7 +44,7 @@ class BudgetController extends BaseController public function amount(Budget $budget) { $amount = intval(Input::get('amount')); - $date = Session::get('start',Carbon::now()->startOfMonth()); + $date = Session::get('start', Carbon::now()->startOfMonth()); $limitRepetition = $this->_repository->updateLimitAmount($budget, $date, $amount); return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition->id]); @@ -112,16 +112,18 @@ class BudgetController extends BaseController $budgets->each( function (Budget $budget) { /** @noinspection PhpUndefinedFieldInspection */ - $budget->spent = $this->_repository->spentInMonth($budget, \Session::get('start',Carbon::now()->startOfMonth())); + $budget->spent = $this->_repository->spentInMonth($budget, \Session::get('start', Carbon::now()->startOfMonth())); /** @noinspection PhpUndefinedFieldInspection */ - $budget->currentRep = $budget->limitrepetitions()->where('limit_repetitions.startdate', \Session::get('start',Carbon::now()->startOfMonth())->format('Y-m-d'))->first( + $budget->currentRep = $budget->limitrepetitions()->where( + 'limit_repetitions.startdate', \Session::get('start', Carbon::now()->startOfMonth())->format('Y-m-d') + )->first( ['limit_repetitions.*'] ); } ); $spent = $budgets->sum('spent'); - $amount = $this->_preferences->get('budgetIncomeTotal' . \Session::get('start',Carbon::now()->startOfMonth())->format('FY'), 1000)->data; + $amount = $this->_preferences->get('budgetIncomeTotal' . \Session::get('start', Carbon::now()->startOfMonth())->format('FY'), 1000)->data; $overspent = $spent > $amount; $spentPCT = $overspent ? ceil($amount / $spent * 100) : ceil($spent / $amount * 100); @@ -133,7 +135,7 @@ class BudgetController extends BaseController */ public function postUpdateIncome() { - $this->_preferences->set('budgetIncomeTotal' . Session::get('start',Carbon::now()->startOfMonth())->format('FY'), intval(Input::get('amount'))); + $this->_preferences->set('budgetIncomeTotal' . Session::get('start', Carbon::now()->startOfMonth())->format('FY'), intval(Input::get('amount'))); return Redirect::route('budgets.index'); } @@ -146,13 +148,13 @@ class BudgetController extends BaseController */ public function show(Budget $budget, LimitRepetition $repetition = null) { - if (!is_null($repetition) && $repetition->limit->budget->id != $budget->id) { + if (!is_null($repetition) && $repetition->budgetlimit->budget->id != $budget->id) { App::abort(500); } $hideBudget = true; // used in transaction list. $journals = $this->_repository->getJournals($budget, $repetition); - $limits = $repetition ? [$repetition->limit] : $budget->limits()->orderBy('startdate', 'DESC')->get(); + $limits = $repetition ? [$repetition->limit] : $budget->budgetlimits()->orderBy('startdate', 'DESC')->get(); $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget')); @@ -244,7 +246,7 @@ class BudgetController extends BaseController */ public function updateIncome() { - $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start',Carbon::now()->startOfMonth())->format('FY'), 1000); + $budgetAmount = $this->_preferences->get('budgetIncomeTotal' . Session::get('start', Carbon::now()->startOfMonth())->format('FY'), 1000); return View::make('budgets.income')->with('amount', $budgetAmount); } diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index c31c66c354..c61be7cc12 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -1,9 +1,10 @@ addColumn('Budget', 'string'); - $chart->addColumn('Budgeted', 'number'); - $chart->addColumn('Spent', 'number'); + $this->_chart->addColumn('Budget', 'string'); + $this->_chart->addColumn('Budgeted', 'number'); + $this->_chart->addColumn('Spent', 'number'); /** @var \FireflyIII\Database\Budget $bdt */ $bdt = App::make('FireflyIII\Database\Budget'); @@ -165,7 +164,7 @@ class GoogleChartController extends BaseController */ $expenses = floatval($budget->transactionjournals()->before($searchEnd)->after($searchStart)->lessThan(0)->sum('amount')) * -1; if ($expenses > 0) { - $chart->addRow($budget->name, $limit, $expenses); + $this->_chart->addRow($budget->name, $limit, $expenses); } } @@ -175,12 +174,12 @@ class GoogleChartController extends BaseController */ $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start', Carbon::now()->startOfMonth()), Session::get('end')); $sum = $noBudgetSet->sum('amount') * -1; - $chart->addRow('No budget', 0, $sum); + $this->_chart->addRow('No budget', 0, $sum); - $chart->generate(); + $this->_chart->generate(); - return Response::json($chart->getData()); + return Response::json($this->_chart->getData()); } /** diff --git a/app/controllers/HelpController.php b/app/controllers/HelpController.php index 1424351c40..4d3bb54dcb 100644 --- a/app/controllers/HelpController.php +++ b/app/controllers/HelpController.php @@ -29,9 +29,9 @@ class HelpController extends BaseController } // get the help-content from Github: - $URL = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md'; + $uri = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md'; try { - $content = file_get_contents($URL); + $content = file_get_contents($uri); } catch (ErrorException $e) { $content = '

There is no help for this route.

'; } diff --git a/app/controllers/ReportController.php b/app/controllers/ReportController.php index 81ff131fdd..04eef366f8 100644 --- a/app/controllers/ReportController.php +++ b/app/controllers/ReportController.php @@ -6,6 +6,8 @@ use FireflyIII\Database\TransactionJournal as TransactionJournalRepository; use FireflyIII\Report\ReportInterface as ReportHelper; /** + * @SuppressWarnings("CamelCase") + * * Class ReportController */ class ReportController extends BaseController @@ -163,7 +165,7 @@ class ReportController extends BaseController public function unbalanced($year, $month) { try { - $date = new Carbon($year . '-' . $month . '-01'); + new Carbon($year . '-' . $month . '-01'); } catch (Exception $e) { App::abort(500); } diff --git a/app/controllers/TransactionController.php b/app/controllers/TransactionController.php index 5885f53f2d..cce380bad4 100644 --- a/app/controllers/TransactionController.php +++ b/app/controllers/TransactionController.php @@ -45,11 +45,11 @@ class TransactionController extends BaseController } } $unique = array_unique($ids); - if (count($ids) > 0) { + if (count($unique) > 0) { /** @var \FireflyIII\Database\TransactionJournal $repository */ $repository = App::make('FireflyIII\Database\TransactionJournal'); - $set = $repository->getByIds($ids); + $set = $repository->getByIds($unique); $set->each( function (TransactionJournal $journal) { $journal->amount = mf($journal->getAmount()); @@ -544,6 +544,7 @@ class TransactionController extends BaseController /** * @param TransactionJournal $journal * + * @return $this * @throws FireflyException */ public function update(TransactionJournal $journal) diff --git a/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php b/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php index 4474c18ec7..ba819428d3 100644 --- a/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php +++ b/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php @@ -30,19 +30,19 @@ class CreateComponentTransactionJournalTable extends Migration { Schema::create( 'component_transaction_journal', function (Blueprint $table) { - $table->increments('id'); - $table->integer('component_id')->unsigned(); - $table->integer('transaction_journal_id')->unsigned(); + $table->increments('id'); + $table->integer('component_id')->unsigned(); + $table->integer('transaction_journal_id')->unsigned(); - // link components with component_id - $table->foreign('component_id')->references('id')->on('components')->onDelete('cascade'); + // link components with component_id + $table->foreign('component_id')->references('id')->on('components')->onDelete('cascade'); - // link transaction journals with transaction_journal_id - $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); + // link transaction journals with transaction_journal_id + $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); - // combo must be unique: - $table->unique(['component_id', 'transaction_journal_id'],'cid_tjid_unique'); - } + // combo must be unique: + $table->unique(['component_id', 'transaction_journal_id'], 'cid_tjid_unique'); + } ); } diff --git a/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php b/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php index e6f25ed2ec..1b0b56e384 100644 --- a/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php +++ b/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php @@ -30,21 +30,21 @@ class CreateComponentRecurringTransactionTable extends Migration { Schema::create( 'component_recurring_transaction', function (Blueprint $table) { - $table->increments('id'); - $table->integer('component_id')->unsigned(); - $table->integer('recurring_transaction_id')->unsigned(); - $table->boolean('optional'); + $table->increments('id'); + $table->integer('component_id')->unsigned(); + $table->integer('recurring_transaction_id')->unsigned(); + $table->boolean('optional'); - // link components with component_id - $table->foreign('component_id')->references('id')->on('components')->onDelete('cascade'); + // link components with component_id + $table->foreign('component_id')->references('id')->on('components')->onDelete('cascade'); - // link transaction journals with transaction_journal_id - $table->foreign('recurring_transaction_id')->references('id')->on('recurring_transactions')->onDelete('cascade'); + // link transaction journals with transaction_journal_id + $table->foreign('recurring_transaction_id')->references('id')->on('recurring_transactions')->onDelete('cascade'); - // component and recurring transaction must be unique. - $table->unique(['component_id','recurring_transaction_id'],'cid_rtid_unique'); + // component and recurring transaction must be unique. + $table->unique(['component_id', 'recurring_transaction_id'], 'cid_rtid_unique'); - } + } ); } diff --git a/app/database/migrations/2014_12_13_190730_changes_for_v321.php b/app/database/migrations/2014_12_13_190730_changes_for_v321.php new file mode 100644 index 0000000000..1b8f084771 --- /dev/null +++ b/app/database/migrations/2014_12_13_190730_changes_for_v321.php @@ -0,0 +1,35 @@ +first(); $ibType = AccountType::whereType('Initial balance account')->first(); - $euro = TransactionCurrency::whereCode('EUR')->first(); - $obType = TransactionType::whereType('Opening balance')->first(); $withdrawal = TransactionType::whereType('Withdrawal')->first(); $transfer = TransactionType::whereType('Transfer')->first(); @@ -132,11 +130,15 @@ class TestContentSeeder extends Seeder * @param $description * @param $date * + * @param Budget $budget + * @param Category $category + * * @return TransactionJournal */ public function createTransaction( Account $from, Account $to, $amount, TransactionType $type, $description, $date, Budget $budget = null, Category $category = null - ) { + ) + { $user = User::whereEmail('thegrumpydictator@gmail.com')->first(); $euro = TransactionCurrency::whereCode('EUR')->first(); diff --git a/app/lib/FireflyIII/Collection/PiggybankPart.php b/app/lib/FireflyIII/Collection/PiggybankPart.php index faf28173b2..bf26edee5b 100644 --- a/app/lib/FireflyIII/Collection/PiggybankPart.php +++ b/app/lib/FireflyIII/Collection/PiggybankPart.php @@ -5,6 +5,11 @@ namespace FireflyIII\Collection; use Carbon\Carbon; +/** + * Class PiggybankPart + * + * @package FireflyIII\Collection + */ class PiggybankPart { /** @var float */ @@ -92,11 +97,17 @@ class PiggybankPart $this->targetdate = $targetdate; } + /** + * @return bool + */ public function hasReminder() { return !is_null($this->reminder); } + /** + * @return float|int + */ public function percentage() { if ($this->getCurrentamount() < $this->getCumulativeAmount()) { diff --git a/app/lib/FireflyIII/Database/Account.php b/app/lib/FireflyIII/Database/Account.php index 5ccd858ec3..d1d91bce21 100644 --- a/app/lib/FireflyIII/Database/Account.php +++ b/app/lib/FireflyIII/Database/Account.php @@ -221,7 +221,7 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface { // delete journals: - $journals = \TransactionJournal::whereIn( + \TransactionJournal::whereIn( 'id', function ($query) use ($model) { $query->select('transaction_journal_id') ->from('transactions')->whereIn( @@ -454,10 +454,9 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface } /** - * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. - * * @param $what * + * @throws NotImplementedException * @return \AccountType|null */ public function findByWhat($what) @@ -470,6 +469,7 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface * Returns all objects. * * @return Collection + * @throws NotImplementedException */ public function get() { @@ -487,6 +487,12 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface return $this->getUser()->accounts()->whereIn('id', $ids)->get(); } + /** + * @param $name + * + * @return static + * @throws \FireflyIII\Exception\FireflyException + */ public function firstExpenseAccountOrCreate($name) { /** @var \FireflyIII\Database\AccountType $accountTypeRepos */ @@ -510,6 +516,12 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface } + /** + * @param $name + * + * @return static + * @throws \FireflyIII\Exception\FireflyException + */ public function firstRevenueAccountOrCreate($name) { /** @var \FireflyIII\Database\AccountType $accountTypeRepos */ @@ -523,6 +535,12 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface } + /** + * @param \Account $account + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getAllTransactionJournals(\Account $account, $limit = 50) { $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; @@ -568,6 +586,13 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface return $date; } + /** + * @param \Account $account + * @param int $limit + * @param string $range + * + * @return \Illuminate\Pagination\Paginator + */ public function getTransactionJournals(\Account $account, $limit = 50, $range = 'session') { $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; @@ -580,8 +605,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface ->orderBy('date', 'DESC'); if ($range == 'session') { - $query->before(\Session::get('end', \Carbon\Carbon::now()->startOfMonth())); - $query->after(\Session::get('start', \Carbon\Carbon::now()->startOfMonth())); + $query->before(\Session::get('end', Carbon::now()->startOfMonth())); + $query->after(\Session::get('start', Carbon::now()->startOfMonth())); } $count = $query->count(); $set = $query->take($limit)->offset($offset)->get(['transaction_journals.*']); diff --git a/app/lib/FireflyIII/Database/AccountType.php b/app/lib/FireflyIII/Database/AccountType.php index 6a7131d2b1..5015214a2a 100644 --- a/app/lib/FireflyIII/Database/AccountType.php +++ b/app/lib/FireflyIII/Database/AccountType.php @@ -21,6 +21,7 @@ class AccountType implements CUD, CommonDatabaseCalls * @param \Eloquent $model * * @return bool + * @throws NotImplementedException */ public function destroy(\Eloquent $model) { @@ -32,6 +33,7 @@ class AccountType implements CUD, CommonDatabaseCalls * @param array $data * * @return \Eloquent + * @throws NotImplementedException */ public function store(array $data) { @@ -41,9 +43,10 @@ class AccountType implements CUD, CommonDatabaseCalls /** * @param \Eloquent $model - * @param array $data + * @param array $data * * @return bool + * @throws NotImplementedException */ public function update(\Eloquent $model, array $data) { @@ -58,6 +61,7 @@ class AccountType implements CUD, CommonDatabaseCalls * @param array $model * * @return array + * @throws NotImplementedException */ public function validate(array $model) { @@ -71,6 +75,7 @@ class AccountType implements CUD, CommonDatabaseCalls * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -115,6 +120,7 @@ class AccountType implements CUD, CommonDatabaseCalls * Returns all objects. * * @return Collection + * @throws NotImplementedException */ public function get() { @@ -126,6 +132,7 @@ class AccountType implements CUD, CommonDatabaseCalls * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { diff --git a/app/lib/FireflyIII/Database/Budget.php b/app/lib/FireflyIII/Database/Budget.php index 5ed3b18e6d..16adbb4e6d 100644 --- a/app/lib/FireflyIII/Database/Budget.php +++ b/app/lib/FireflyIII/Database/Budget.php @@ -136,6 +136,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -159,6 +160,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { @@ -200,6 +202,12 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return \Paginator::make($items, $count, $take); } + /** + * @param \Budget $budget + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getTransactionJournals(\Budget $budget, $limit = 50) { $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; @@ -214,6 +222,13 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface } + /** + * @param \Budget $budget + * @param \LimitRepetition $repetition + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getTransactionJournalsInRepetition(\Budget $budget, \LimitRepetition $repetition, $limit = 50) { $start = $repetition->startdate; @@ -241,8 +256,8 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface public function repetitionOnStartingOnDate(\Budget $budget, Carbon $date) { return \LimitRepetition:: - leftJoin('limits', 'limit_repetitions.limit_id', '=', 'limits.id')->leftJoin( - 'components', 'limits.component_id', '=', 'components.id' + leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')->leftJoin( + 'components', 'budget_limits.component_id', '=', 'components.id' )->where('limit_repetitions.startdate', $date->format('Y-m-d'))->where( 'components.id', $budget->id )->first(['limit_repetitions.*']); diff --git a/app/lib/FireflyIII/Database/Category.php b/app/lib/FireflyIII/Database/Category.php index 649dfc47ea..88b1c59b35 100644 --- a/app/lib/FireflyIII/Database/Category.php +++ b/app/lib/FireflyIII/Database/Category.php @@ -124,6 +124,7 @@ class Category implements CUD, CommonDatabaseCalls * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -137,6 +138,7 @@ class Category implements CUD, CommonDatabaseCalls * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -158,6 +160,7 @@ class Category implements CUD, CommonDatabaseCalls * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { @@ -165,11 +168,22 @@ class Category implements CUD, CommonDatabaseCalls throw new NotImplementedException; } + /** + * @param $name + * + * @return static + */ public function firstOrCreate($name) { return \Category::firstOrCreate(['user_id' => $this->getUser()->id, 'name' => $name]); } + /** + * @param \Category $category + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getTransactionJournals(\Category $category, $limit = 50) { $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0; @@ -185,10 +199,11 @@ class Category implements CUD, CommonDatabaseCalls } /** - * @param \Category $budget + * @param \Category $category * @param Carbon $date * * @return null + * @internal param \Category $budget */ public function repetitionOnStartingOnDate(\Category $category, Carbon $date) { diff --git a/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php b/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php index 5ff9a7aabb..426b507a76 100644 --- a/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php +++ b/app/lib/FireflyIII/Database/Ifaces/RecurringInterface.php @@ -13,10 +13,13 @@ interface RecurringInterface { /** * @param \RecurringTransaction $recurring - * @param Carbon $current - * @param Carbon $currentEnd + * @param Carbon $start + * @param Carbon $end + * + * @return null|\TransactionJournal + * @internal param Carbon $current + * @internal param Carbon $currentEnd * - * @return \TransactionJournal|null */ public function getJournalForRecurringInRange(\RecurringTransaction $recurring, Carbon $start, Carbon $end); diff --git a/app/lib/FireflyIII/Database/Ifaces/ReportInterface.php b/app/lib/FireflyIII/Database/Ifaces/ReportInterface.php index 192d388c90..90aef7181a 100644 --- a/app/lib/FireflyIII/Database/Ifaces/ReportInterface.php +++ b/app/lib/FireflyIII/Database/Ifaces/ReportInterface.php @@ -5,6 +5,11 @@ namespace FireflyIII\Database\Ifaces; use Carbon\Carbon; +/** + * Interface ReportInterface + * + * @package FireflyIII\Database\Ifaces + */ interface ReportInterface { diff --git a/app/lib/FireflyIII/Database/Piggybank.php b/app/lib/FireflyIII/Database/Piggybank.php index f416900a4c..0f8c4e58f6 100644 --- a/app/lib/FireflyIII/Database/Piggybank.php +++ b/app/lib/FireflyIII/Database/Piggybank.php @@ -203,6 +203,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -224,6 +225,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { @@ -231,7 +233,16 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface throw new NotImplementedException; } - public function findRepetitionByDate(\Piggybank $piggybank, Carbon $date) + /** + * @param \Piggybank $piggybank + * @param Carbon $date + * + * @return mixed + * @throws FireflyException + * @throws NotImplementedException + */ + public function findRepetitionByDate(\Piggybank $piggybank, /** @noinspection PhpUnusedParameterInspection */ + Carbon $date) { $reps = $piggybank->piggybankrepetitions()->get(); if ($reps->count() == 1) { diff --git a/app/lib/FireflyIII/Database/Recurring.php b/app/lib/FireflyIII/Database/Recurring.php index d87a7f2b33..d503230d97 100644 --- a/app/lib/FireflyIII/Database/Recurring.php +++ b/app/lib/FireflyIII/Database/Recurring.php @@ -183,6 +183,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -196,6 +197,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -217,6 +219,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { diff --git a/app/lib/FireflyIII/Database/RepeatedExpense.php b/app/lib/FireflyIII/Database/RepeatedExpense.php index e0294558ce..18d098bd8f 100644 --- a/app/lib/FireflyIII/Database/RepeatedExpense.php +++ b/app/lib/FireflyIII/Database/RepeatedExpense.php @@ -13,6 +13,11 @@ use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; +/** + * Class RepeatedExpense + * + * @package FireflyIII\Database + */ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface { use SwitchUser; @@ -30,6 +35,8 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * other variables this method tries to divide the piggy bank into equal parts. Each is * accommodated by a reminder (if everything goes to plan). * + * @param \PiggybankRepetition $repetition + * * @return \PiggybankRepetition */ public function calculateParts(\PiggybankRepetition $repetition) @@ -98,7 +105,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface foreach ($bars as $index => $bar) { $bar->setAmountPerBar($amountPerBar); $bar->setCumulativeAmount($cumulative); - if($parts -1 == $index) { + if ($parts - 1 == $index) { $bar->setCumulativeAmount($piggyBank->targetamount); } @@ -275,6 +282,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * @param \Eloquent $model * * @return bool + * @throws NotImplementedException */ public function destroy(\Eloquent $model) { @@ -316,9 +324,10 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface /** * @param \Eloquent $model - * @param array $data + * @param array $data * * @return bool + * @throws NotImplementedException */ public function update(\Eloquent $model, array $data) { @@ -426,6 +435,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -439,6 +449,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -460,6 +471,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { @@ -471,6 +483,7 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggybankInterface * @param \Account $account * * @return float + * @throws NotImplementedException */ public function leftOnAccount(\Account $account) { diff --git a/app/lib/FireflyIII/Database/Report.php b/app/lib/FireflyIII/Database/Report.php index 4cd5d5238c..7de6f79481 100644 --- a/app/lib/FireflyIII/Database/Report.php +++ b/app/lib/FireflyIII/Database/Report.php @@ -12,6 +12,11 @@ namespace FireflyIII\Database; use Carbon\Carbon; use FireflyIII\Database\Ifaces\ReportInterface; +/** + * Class Report + * + * @package FireflyIII\Database + */ class Report implements ReportInterface { use SwitchUser; diff --git a/app/lib/FireflyIII/Database/Transaction.php b/app/lib/FireflyIII/Database/Transaction.php index 514ea66217..566c41c9de 100644 --- a/app/lib/FireflyIII/Database/Transaction.php +++ b/app/lib/FireflyIII/Database/Transaction.php @@ -24,6 +24,7 @@ class Transaction implements CUD, CommonDatabaseCalls * @param \Eloquent $model * * @return bool + * @throws NotImplementedException */ public function destroy(\Eloquent $model) { @@ -35,6 +36,7 @@ class Transaction implements CUD, CommonDatabaseCalls * @param array $data * * @return \Eloquent + * @throws FireflyException */ public function store(array $data) { @@ -59,9 +61,10 @@ class Transaction implements CUD, CommonDatabaseCalls /** * @param \Eloquent $model - * @param array $data + * @param array $data * * @return bool + * @throws NotImplementedException */ public function update(\Eloquent $model, array $data) { @@ -141,6 +144,7 @@ class Transaction implements CUD, CommonDatabaseCalls * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -154,6 +158,7 @@ class Transaction implements CUD, CommonDatabaseCalls * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -165,6 +170,7 @@ class Transaction implements CUD, CommonDatabaseCalls * Returns all objects. * * @return Collection + * @throws NotImplementedException */ public function get() { @@ -176,6 +182,7 @@ class Transaction implements CUD, CommonDatabaseCalls * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { diff --git a/app/lib/FireflyIII/Database/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal.php index 4a51e9e607..a05f8d5e62 100644 --- a/app/lib/FireflyIII/Database/TransactionJournal.php +++ b/app/lib/FireflyIII/Database/TransactionJournal.php @@ -58,6 +58,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData * @param array $data * * @return \Eloquent + * @throws FireflyException */ public function store(array $data) { @@ -174,6 +175,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData * @param array $data * * @return bool + * @throws FireflyException */ public function update(\Eloquent $model, array $data) { @@ -186,9 +188,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData /** @var \FireflyIII\Database\TransactionCurrency $currencyRepository */ $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency'); - /** @var \FireflyIII\Database\Transaction $transactionRepository */ - $transactionRepository = \App::make('FireflyIII\Database\Transaction'); - $journalType = $typeRepository->findByWhat($data['what']); $currency = $currencyRepository->findByCode($data['currency']); @@ -284,6 +283,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData * @param array $model * * @return array + * @throws FireflyException */ public function validate(array $model) { @@ -350,7 +350,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData /* * Many checks to catch invalid or not-existing accounts. */ - $accountError = false; switch (true) { // this combination is often seen in withdrawals. case (isset($model['account_id']) && isset($model['expense_account'])): @@ -458,6 +457,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData * @param $what * * @return \AccountType|null + * @throws NotImplementedException */ public function findByWhat($what) { @@ -560,6 +560,11 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData return $sum; } + /** + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getDepositsPaginated($limit = 50) { $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0; @@ -599,6 +604,11 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData return $query; } + /** + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getTransfersPaginated($limit = 50) { $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0; @@ -615,6 +625,11 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData return \Paginator::make($items, $count, $limit); } + /** + * @param int $limit + * + * @return \Illuminate\Pagination\Paginator + */ public function getWithdrawalsPaginated($limit = 50) { $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0; diff --git a/app/lib/FireflyIII/Database/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType.php index 566c60ba45..8c19431c34 100644 --- a/app/lib/FireflyIII/Database/TransactionType.php +++ b/app/lib/FireflyIII/Database/TransactionType.php @@ -23,6 +23,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param \Eloquent $model * * @return bool + * @throws NotImplementedException */ public function destroy(\Eloquent $model) { @@ -34,6 +35,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param array $data * * @return \Eloquent + * @throws NotImplementedException */ public function store(array $data) { @@ -43,9 +45,10 @@ class TransactionType implements CUD, CommonDatabaseCalls /** * @param \Eloquent $model - * @param array $data + * @param array $data * * @return bool + * @throws NotImplementedException */ public function update(\Eloquent $model, array $data) { @@ -60,6 +63,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param array $model * * @return array + * @throws NotImplementedException */ public function validate(array $model) { @@ -73,6 +77,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param int $id * * @return \Eloquent + * @throws NotImplementedException */ public function find($id) { @@ -86,6 +91,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param $what * * @return \AccountType|null + * @throws FireflyException */ public function findByWhat($what) { @@ -114,6 +120,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * Returns all objects. * * @return Collection + * @throws NotImplementedException */ public function get() { @@ -125,6 +132,7 @@ class TransactionType implements CUD, CommonDatabaseCalls * @param array $ids * * @return Collection + * @throws NotImplementedException */ public function getByIds(array $ids) { diff --git a/app/lib/FireflyIII/Event/Account.php b/app/lib/FireflyIII/Event/Account.php index 7b265b9816..bdc87d8e9a 100644 --- a/app/lib/FireflyIII/Event/Account.php +++ b/app/lib/FireflyIII/Event/Account.php @@ -5,14 +5,25 @@ namespace FireflyIII\Event; use Illuminate\Events\Dispatcher; +/** + * Class Account + * + * @package FireflyIII\Event + */ class Account { + /** + * @param \Account $account + */ public function destroy(\Account $account) { \Cache::forget('account.' . $account->id . '.latestBalance'); \Cache::forget('account.' . $account->id . '.lastActivityDate'); } + /** + * @param \Account $account + */ public function store(\Account $account) { @@ -31,6 +42,9 @@ class Account $events->listen('account.destroy', 'FireflyIII\Event\Account@destroy'); } + /** + * @param \Account $account + */ public function update(\Account $account) { \Cache::forget('account.' . $account->id . '.latestBalance'); diff --git a/app/lib/FireflyIII/Event/Budget.php b/app/lib/FireflyIII/Event/Budget.php index adbd8abb95..f40e02b958 100644 --- a/app/lib/FireflyIII/Event/Budget.php +++ b/app/lib/FireflyIII/Event/Budget.php @@ -5,35 +5,40 @@ namespace FireflyIII\Event; use Illuminate\Database\QueryException; use Illuminate\Events\Dispatcher; +/** + * Class Budget + * + * @package FireflyIII\Event + */ class Budget { /** - * @param \Limit $limit + * @param \BudgetLimit $budgetLimit */ - public function storeOrUpdateLimit(\Limit $limit) + public function storeOrUpdateLimit(\BudgetLimit $budgetLimit) { - $end = \DateKit::addPeriod(clone $limit->startdate, $limit->repeat_freq, 0); + $end = \DateKit::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0); $end->subDay(); - $set = $limit->limitrepetitions()->where('startdate', $limit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d'))->get(); + $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d'))->get(); /* * Create new LimitRepetition: */ if ($set->count() == 0) { $repetition = new \LimitRepetition(); - $repetition->startdate = $limit->startdate; + $repetition->startdate = $budgetLimit->startdate; $repetition->enddate = $end; - $repetition->amount = $limit->amount; - $repetition->limit()->associate($limit); + $repetition->amount = $budgetLimit->amount; + $repetition->budgetLimit()->associate($budgetLimit); try { $repetition->save(); } catch (QueryException $e) { - \Log::error('Trying to save new Limitrepetition failed!'); + \Log::error('Trying to save new LimitRepetition failed!'); \Log::error($e->getMessage()); } } else { @@ -42,7 +47,7 @@ class Budget * Update existing one. */ $repetition = $set->first(); - $repetition->amount = $limit->amount; + $repetition->amount = $budgetLimit->amount; $repetition->save(); } diff --git a/app/lib/FireflyIII/Event/Event.php b/app/lib/FireflyIII/Event/Event.php index 1f670ccb20..0f4bfda97a 100644 --- a/app/lib/FireflyIII/Event/Event.php +++ b/app/lib/FireflyIII/Event/Event.php @@ -4,9 +4,19 @@ namespace FireflyIII\Event; use Illuminate\Events\Dispatcher; +/** + * Class Event + * + * @package FireflyIII\Event + */ class Event { + /** + * @param \Account $account + * + * @throws \Exception + */ public function deleteAccount(\Account $account) { // get piggy banks diff --git a/app/lib/FireflyIII/Event/Piggybank.php b/app/lib/FireflyIII/Event/Piggybank.php index 05657efafb..206c165988 100644 --- a/app/lib/FireflyIII/Event/Piggybank.php +++ b/app/lib/FireflyIII/Event/Piggybank.php @@ -6,6 +6,11 @@ namespace FireflyIII\Event; use Carbon\Carbon; use Illuminate\Events\Dispatcher; +/** + * Class Piggybank + * + * @package FireflyIII\Event + */ class Piggybank { @@ -21,13 +26,19 @@ class Piggybank $event->amount = floatval($amount); $event->date = new Carbon; if (!$event->isValid()) { - var_dump($event->getErrors()); - exit(); + \Log::error($event->getErrors()); + \App::abort(500); } $event->save(); } } + /** + * @param \TransactionJournal $journal + * + * @throws \FireflyIII\Exception\FireflyException + * @throws \FireflyIII\Exception\NotImplementedException + */ public function destroyTransfer(\TransactionJournal $journal) { if ($journal->piggybankevents()->count() > 0) { @@ -88,6 +99,9 @@ class Piggybank } } + /** + * @param \Piggybank $piggybank + */ public function storePiggybank(\Piggybank $piggybank) { if (intval($piggybank->repeats) == 0) { @@ -250,6 +264,9 @@ class Piggybank } } + /** + * @param \Piggybank $piggyBank + */ public function updatePiggybank(\Piggybank $piggyBank) { // get the repetition: @@ -259,6 +276,12 @@ class Piggybank $repetition->save(); } + /** + * @param \TransactionJournal $journal + * + * @throws \FireflyIII\Exception\FireflyException + * @throws \FireflyIII\Exception\NotImplementedException + */ public function updateTransfer(\TransactionJournal $journal) { diff --git a/app/lib/FireflyIII/Event/Transaction.php b/app/lib/FireflyIII/Event/Transaction.php index 285e942875..e5d53e04f5 100644 --- a/app/lib/FireflyIII/Event/Transaction.php +++ b/app/lib/FireflyIII/Event/Transaction.php @@ -5,14 +5,25 @@ namespace FireflyIII\Event; use Illuminate\Events\Dispatcher; +/** + * Class Transaction + * + * @package FireflyIII\Event + */ class Transaction { + /** + * @param \Transaction $transaction + */ public function destroy(\Transaction $transaction) { \Cache::forget('account.' . $transaction->account_id . '.latestBalance'); \Cache::forget('account.' . $transaction->account_id . '.lastActivityDate'); } + /** + * @param \Transaction $transaction + */ public function store(\Transaction $transaction) { \Cache::forget('account.' . $transaction->account_id . '.latestBalance'); @@ -30,6 +41,9 @@ class Transaction $events->listen('transaction.destroy', 'FireflyIII\Event\Transaction@destroy'); } + /** + * @param \Transaction $transaction + */ public function update(\Transaction $transaction) { \Cache::forget('account.' . $transaction->account_id . '.latestBalance'); diff --git a/app/lib/FireflyIII/Event/TransactionJournal.php b/app/lib/FireflyIII/Event/TransactionJournal.php index aabc4c0537..88353e34ee 100644 --- a/app/lib/FireflyIII/Event/TransactionJournal.php +++ b/app/lib/FireflyIII/Event/TransactionJournal.php @@ -4,10 +4,19 @@ namespace FireflyIII\Event; use Illuminate\Events\Dispatcher; +/** + * Class TransactionJournal + * + * @package FireflyIII\Event + */ class TransactionJournal { - public function store(\TransactionJournal $journal, $id = 0) + /** + * @param \TransactionJournal $journal + * @param int $id + */ + public function store(\TransactionJournal $journal) { /** @var \FireflyIII\Database\Recurring $repository */ $repository = \App::make('FireflyIII\Database\Recurring'); @@ -30,6 +39,9 @@ class TransactionJournal $events->listen('transactionJournal.update', 'FireflyIII\Event\TransactionJournal@update'); } + /** + * @param \TransactionJournal $journal + */ public function update(\TransactionJournal $journal) { /** @var \FireflyIII\Database\Recurring $repository */ diff --git a/app/lib/FireflyIII/Form/Form.php b/app/lib/FireflyIII/Form/Form.php index 9b11b13678..4f8bda184d 100644 --- a/app/lib/FireflyIII/Form/Form.php +++ b/app/lib/FireflyIII/Form/Form.php @@ -287,18 +287,17 @@ class Form /* * Store. */ - $store = ''; switch ($type) { case 'create': - $store = '
'; + $store = '
'; $store .= '
'; break; case 'update': - $store = '
'; + $store = '
'; $store .= '
'; break; default: @@ -309,9 +308,9 @@ class Form /* * validate is always the same: */ - $validate = '