Merge branch 'release/3.4.0.10'

.codeclimate.yml

@@ -18,6 +18,8 @@ exclude_paths:
 - "public/js/metisMenu.js"
 - "public/js/moment.min.js"
 - "public/js/sb-admin-2.js"
+- "public/bootstrap/*"
+- "resources/lang/*"
 - "tests/*"
 - "database/*"
 - "storage/*"

README.md

@@ -1,5 +1,5 @@
 # Firefly III
-#### v3.4.0.9
+#### v3.4.0.10
 
 [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii)
 [![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii)

app/Helpers/Collection/Bill.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Helpers\Collection;
 
 
-use FireflyIII\Models\Bill as BillModel;
 use Illuminate\Support\Collection;
 
 /**

app/Helpers/Collection/Category.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 16/05/15
- * Time: 13:09
- */
 
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Reminders/ReminderHelperInterface.php

@@ -4,7 +4,6 @@ namespace FireflyIII\Helpers\Reminders;
 
 use Carbon\Carbon;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Reminder;
 
 /**

app/Http/Controllers/AccountController.php

@@ -39,7 +39,7 @@ class AccountController extends Controller
     public function create($what = 'asset')
     {
         $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
-        $subTitle     = 'Create a new ' . e($what) . ' account';
+        $subTitle     = trans('firefly.make_new_' . $what . '_account');
 
         // put previous url in session if not redirect from store (not "create another").
         if (Session::get('accounts.create.fromStore') !== true) {
@@ -58,7 +58,8 @@ class AccountController extends Controller
      */
     public function delete(Account $account)
     {
-        $subTitle = 'Delete ' . strtolower(e($account->accountType->type)) . ' "' . e($account->name) . '"';
+        $typeName = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $subTitle = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
 
         // put previous url in session
         Session::put('accounts.delete.url', URL::previous());
@@ -81,7 +82,7 @@ class AccountController extends Controller
 
         $repository->destroy($account);
 
-        Session::flash('success', 'The ' . e($typeName) . ' account "' . e($name) . '" was deleted.');
+        Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
 
         return Redirect::to(Session::get('accounts.delete.url'));
     }

app/Http/Controllers/BillController.php

@@ -3,7 +3,6 @@
 use Config;
 use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\BillFormRequest;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;

app/Http/Controllers/Chart/BillController.php

@@ -4,7 +4,6 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;

app/Http/Controllers/Chart/BudgetController.php

@@ -33,7 +33,7 @@ class BudgetController extends Controller
 
 
         $first = $repository->getFirstBudgetLimitDate($budget);
-        $range = $viewRange = Preferences::get('viewRange', '1M')->data;
+        $range = Preferences::get('viewRange', '1M')->data;
         $last  = Session::get('end', new Carbon);
         $final = clone $last;
         $final->addYears(2);

app/Http/Controllers/Chart/CategoryController.php

@@ -6,8 +6,6 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
-use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Grumpydictator\Gchart\GChart;
 use Navigation;

app/Http/Controllers/Chart/PiggyBankController.php

@@ -1,19 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 16/05/15
- * Time: 09:36
- */
 
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\Account;
-use FireflyIII\Models\Bill;
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Grumpydictator\Gchart\GChart;
 use Illuminate\Support\Collection;

app/Http/Controllers/JsonController.php

@@ -5,7 +5,6 @@ use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportQueryInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
-use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
@@ -123,11 +122,6 @@ class JsonController extends Controller
         $start  = Session::get('start', Carbon::now()->startOfMonth());
         $end    = Session::get('end', Carbon::now()->endOfMonth());
         $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount');
-        //        $amount = 0;
-        //        foreach($set as $entry) {
-        //            //echo $entry->description.' ('.$entry->tags->count().'): ' . $entry->amount."\n";
-        //            $amount += $entry->amount;
-        //        }
 
         return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]);
     }

app/Http/Controllers/ReportController.php

@@ -3,10 +3,6 @@
 use Carbon\Carbon;
 use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\LimitRepetition;
-use FireflyIII\Models\Preference;
-use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Session;
 use View;

app/Http/Kernel.php

@@ -39,7 +39,6 @@ class Kernel extends HttpKernel
             'range'      => 'FireflyIII\Http\Middleware\Range',
             'cleanup'    => 'FireflyIII\Http\Middleware\Cleanup',
             'reminders'  => 'FireflyIII\Http\Middleware\Reminders',
-            'piggybanks' => 'FireflyIII\Http\Middleware\PiggyBanks',
 
         ];
 

