Renamed some stuff, courtesy of sensiolabs.

This commit is contained in:
James Cole
2016-01-28 21:50:20 +01:00
parent e5b4a55d8e
commit 168ed5ac56
74 changed files with 208 additions and 155 deletions

View File

@@ -1,4 +1,11 @@
<?php
/**
* AccountChartGeneratorInterface.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Account;
@@ -7,11 +14,11 @@ use FireflyIII\Models\Account;
use Illuminate\Support\Collection;
/**
* Interface AccountChartGenerator
* Interface AccountChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\Account
*/
interface AccountChartGenerator
interface AccountChartGeneratorInterface
{
/**

View File

@@ -12,7 +12,7 @@ use Steam;
*
* @package FireflyIII\Generator\Chart\Account
*/
class ChartJsAccountChartGenerator implements AccountChartGenerator
class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
{
/**

View File

@@ -1,4 +1,12 @@
<?php
/**
* BillChartGeneratorInterface.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Bill;
@@ -6,11 +14,11 @@ use FireflyIII\Models\Bill;
use Illuminate\Support\Collection;
/**
* Interface BillChartGenerator
* Interface BillChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\Bill
*/
interface BillChartGenerator
interface BillChartGeneratorInterface
{
/**

View File

@@ -1,4 +1,11 @@
<?php
/**
* ChartJsBillChartGenerator.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Bill;
@@ -11,7 +18,7 @@ use Illuminate\Support\Collection;
*
* @package FireflyIII\Generator\Chart\Bill
*/
class ChartJsBillChartGenerator implements BillChartGenerator
class ChartJsBillChartGenerator implements BillChartGeneratorInterface
{
/**

View File

@@ -1,15 +1,22 @@
<?php
/**
* BudgetChartGeneratorInterface.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Budget;
use Illuminate\Support\Collection;
/**
* Interface BudgetChartGenerator
* Interface BudgetChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\Budget
*/
interface BudgetChartGenerator
interface BudgetChartGeneratorInterface
{
/**
* @param Collection $entries

View File

@@ -12,7 +12,7 @@ use Preferences;
*
* @package FireflyIII\Generator\Chart\Budget
*/
class ChartJsBudgetChartGenerator implements BudgetChartGenerator
class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
{
/**

View File

@@ -1,15 +1,22 @@
<?php
/**
* CategoryChartGeneratorInterface.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Category;
use Illuminate\Support\Collection;
/**
* Interface CategoryChartGenerator
* Interface CategoryChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\Category
*/
interface CategoryChartGenerator
interface CategoryChartGeneratorInterface
{
/**

View File

@@ -10,7 +10,7 @@ use Illuminate\Support\Collection;
*
* @package FireflyIII\Generator\Chart\Category
*/
class ChartJsCategoryChartGenerator implements CategoryChartGenerator
class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
{
/**

View File

@@ -11,7 +11,7 @@ use Illuminate\Support\Collection;
*
* @package FireflyIII\Generator\Chart\PiggyBank
*/
class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
{
/**

View File

@@ -1,20 +0,0 @@
<?php
namespace FireflyIII\Generator\Chart\PiggyBank;
use Illuminate\Support\Collection;
/**
* Interface PiggyBankChartGenerator
*
* @package FireflyIII\Generator\Chart\PiggyBank
*/
interface PiggyBankChartGenerator
{
/**
* @param Collection $set
*
* @return array
*/
public function history(Collection $set);
}

View File

@@ -0,0 +1,27 @@
<?php
/**
* PiggyBankChartGenerator.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\PiggyBank;
use Illuminate\Support\Collection;
/**
* Interface PiggyBankChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\PiggyBank
*/
interface PiggyBankChartGeneratorInterface
{
/**
* @param Collection $set
*
* @return array
*/
public function history(Collection $set);
}

View File

@@ -1,15 +1,22 @@
<?php
/**
* ReportChartGenerator.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Generator\Chart\Report;
use Illuminate\Support\Collection;
/**
* Interface ReportChartGenerator
* Interface ReportChartGeneratorInterface
*
* @package FireflyIII\Generator\Chart\Report
*/
interface ReportChartGenerator
interface ReportChartGeneratorInterface
{
/**

View File

@@ -73,7 +73,5 @@ class FireRulesForStore
}
}
// echo 'Done processing rules. See log.';
// exit;
}
}
}

View File

@@ -71,4 +71,4 @@ class FireRulesForUpdate
}
}
}
}
}

View File

@@ -41,4 +41,4 @@ class Specifix
}
}
}

View File

@@ -110,4 +110,4 @@ class AccountReportHelper implements AccountReportHelperInterface
return $object;
}
}
}

View File

@@ -33,4 +33,4 @@ interface AccountReportHelperInterface
*/
public function getAccountReport(Carbon $start, Carbon $end, Collection $accounts);
}
}

View File

@@ -238,4 +238,4 @@ class BalanceReportHelper implements BalanceReportHelperInterface
return $tags;
}
}
}

View File

@@ -29,4 +29,4 @@ interface BalanceReportHelperInterface
* @return Balance
*/
public function getBalanceReport(Carbon $start, Carbon $end, Collection $accounts);
}
}

View File

@@ -130,4 +130,4 @@ class BudgetReportHelper implements BudgetReportHelperInterface
return $sum;
}
}
}

View File

@@ -29,4 +29,4 @@ interface BudgetReportHelperInterface
* @return BudgetCollection
*/
public function getBudgetReport(Carbon $start, Carbon $end, Collection $accounts);
}
}

View File

@@ -20,7 +20,7 @@ use Session;
class AccountController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Account\AccountChartGenerator */
/** @var \FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface */
protected $generator;
/**
@@ -30,7 +30,7 @@ class AccountController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface');
}

View File

@@ -19,7 +19,7 @@ use Session;
class BillController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Bill\BillChartGenerator */
/** @var \FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface */
protected $generator;
/**
@@ -29,7 +29,7 @@ class BillController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface');
}
/**

View File

@@ -23,7 +23,7 @@ use Session;
class BudgetController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Budget\BudgetChartGenerator */
/** @var \FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface */
protected $generator;
/**
@@ -33,7 +33,7 @@ class BudgetController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface');
}
/**

View File

@@ -23,7 +23,7 @@ use stdClass;
*/
class CategoryController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Category\CategoryChartGenerator */
/** @var \FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface */
protected $generator;
/**
@@ -33,7 +33,7 @@ class CategoryController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface');
}

View File

@@ -18,7 +18,7 @@ use Response;
class PiggyBankController extends Controller
{
/** @var \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator */
/** @var \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface */
protected $generator;
/**
@@ -28,7 +28,7 @@ class PiggyBankController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface');
}
/**

View File

@@ -18,7 +18,7 @@ use Response;
class ReportController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Report\ReportChartGenerator */
/** @var \FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface */
protected $generator;
/**
@@ -28,7 +28,7 @@ class ReportController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGenerator');
$this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface');
}

View File

@@ -204,4 +204,4 @@ class RuleGroupController extends Controller
}
}
}

View File

@@ -102,12 +102,18 @@ class FireflyServiceProvider extends ServiceProvider
$this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper');
// make charts:
$this->app->bind('FireflyIII\Generator\Chart\Account\AccountChartGenerator', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGenerator', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGenerator', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator');
$this->app->bind(
'FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'
);
$this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator');
$this->app->bind(
'FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator'
);
$this->app->bind(
'FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator'
);
$this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator');
$this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help');
@@ -121,7 +127,6 @@ class FireflyServiceProvider extends ServiceProvider
$this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper');
}
}

View File

@@ -203,4 +203,4 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
return $ruleGroup;
}
}
}

View File

@@ -78,4 +78,4 @@ interface RuleGroupRepositoryInterface
public function update(RuleGroup $ruleGroup, array $data);
}
}

View File

@@ -31,4 +31,4 @@ interface ActionInterface
* @return bool
*/
public function act();
}
}

View File

@@ -53,4 +53,4 @@ class AddTag implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class AppendDescription implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class ClearBudget implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class ClearCategory implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class PrependDescription implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class RemoveAllTags implements ActionInterface
return true;
}
}
}

View File

@@ -58,4 +58,4 @@ class RemoveTag implements ActionInterface
return true;
}
}
}

View File

@@ -62,4 +62,4 @@ class SetBudget implements ActionInterface
return true;
}
}
}

View File

@@ -51,4 +51,4 @@ class SetCategory implements ActionInterface
return true;
}
}
}

View File

@@ -45,4 +45,4 @@ class SetDescription implements ActionInterface
return true;
}
}
}

View File

@@ -157,4 +157,4 @@ class Processor
}
}
}

View File

@@ -61,4 +61,4 @@ class AmountExactly implements TriggerInterface
return false;
}
}
}

View File

@@ -61,4 +61,4 @@ class AmountLess implements TriggerInterface
return false;
}
}
}

View File

@@ -61,4 +61,4 @@ class AmountMore implements TriggerInterface
return false;
}
}
}

View File

@@ -62,4 +62,4 @@ class DescriptionContains implements TriggerInterface
return false;
}
}
}

View File

@@ -71,4 +71,4 @@ class DescriptionEnds implements TriggerInterface
return false;
}
}
}

View File

@@ -57,4 +57,4 @@ class DescriptionIs implements TriggerInterface
return false;
}
}
}

View File

@@ -59,4 +59,4 @@ class DescriptionStarts implements TriggerInterface
return false;
}
}
}

View File

@@ -61,4 +61,4 @@ class FromAccountContains implements TriggerInterface
return false;
}
}
}

View File

@@ -71,4 +71,4 @@ class FromAccountEnds implements TriggerInterface
return false;
}
}
}

View File

@@ -57,4 +57,4 @@ class FromAccountIs implements TriggerInterface
return false;
}
}
}

View File

@@ -59,4 +59,4 @@ class FromAccountStarts implements TriggerInterface
return false;
}
}
}

View File

@@ -61,4 +61,4 @@ class ToAccountContains implements TriggerInterface
return false;
}
}
}

View File

@@ -71,4 +71,4 @@ class ToAccountEnds implements TriggerInterface
return false;
}
}
}

View File

@@ -57,4 +57,4 @@ class ToAccountIs implements TriggerInterface
return false;
}
}
}

View File

@@ -59,4 +59,4 @@ class ToAccountStarts implements TriggerInterface
return false;
}
}
}

View File

@@ -56,4 +56,4 @@ class TransactionType implements TriggerInterface
return false;
}
}
}

View File

@@ -31,4 +31,4 @@ interface TriggerInterface
* @return bool
*/
public function triggered();
}
}

View File

@@ -52,4 +52,4 @@ class UserAction implements TriggerInterface
return true;
}
}
}

View File

@@ -47,4 +47,4 @@ class AccountList implements BinderInterface
}
throw new NotFoundHttpException;
}
}
}

View File

@@ -24,4 +24,4 @@ interface BinderInterface
*/
public static function routeBinder($value, $route);
}
}

View File

@@ -49,4 +49,4 @@ class BudgetList implements BinderInterface
}
throw new NotFoundHttpException;
}
}
}

View File

@@ -47,4 +47,4 @@ class CategoryList implements BinderInterface
}
throw new NotFoundHttpException;
}
}
}

View File

@@ -42,4 +42,4 @@ class Domain
{
return Config::get('firefly.rule-triggers');
}
}
}

View File

@@ -94,4 +94,4 @@ class Rule extends Twig_Extension
{
return 'FireflyIII\Support\Twig\Rule';
}
}
}