kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Renamed some stuff, courtesy of sensiolabs.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Generator/Chart/Account/AccountChartGenerator.php → app/Generator/Chart/Account/AccountChartGeneratorInterface.php
View File

@@ -1,4 +1,11 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Account;
@@ -7,11 +14,11 @@ use FireflyIII\Models\Account;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Interface AccountChartGenerator * Interface AccountChartGeneratorInterface
* *
* @package FireflyIII\Generator\Chart\Account * @package FireflyIII\Generator\Chart\Account
*/ */
interface AccountChartGenerator interface AccountChartGeneratorInterface
{ {
/** /**

2
app/Generator/Chart/Account/ChartJsAccountChartGenerator.php
View File

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

12
app/Generator/Chart/Bill/BillChartGenerator.php → app/Generator/Chart/Bill/BillChartGeneratorInterface.php
View File

@@ -1,4 +1,12 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Bill;
@@ -6,11 +14,11 @@ use FireflyIII\Models\Bill;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Interface BillChartGenerator * Interface BillChartGeneratorInterface
* *
* @package FireflyIII\Generator\Chart\Bill * @package FireflyIII\Generator\Chart\Bill
*/ */
interface BillChartGenerator interface BillChartGeneratorInterface
{ {
/** /**

9
app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
View File

@@ -1,4 +1,11 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Bill;
@@ -11,7 +18,7 @@ use Illuminate\Support\Collection;
* *
* @package FireflyIII\Generator\Chart\Bill * @package FireflyIII\Generator\Chart\Bill
*/ */
class ChartJsBillChartGenerator implements BillChartGenerator class ChartJsBillChartGenerator implements BillChartGeneratorInterface
{ {
/** /**

11
app/Generator/Chart/Budget/BudgetChartGenerator.php → app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
View File

@@ -1,15 +1,22 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Budget;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Interface BudgetChartGenerator * Interface BudgetChartGeneratorInterface
* *
* @package FireflyIII\Generator\Chart\Budget * @package FireflyIII\Generator\Chart\Budget
*/ */
interface BudgetChartGenerator interface BudgetChartGeneratorInterface
{ {
/** /**
* @param Collection $entries * @param Collection $entries

2
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

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

11
app/Generator/Chart/Category/CategoryChartGenerator.php → app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
View File

@@ -1,15 +1,22 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Category;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Interface CategoryChartGenerator * Interface CategoryChartGeneratorInterface
* *
* @package FireflyIII\Generator\Chart\Category * @package FireflyIII\Generator\Chart\Category
*/ */
interface CategoryChartGenerator interface CategoryChartGeneratorInterface
{ {
/** /**

2
app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
View File

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

2
app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
View File

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

20
app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php
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);
}

27
app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php Normal file
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);
}

11
app/Generator/Chart/Report/ReportChartGenerator.php → app/Generator/Chart/Report/ReportChartGeneratorInterface.php
View File

@@ -1,15 +1,22 @@
<?php <?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; namespace FireflyIII\Generator\Chart\Report;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Interface ReportChartGenerator * Interface ReportChartGeneratorInterface
* *
* @package FireflyIII\Generator\Chart\Report * @package FireflyIII\Generator\Chart\Report
*/ */
interface ReportChartGenerator interface ReportChartGeneratorInterface
{ {
/** /**

2
app/Handlers/Events/FireRulesForStore.php
View File

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

4
app/Http/Controllers/Chart/AccountController.php
View File

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

4
app/Http/Controllers/Chart/BillController.php
View File

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

4
app/Http/Controllers/Chart/BudgetController.php
View File

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

4
app/Http/Controllers/Chart/CategoryController.php
View File

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

4
app/Http/Controllers/Chart/PiggyBankController.php
View File

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

4
app/Http/Controllers/Chart/ReportController.php
View File

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

19
app/Providers/FireflyServiceProvider.php
View File

@@ -102,12 +102,18 @@ class FireflyServiceProvider extends ServiceProvider
$this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper'); $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper');
// make charts: // make charts:
$this->app->bind('FireflyIII\Generator\Chart\Account\AccountChartGenerator', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'); $this->app->bind(
$this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGenerator', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator'); 'FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface', 'FireflyIII\Generator\Chart\Account\ChartJsAccountChartGenerator'
$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\Bill\BillChartGeneratorInterface', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator'); $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator'); $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'); $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'); $this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper');
} }
} }

90
composer.lock generated
View File

@@ -759,16 +759,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.2.10", "version": "v5.2.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "93dc5b0089eef468157fd7200e575c3861ec59a5" "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/93dc5b0089eef468157fd7200e575c3861ec59a5", "url": "https://api.github.com/repos/laravel/framework/zipball/6b6255ad7bfbdb721b8d00b09d52b146c5d363d7",
"reference": "93dc5b0089eef468157fd7200e575c3861ec59a5", "reference": "6b6255ad7bfbdb721b8d00b09d52b146c5d363d7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -883,20 +883,20 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2016-01-13 20:29:10" "time": "2016-01-26 04:15:37"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
"version": "v5.2.2", "version": "v5.2.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/LaravelCollective/html.git", "url": "https://github.com/LaravelCollective/html.git",
"reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc" "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a312d39ffe37da0f57b602618b61fd07c1fcec5",
"reference": "c88b2d59a56ed2290fc5082a1a6099e357c9fdbc", "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -937,7 +937,7 @@
], ],
"description": "HTML and Form Builders for the Laravel Framework", "description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com", "homepage": "http://laravelcollective.com",
"time": "2016-01-16 16:54:49" "time": "2016-01-27 22:29:54"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
@@ -1227,23 +1227,23 @@
}, },
{ {
"name": "mtdowling/cron-expression", "name": "mtdowling/cron-expression",
"version": "v1.0.4", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mtdowling/cron-expression.git", "url": "https://github.com/mtdowling/cron-expression.git",
"reference": "fd92e883195e5dfa77720b1868cf084b08be4412" "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412", "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
"reference": "fd92e883195e5dfa77720b1868cf084b08be4412", "reference": "c9ee7886f5a12902b225a1a12f36bb45f9ab89e5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2" "php": ">=5.3.2"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.*" "phpunit/phpunit": "~4.0|~5.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -1267,7 +1267,7 @@
"cron", "cron",
"schedule" "schedule"
], ],
"time": "2015-01-11 23:07:46" "time": "2016-01-26 21:23:30"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
@@ -2004,16 +2004,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.0.1", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" "reference": "1289d16209491b584839022f29257ad859b8532d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
"reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", "reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2025,7 +2025,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2059,20 +2059,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2015-11-20 09:19:13" "time": "2016-01-20 09:13:37"
}, },
{ {
"name": "symfony/polyfill-php56", "name": "symfony/polyfill-php56",
"version": "v1.0.1", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php56.git", "url": "https://github.com/symfony/polyfill-php56.git",
"reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f" "reference": "4d891fff050101a53a4caabb03277284942d1ad9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9",
"reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f", "reference": "4d891fff050101a53a4caabb03277284942d1ad9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2082,7 +2082,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2115,20 +2115,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2015-12-18 15:10:25" "time": "2016-01-20 09:13:37"
}, },
{ {
"name": "symfony/polyfill-util", "name": "symfony/polyfill-util",
"version": "v1.0.1", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-util.git", "url": "https://github.com/symfony/polyfill-util.git",
"reference": "4271c55cbc0a77b2641f861b978123e46b3da969" "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969", "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
"reference": "4271c55cbc0a77b2641f861b978123e46b3da969", "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2137,7 +2137,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2167,7 +2167,7 @@
"polyfill", "polyfill",
"shim" "shim"
], ],
"time": "2015-11-04 20:28:58" "time": "2016-01-20 09:13:37"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
@@ -2421,16 +2421,16 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.23.3", "version": "v1.24.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "ae53fc2c312fdee63773b75cb570304f85388b08" "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08", "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
"reference": "ae53fc2c312fdee63773b75cb570304f85388b08", "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2443,7 +2443,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.23-dev" "dev-master": "1.24-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2478,7 +2478,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2016-01-11 14:02:19" "time": "2016-01-25 21:22:18"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
@@ -2533,16 +2533,16 @@
}, },
{ {
"name": "watson/validating", "name": "watson/validating",
"version": "2.0.0", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dwightwatson/validating.git", "url": "https://github.com/dwightwatson/validating.git",
"reference": "508c130ea82bc83c65071ffcf1680cdfa16412d6" "reference": "85e31d1f62ebf9dd9b63cf30f7318f379cc36179"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dwightwatson/validating/zipball/508c130ea82bc83c65071ffcf1680cdfa16412d6", "url": "https://api.github.com/repos/dwightwatson/validating/zipball/85e31d1f62ebf9dd9b63cf30f7318f379cc36179",
"reference": "508c130ea82bc83c65071ffcf1680cdfa16412d6", "reference": "85e31d1f62ebf9dd9b63cf30f7318f379cc36179",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2584,7 +2584,7 @@
"laravel", "laravel",
"validation" "validation"
], ],
"time": "2015-12-25 23:19:17" "time": "2016-01-27 00:10:53"
}, },
{ {
"name": "zizaco/entrust", "name": "zizaco/entrust",

2
database/seeds/TestDataSeeder.php
View File

@@ -41,7 +41,7 @@ class TestDataSeeder extends Seeder
public function run() public function run()
{ {
$user = User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]); $user = User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]);
$emptyUser = User::create(['email' => 'thegrumpydictator+empty@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]); User::create(['email' => 'thegrumpydictator+empty@gmail.com', 'password' => bcrypt('james'), 'reset' => null, 'remember_token' => null]);
$admin = Role::where('name', 'owner')->first(); $admin = Role::where('name', 'owner')->first();