app/Http/Middleware/Authenticate.php

@@ -3,7 +3,6 @@
 use App;
 use Closure;
 use Config;
-use FireflyIII\Models\Preference;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 use Preferences;

app/Http/Middleware/Cleanup.php

@@ -153,94 +153,6 @@ class Cleanup
             }
             unset($set, $entry, $metadata);
 
-            // encrypt account virtual balance amount
-            $set = Account::whereNull('virtual_balance_encrypted')->take(5)->get();
-            /** @var Account $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount                 = $entry->amount;
-                $entry->virtual_balance = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt bill amount_min
-            $set = Bill::whereNull('amount_min_encrypted')->take(5)->get();
-            /** @var Bill $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount            = $entry->amount_min;
-                $entry->amount_min = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt bill amount_max
-            $set = Bill::whereNull('amount_max_encrypted')->take(5)->get();
-            /** @var Bill $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount            = $entry->amount_max;
-                $entry->amount_max = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt budget limit amount
-            $set = BudgetLimit::whereNull('amount_encrypted')->take(5)->get();
-            /** @var BudgetLimit $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount        = $entry->amount;
-                $entry->amount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt limit repetition amount
-            $set = LimitRepetition::whereNull('amount_encrypted')->take(5)->get();
-            /** @var LimitRepetition $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount        = $entry->amount;
-                $entry->amount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            //encrypt piggy bank event amount
-            $set = PiggyBankEvent::whereNull('amount_encrypted')->take(5)->get();
-            /** @var PiggyBankEvent $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount        = $entry->amount;
-                $entry->amount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt piggy bank repetition currentamount
-            $set = PiggyBankRepetition::whereNull('currentamount_encrypted')->take(5)->get();
-            /** @var PiggyBankRepetition $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount               = $entry->currentamount;
-                $entry->currentamount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
-            // encrypt piggy bank targetamount
-            $set = PiggyBank::whereNull('targetamount_encrypted')->take(5)->get();
-            /** @var PiggyBank $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount              = $entry->targetamount;
-                $entry->targetamount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
-
             //encrypt preference name
             $set = Preference::whereNull('name_encrypted')->take(5)->get();
             /** @var Preference $entry */
@@ -251,7 +163,8 @@ class Cleanup
                 $entry->save();
             }
             unset($set, $entry, $name);
-            //encrypt preference data (add field)
+
+            //encrypt preference data
             $set = Preference::whereNull('data_encrypted')->take(5)->get();
             /** @var Preference $entry */
             foreach ($set as $entry) {
@@ -262,16 +175,6 @@ class Cleanup
             }
             unset($set, $entry, $data);
 
-            // encrypt transaction amount
-            $set = Transaction::whereNull('amount_encrypted')->take(5)->get();
-            /** @var Transaction $entry */
-            foreach ($set as $entry) {
-                $count++;
-                $amount        = $entry->amount;
-                $entry->amount = $amount;
-                $entry->save();
-            }
-            unset($set, $entry, $amount);
         }
         if ($count == 0 && $run) {
             Session::flash('warning', 'Please open the .env file and change RUNCLEANUP=true to RUNCLEANUP=false');

app/Http/Middleware/PiggyBanks.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace FireflyIII\Http\Middleware;
-
-
-use Closure;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankRepetition;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-
-/**
- * Class PiggyBanks
- *
- * @package FireflyIII\Http\Middleware
- */
-class PiggyBanks
-{
-    /**
-     * The Guard implementation.
-     *
-     * @var Guard
-     */
-    protected $auth;
-
-    /**
-     * Create a new filter instance.
-     *
-     * @param  Guard $auth
-     *
-     */
-    public function __construct(Guard $auth)
-    {
-        $this->auth = $auth;
-    }
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $next
-     *
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if ($this->auth->check() && !$request->isXmlHttpRequest()) {
-            // get piggy banks without a repetition:
-            /** @var Collection $set */
-            $set = $this->auth->user()->piggybanks()
-                              ->leftJoin('piggy_bank_repetitions', 'piggy_banks.id', '=', 'piggy_bank_repetitions.piggy_bank_id')
-                              ->whereNull('piggy_bank_repetitions.id')
-                              ->get(['piggy_banks.id', 'piggy_banks.startdate', 'piggy_banks.targetdate']);
-
-            /** @var PiggyBank $partialPiggy */
-            foreach ($set as $partialPiggy) {
-                $repetition = new PiggyBankRepetition;
-                $repetition->piggyBank()->associate($partialPiggy);
-                $repetition->startdate     = $partialPiggy->startdate;
-                $repetition->targetdate    = $partialPiggy->targetdate;
-                $repetition->currentamount = 0;
-                $repetition->save();
-            }
-            unset($partialPiggy, $set, $repetition);
-        }
-
-        return $next($request);
-    }
-}

app/Http/Requests/TagFormRequest.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 27/04/15
- * Time: 12:50
- */
-
 namespace FireflyIII\Http\Requests;
 
 use Auth;

app/Http/routes.php

@@ -199,7 +199,7 @@ Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'routes']);
  * Home Controller
  */
 Route::group(
-    ['middleware' => ['auth', 'range', 'reminders', 'piggybanks']], function () {
+    ['middleware' => ['auth', 'range', 'reminders']], function () {
     Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index', 'middleware' => 'cleanup']);
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
     Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
@@ -371,7 +371,6 @@ Route::group(
      * Report Controller
      */
     Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
-    //Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}']);
     Route::get('/reports/{year}/{shared?}', ['uses' => 'ReportController@year', 'as' => 'reports.year'])->where(['year' => '[0-9]{4}', 'shared' => 'shared']);
     Route::get('/reports/{year}/{month}/{shared?}', ['uses' => 'ReportController@month', 'as' => 'reports.month'])->where(
         ['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']

app/Models/Preference.php

@@ -58,7 +58,7 @@ class Preference extends Model
      */
     public function setDataAttribute($value)
     {
-        $this->attributes['data']           = '';//json_encode($value);
+        $this->attributes['data']           = '';
         $this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
     }
 

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -7,7 +7,6 @@ use Carbon\Carbon;
 use DB;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\PiggyBankRepetition;
 use Illuminate\Support\Collection;
 
 /**

app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php

@@ -3,7 +3,6 @@
 namespace FireflyIII\Repositories\PiggyBank;
 
 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankRepetition;
 use Illuminate\Support\Collection;
 
 /**

app/Support/Steam.php

@@ -45,7 +45,6 @@ class Steam
 
         if (!$ignoreVirtualBalance) {
             $balance = bcadd($balance, $account->virtual_balance);
-            //$balance += floatval($account->virtual_balance);
         }
 
         return round($balance, 2);

app/Support/Twig/Translation.php

@@ -2,7 +2,6 @@
 
 namespace FireflyIII\Support\Twig;
 
-use FireflyIII\Models\LimitRepetition;
 use Twig_Extension;
 use Twig_SimpleFilter;
 

composer.lock

@@ -1,7 +1,7 @@
 {
     "_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",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
     "hash": "e3e90dd365b74f4878cf3b5b4a1c4007",
@@ -943,16 +943,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.0.29",
+            "version": "v5.0.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "aa7046645e094b0134a4125cce6694f4b076ac62"
+                "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/aa7046645e094b0134a4125cce6694f4b076ac62",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/db0a7400465df159ba8c6eaa954f97f50bc19687",
-                "reference": "aa7046645e094b0134a4125cce6694f4b076ac62",
+                "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687",
                 "shasum": ""
             },
             "require": {
@@ -1065,7 +1065,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2015-05-08 12:57:10"
+            "time": "2015-05-11 22:15:00"
         },
         {
             "name": "league/commonmark",
@@ -1328,21 +1328,21 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.18.0",
+            "version": "1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36"
+                "reference": "68868e0b02d2d803d0052a59d4e5003cccf87320"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/68868e0b02d2d803d0052a59d4e5003cccf87320",
-                "reference": "99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36",
+                "reference": "68868e0b02d2d803d0052a59d4e5003cccf87320",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0",
-                "symfony/translation": "2.6.*"
+                "symfony/translation": "~2.6"
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.0"
@@ -1371,7 +1371,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2015-03-26 03:05:57"
+            "time": "2015-05-09 03:23:44"
         },
         {
             "name": "nikic/php-parser",
@@ -1529,21 +1529,21 @@
         },
         {
             "name": "rcrowe/twigbridge",
-            "version": "0.7.x-dev",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rcrowe/TwigBridge.git",
-                "reference": "ac0bfb5bcdb4fcd0cd01ab8425620ff07f6af026"
+                "reference": "0e2693d99745eb8bbd01a80e841951c0738e1d15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/ac0bfb5bcdb4fcd0cd01ab8425620ff07f6af026",
+                "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/0e2693d99745eb8bbd01a80e841951c0738e1d15",
-                "reference": "ac0bfb5bcdb4fcd0cd01ab8425620ff07f6af026",
+                "reference": "0e2693d99745eb8bbd01a80e841951c0738e1d15",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "5.0.*",
+                "illuminate/support": "5.0.*|5.1.*",
-                "illuminate/view": "5.0.*",
+                "illuminate/view": "5.0.*|5.1.*",
                 "php": ">=5.4.0",
                 "twig/twig": "~1.15"
             },
@@ -1589,7 +1589,7 @@
                 "laravel",
                 "twig"
             ],
-            "time": "2015-04-22 09:19:03"
+            "time": "2015-05-21 13:46:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -1645,17 +1645,17 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667"
+                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/5b91dc4ed5eb08553f57f6df04c4730a73992667",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272",
-                "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667",
+                "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272",
                 "shasum": ""
             },
             "require": {
@@ -1688,32 +1688,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Debug",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3"
+                "reference": "ad4511a8fddce7ec163b513ba39a30ea4f32c9e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/d49a46a20a8f0544aedac54466750ad787d3d3e3",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/ad4511a8fddce7ec163b513ba39a30ea4f32c9e7",
-                "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3",
+                "reference": "ad4511a8fddce7ec163b513ba39a30ea4f32c9e7",
                 "shasum": ""
             },
             "require": {
@@ -1749,32 +1749,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Debug Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-22 16:55:57"
+            "time": "2015-05-08 13:17:44"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/EventDispatcher",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
+                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
+                "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
                 "shasum": ""
             },
             "require": {
@@ -1808,32 +1808,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-13 17:37:22"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "4983964b3693e4f13449cb3800c64a9112c301b4"
+                "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4983964b3693e4f13449cb3800c64a9112c301b4",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/f73904bd2dae525c42ea1f0340c7c98480ecacde",
-                "reference": "4983964b3693e4f13449cb3800c64a9112c301b4",
+                "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde",
                 "shasum": ""
             },
             "require": {
@@ -1858,32 +1858,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-22 16:55:57"
+            "time": "2015-05-08 00:09:07"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Finder",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Finder.git",
-                "reference": "5dbe2e73a580618f5b4880fda93406eed25de251"
+                "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/5dbe2e73a580618f5b4880fda93406eed25de251",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/704c64c8b12c8882640d5c0330a8414b1e06dc99",
-                "reference": "5dbe2e73a580618f5b4880fda93406eed25de251",
+                "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99",
                 "shasum": ""
             },
             "require": {
@@ -1908,32 +1908,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Finder Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/HttpFoundation",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9"
+                "reference": "8a0d00980ef9f6b47ddbf24bdfbf70fead760816"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a6337233f08f7520de97f4ffd6f00e947d892f9",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a0d00980ef9f6b47ddbf24bdfbf70fead760816",
-                "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9",
+                "reference": "8a0d00980ef9f6b47ddbf24bdfbf70fead760816",
                 "shasum": ""
             },
             "require": {
@@ -1962,32 +1962,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony HttpFoundation Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-04-01 16:50:12"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/HttpKernel",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4"
+                "reference": "2010194de0a57731af9404c7f97fd300db98b7a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3829cacfe21eaf3f73604a62d79183d1f6e792c4",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2010194de0a57731af9404c7f97fd300db98b7a3",
-                "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4",
+                "reference": "2010194de0a57731af9404c7f97fd300db98b7a3",
                 "shasum": ""
             },
             "require": {
@@ -2040,32 +2040,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony HttpKernel Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-04-01 16:55:26"
+            "time": "2015-05-11 01:58:49"
         },
         {
             "name": "symfony/process",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Process",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Process.git",
-                "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552"
+                "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
-                "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552",
+                "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
                 "shasum": ""
             },
             "require": {
@@ -2090,32 +2090,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Process Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Routing",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing.git",
-                "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa"
+                "reference": "1455ec537940f7428ea6aa9411f3c4bca69413a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/4e173a645b63ff60a124f3741b4f15feebd908fa",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/1455ec537940f7428ea6aa9411f3c4bca69413a0",
-                "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa",
+                "reference": "1455ec537940f7428ea6aa9411f3c4bca69413a0",
                 "shasum": ""
             },
             "require": {
@@ -2153,28 +2153,28 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Routing Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
             "keywords": [
                 "router",
                 "routing",
                 "uri",
                 "url"
             ],
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/security-core",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Security/Core",
             "source": {
                 "type": "git",
@@ -2238,17 +2238,17 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Translation",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation.git",
-                "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af"
+                "reference": "398e0eedcb89243ad34a10d079a4b6ea4c0b61ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Translation/zipball/bd939f05cdaca128f4ddbae1b447d6f0203b60af",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/398e0eedcb89243ad34a10d079a4b6ea4c0b61ff",
-                "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af",
+                "reference": "398e0eedcb89243ad34a10d079a4b6ea4c0b61ff",
                 "shasum": ""
             },
             "require": {
@@ -2282,32 +2282,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Translation Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-05 16:51:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/VarDumper",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "aafae00236e147568832de3c65ccb94cfc836278"
+                "reference": "89eec96645fb44af4a454a26c74c72ba6311f5bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/aafae00236e147568832de3c65ccb94cfc836278",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89eec96645fb44af4a454a26c74c72ba6311f5bc",
-                "reference": "aafae00236e147568832de3c65ccb94cfc836278",
+                "reference": "89eec96645fb44af4a454a26c74c72ba6311f5bc",
                 "shasum": ""
             },
             "require": {
@@ -2338,22 +2338,22 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony mechanism for exploring and dumping PHP variables",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
             "keywords": [
                 "debug",
                 "dump"
             ],
-            "time": "2015-03-31 08:12:29"
+            "time": "2015-05-01 14:14:24"
         },
         {
             "name": "twig/extensions",
@@ -2517,29 +2517,29 @@
         },
         {
             "name": "watson/validating",
-            "version": "1.0.0",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dwightwatson/validating.git",
-                "reference": "9066ffd9342d1bf8a571d157df047e200a24e64a"
+                "reference": "47320813a45cc35384e72364484d54fe44dcd3fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/9066ffd9342d1bf8a571d157df047e200a24e64a",
+                "url": "https://api.github.com/repos/dwightwatson/validating/zipball/47320813a45cc35384e72364484d54fe44dcd3fb",
-                "reference": "9066ffd9342d1bf8a571d157df047e200a24e64a",
+                "reference": "47320813a45cc35384e72364484d54fe44dcd3fb",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "~5.0",
+                "illuminate/contracts": "5.0.*|5.1.*",
-                "illuminate/database": "~5.0",
+                "illuminate/database": "5.0.*|5.1.*",
-                "illuminate/events": "~5.0",
+                "illuminate/events": "5.0.*|5.1.*",
-                "illuminate/support": "~5.0",
+                "illuminate/support": "5.0.*|5.1.*",
-                "illuminate/validation": "~5.0",
+                "illuminate/validation": "5.0.*|5.1.*",
                 "php": ">=5.4.0"
             },
             "require-dev": {
                 "mockery/mockery": "0.9.*",
-                "phpunit/phpunit": "4.2.*"
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
@@ -2568,7 +2568,7 @@
                 "laravel",
                 "validation"
             ],
-            "time": "2015-03-17 10:52:36"
+            "time": "2015-05-23 00:03:54"
         }
     ],
     "packages-dev": [
@@ -2888,16 +2888,16 @@
         },
         {
             "name": "hamcrest/hamcrest-php",
-            "version": "v1.2.1",
+            "version": "v1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hamcrest/hamcrest-php.git",
-                "reference": "ac50c470531243944f977b8de75be0b684a9cb51"
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/ac50c470531243944f977b8de75be0b684a9cb51",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b37020aa976fa52d3de9aa904aa2522dc518f79c",
-                "reference": "ac50c470531243944f977b8de75be0b684a9cb51",
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c",
                 "shasum": ""
             },
             "require": {
@@ -2929,7 +2929,7 @@
             "keywords": [
                 "test"
             ],
-            "time": "2015-01-20 19:34:09"
+            "time": "2015-05-11 14:41:42"
         },
         {
             "name": "league/factory-muffin",
@@ -4148,17 +4148,17 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/ClassLoader",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ClassLoader.git",
-                "reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5"
+                "reference": "695134c9b39559297fa5d1dcff6a9054bb56facb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/861765b3e5f32979de5bd19ad2577cbb830a29d5",
+                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/695134c9b39559297fa5d1dcff6a9054bb56facb",
-                "reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5",
+                "reference": "695134c9b39559297fa5d1dcff6a9054bb56facb",
                 "shasum": ""
             },
             "require": {
@@ -4184,32 +4184,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony ClassLoader Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-27 10:19:51"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/config",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Config",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "d91be01336605db8da21b79bc771e46a7276d1bc"
+                "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/d91be01336605db8da21b79bc771e46a7276d1bc",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25",
-                "reference": "d91be01336605db8da21b79bc771e46a7276d1bc",
+                "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25",
                 "shasum": ""
             },
             "require": {
@@ -4235,32 +4235,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Stopwatch",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "5f196e84b5640424a166d2ce9cca161ce1e9d912"
+                "reference": "b470f87c69837cb71115f1fa720388bb19b63635"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/5f196e84b5640424a166d2ce9cca161ce1e9d912",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b470f87c69837cb71115f1fa720388bb19b63635",
-                "reference": "5f196e84b5640424a166d2ce9cca161ce1e9d912",
+                "reference": "b470f87c69837cb71115f1fa720388bb19b63635",
                 "shasum": ""
             },
             "require": {
@@ -4285,32 +4285,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Stopwatch Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-22 16:55:57"
+            "time": "2015-05-02 15:18:45"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
+                "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
-                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
+                "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
                 "shasum": ""
             },
             "require": {
@@ -4335,18 +4335,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
-            "time": "2015-03-30 15:54:10"
+            "time": "2015-05-02 15:18:45"
         }
     ],
     "aliases": [],

resources/lang/en/firefly.php

@@ -30,6 +30,8 @@ return [
     'createBudget'                  => 'New budget',
     'inactiveBudgets'               => 'Inactive budgets',
 
+    // accounts:
+
     'details_for_asset'             => 'Details for asset account ":name"',
     'details_for_expense'           => 'Details for expense account ":name"',
     'details_for_revenue'           => 'Details for revenue account ":name"',
@@ -43,6 +45,14 @@ return [
     'edit_expense_account'          => 'Edit expense account ":name"',
     'edit_revenue_account'          => 'Edit revenue account ":name"',
 
+    'delete_asset_account'          => 'Delete asset account ":name"',
+    'delete_expense_account'        => 'Delete expense account ":name"',
+    'delete_revenue_account'        => 'Delete revenue account ":name"',
+
+    'asset_deleted'                 => 'Successfully deleted asset account ":name"',
+    'expense_deleted'               => 'Successfully deleted expense account ":name"',
+    'revenue_deleted'               => 'Successfully deleted revenue account ":name"',
+
     'update_asset_account'          => 'Update asset account',
     'update_expense_account'        => 'Update expense account',
     'update_revenue_account'        => 'Update revenue account',
@@ -56,7 +66,7 @@ return [
     'without_category'              => 'Without a category',
     'update_category'               => 'Wijzig categorie',
     'categories'                    => 'Categories',
-    'no_category'                    => '(no category)',
+    'no_category'                   => '(no category)',
     'category'                      => 'Category',
 
     // new user:

resources/lang/nl/firefly.php

@@ -30,6 +30,8 @@ return [
     'createBudget'                  => 'Maak nieuw budget',
     'inactiveBudgets'               => 'Inactieve budgetten',
 
+    // accounts:
+
     'details_for_asset'             => 'Overzicht voor betaalrekening ":name"',
     'details_for_expense'           => 'Overzicht voor crediteur ":name"',
     'details_for_revenue'           => 'Overzicht voor debiteur ":name"',
@@ -43,6 +45,14 @@ return [
     'edit_expense_account'          => 'Wijzig crediteur ":name"',
     'edit_revenue_account'          => 'Wijzig debiteur ":name"',
 
+    'delete_asset_account'          => 'Verwijder betaalrekening ":name"',
+    'delete_expense_account'        => 'Verwijder crediteur ":name"',
+    'delete_revenue_account'        => 'Verwijder debiteur ":name"',
+
+    'asset_deleted'                 => 'Betaalrekening ":name" is verwijderd.',
+    'expense_deleted'               => 'Crediteur ":name" is verwijderd.',
+    'revenue_deleted'               => 'Debiteur ":name" is verwijderd.',
+
     'update_asset_account'          => 'Wijzig betaalrekening',
     'update_expense_account'        => 'Wijzig crediteur',
     'update_revenue_account'        => 'Wijzig debiteur',
@@ -56,7 +66,7 @@ return [
     'without_category'              => 'Zonder categorie',
     'update_category'               => 'Wijzig categorie',
     'categories'                    => 'Categorieën',
-    'no_category'                    => '(geen categorie)',
+    'no_category'                   => '(geen categorie)',
     'category'                      => 'Categorie',
 
     // new user: