diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 131fdaa3d177..4bf3e947045c 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1,13 +1,15 @@ quote_number_prefix = Input::get('quote_number_prefix'); $account->share_counter = Input::get('share_counter') ? true : false; - //$account->pdf_email_attachment = Input::get('pdf_email_attachment') ? true : false; + $account->pdf_email_attachment = Input::get('pdf_email_attachment') ? true : false; if (!$account->share_counter) { $account->quote_number_counter = Input::get('quote_number_counter'); @@ -630,16 +632,15 @@ class AccountController extends BaseController $image = Image::make($path); $mimeType = $file->getMimeType(); - - if ($image->width == 200 && $mimeType == 'image/jpeg') { + + if ($image->width() == 200 && $mimeType == 'image/jpeg') { $file->move('logo/', $account->account_key . '.jpg'); } else { - $image->resize(200, 120, true, false); - Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath()); + $image->resize(200, 120, function ($constraint) { + $constraint->aspectRatio(); + }); + Image::canvas($image->width(), $image->height(), '#FFFFFF')->insert($image)->save($account->getLogoPath()); } - - //$image = Image::make($path)->resize(200, 120, true, false); - //Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath()); } Event::fire(new UserSettingsChanged()); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 369b1200271e..e4d3d512bfa1 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,19 +2,19 @@ use Auth; use Config; +use Datatable; +use DB; use Event; use Input; use View; use Redirect; use Session; +use URL; use Utils; -use DB; -use Datatable; +use Validator; use App\Models\User; - use App\Http\Requests; -use App\Http\Controllers\Controller; use App\Ninja\Repositories\AccountRepository; use App\Ninja\Mailers\ContactMailer; use App\Ninja\Mailers\UserMailer; diff --git a/app/Models/Account.php b/app/Models/Account.php index 23ab032c244a..a47dc417710c 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -61,11 +61,6 @@ class Account extends Eloquent return $this->belongsTo('App\Models\DatetimeFormat'); } - public function currency() - { - return $this->belongsTo('Currency'); - } - public function size() { return $this->belongsTo('App\Models\Size'); diff --git a/composer.lock b/composer.lock index b157ee312727..f4e80c72ccd6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "97252a7d44a5d0588faa1b3a3c4888d3", + "hash": "f464570c808999ffcb0fa78193b13229", "packages": [ { "name": "alfaproject/omnipay-neteller", @@ -329,29 +329,18 @@ ], "time": "2015-03-17 08:00:28" }, - { - "name": "calvinfroedge/PHP-Payments", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/calvinfroedge/PHP-Payments", - "reference": "origin/master" - }, - "type": "library", - "time": "2015-02-28 14:18:28" - }, { "name": "chumper/datatable", "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/Chumper/Datatable.git", - "reference": "899f5530f98f766eca3a66afba9127ddf239d5c1" + "reference": "58f212270a4bd37ebf1371cb5302749cbbcb941d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chumper/Datatable/zipball/899f5530f98f766eca3a66afba9127ddf239d5c1", - "reference": "899f5530f98f766eca3a66afba9127ddf239d5c1", + "url": "https://api.github.com/repos/Chumper/Datatable/zipball/58f212270a4bd37ebf1371cb5302749cbbcb941d", + "reference": "58f212270a4bd37ebf1371cb5302749cbbcb941d", "shasum": "" }, "require": { @@ -391,7 +380,7 @@ "jquery", "laravel" ], - "time": "2015-03-27 12:52:09" + "time": "2015-04-04 15:19:43" }, { "name": "classpreloader/classpreloader", @@ -919,16 +908,16 @@ }, { "name": "doctrine/common", - "version": "v2.4.2", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b" + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b", - "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b", + "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3", + "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3", "shasum": "" }, "require": { @@ -945,7 +934,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { @@ -958,17 +947,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -977,11 +955,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -993,7 +977,7 @@ "persistence", "spl" ], - "time": "2014-05-21 19:28:51" + "time": "2015-04-02 19:55:44" }, { "name": "doctrine/dbal", @@ -1244,83 +1228,70 @@ "time": "2015-01-16 08:41:13" }, { - "name": "guzzle/common", - "version": "v3.9.2", - "target-dir": "Guzzle/Common", + "name": "guzzle/guzzle", + "version": "v3.9.3", "source": { "type": "git", - "url": "https://github.com/Guzzle3/common.git", - "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc" + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/common/zipball/2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc", - "reference": "2e36af7cf2ce3ea1f2d7c2831843b883a8e7b7dc", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", "shasum": "" }, "require": { - "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.1" + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle\\Common": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Common libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "collection", - "common", - "event", - "exception" - ], - "abandoned": "guzzle/guzzle", - "time": "2014-08-11 04:32:36" - }, - { - "name": "guzzle/http", - "version": "v3.9.2", - "target-dir": "Guzzle/Http", - "source": { - "type": "git", - "url": "https://github.com/Guzzle3/http.git", - "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/http/zipball/1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", - "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", - "shasum": "" - }, - "require": { + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", "guzzle/parser": "self.version", - "guzzle/stream": "self.version", - "php": ">=5.3.2" + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" }, "suggest": { - "ext-curl": "*" + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7-dev" + "dev-master": "3.9-dev" } }, "autoload": { "psr-0": { - "Guzzle\\Http": "" + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1332,118 +1303,24 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "HTTP libraries used by Guzzle", + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", "homepage": "http://guzzlephp.org/", "keywords": [ - "Guzzle", "client", "curl", + "framework", "http", - "http client" + "http client", + "rest", + "web service" ], - "abandoned": "guzzle/guzzle", - "time": "2014-08-11 04:32:36" - }, - { - "name": "guzzle/parser", - "version": "v3.9.2", - "target-dir": "Guzzle/Parser", - "source": { - "type": "git", - "url": "https://github.com/Guzzle3/parser.git", - "reference": "6874d171318a8e93eb6d224cf85e4678490b625c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/parser/zipball/6874d171318a8e93eb6d224cf85e4678490b625c", - "reference": "6874d171318a8e93eb6d224cf85e4678490b625c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle\\Parser": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Interchangeable parsers used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "URI Template", - "cookie", - "http", - "message", - "url" - ], - "abandoned": "guzzle/guzzle", - "time": "2014-02-05 18:29:46" - }, - { - "name": "guzzle/stream", - "version": "v3.9.2", - "target-dir": "Guzzle/Stream", - "source": { - "type": "git", - "url": "https://github.com/Guzzle3/stream.git", - "reference": "60c7fed02e98d2c518dae8f97874c8f4622100f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/stream/zipball/60c7fed02e98d2c518dae8f97874c8f4622100f0", - "reference": "60c7fed02e98d2c518dae8f97874c8f4622100f0", - "shasum": "" - }, - "require": { - "guzzle/common": "self.version", - "php": ">=5.3.2" - }, - "suggest": { - "guzzle/http": "To convert Guzzle request objects to PHP streams" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle\\Stream": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle stream wrapper component", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "Guzzle", - "component", - "stream" - ], - "abandoned": "guzzle/guzzle", - "time": "2014-05-01 21:36:02" + "time": "2015-03-18 18:23:50" }, { "name": "illuminate/html", @@ -1775,16 +1652,16 @@ }, { "name": "laravel/framework", - "version": "v5.0.23", + "version": "v5.0.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "59219f7afb60be05d74ce01fcb5d2440f7a1b13d" + "reference": "4d6330118a295086ce9ff8eed2200d5b67f17688" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/59219f7afb60be05d74ce01fcb5d2440f7a1b13d", - "reference": "59219f7afb60be05d74ce01fcb5d2440f7a1b13d", + "url": "https://api.github.com/repos/laravel/framework/zipball/4d6330118a295086ce9ff8eed2200d5b67f17688", + "reference": "4d6330118a295086ce9ff8eed2200d5b67f17688", "shasum": "" }, "require": { @@ -1897,20 +1774,20 @@ "framework", "laravel" ], - "time": "2015-03-28 16:56:59" + "time": "2015-04-04 01:34:57" }, { "name": "league/flysystem", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a" + "reference": "3c2400a99ccc3be6884d40361890010449c6b447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a", - "reference": "51cd7cd7ee0defbaafc6ec0d3620110a5d71e11a", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3c2400a99ccc3be6884d40361890010449c6b447", + "reference": "3c2400a99ccc3be6884d40361890010449c6b447", "shasum": "" }, "require": { @@ -1920,7 +1797,7 @@ "ext-fileinfo": "*", "league/phpunit-coverage-listener": "~1.1", "mockery/mockery": "~0.9", - "phpspec/phpspec": "~2.0.0", + "phpspec/phpspec": "~2.0", "phpspec/prophecy-phpunit": "~1.0", "phpunit/phpunit": "~4.1", "predis/predis": "~1.0", @@ -1980,7 +1857,7 @@ "sftp", "storage" ], - "time": "2015-03-10 11:04:14" + "time": "2015-03-29 14:01:43" }, { "name": "lokielse/omnipay-alipay", @@ -2308,16 +2185,16 @@ }, { "name": "nikic/php-parser", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b" + "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dba7524b3724f25b947cd26a580787c55c8a6f9b", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08f97eb4efa029e2fafb6d8c98b71731bf0cf621", + "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621", "shasum": "" }, "require": { @@ -2349,7 +2226,7 @@ "parser", "php" ], - "time": "2015-03-24 19:10:28" + "time": "2015-04-03 14:33:59" }, { "name": "omnipay/2checkout", @@ -2643,20 +2520,20 @@ }, { "name": "omnipay/common", - "version": "v2.3.3", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "e4c54a314a2529c1008ad3f77e9eef26ed1f311b" + "reference": "fcd5a606713d11536c89315a5ae02d965a737c21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/e4c54a314a2529c1008ad3f77e9eef26ed1f311b", - "reference": "e4c54a314a2529c1008ad3f77e9eef26ed1f311b", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/fcd5a606713d11536c89315a5ae02d965a737c21", + "reference": "fcd5a606713d11536c89315a5ae02d965a737c21", "shasum": "" }, "require": { - "guzzle/http": "~3.1", + "guzzle/guzzle": "~3.9", "php": ">=5.3.2", "symfony/http-foundation": "~2.1" }, @@ -2755,7 +2632,7 @@ "payment", "purchase" ], - "time": "2015-01-11 04:54:29" + "time": "2015-03-30 14:34:46" }, { "name": "omnipay/dummy", @@ -2816,16 +2693,16 @@ }, { "name": "omnipay/eway", - "version": "v2.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-eway.git", - "reference": "031236cf5653b5a021a5eb5565aceb923f64d964" + "reference": "0dcf28596f0382fbfc3ee229e98e60798675ed16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-eway/zipball/031236cf5653b5a021a5eb5565aceb923f64d964", - "reference": "031236cf5653b5a021a5eb5565aceb923f64d964", + "url": "https://api.github.com/repos/thephpleague/omnipay-eway/zipball/0dcf28596f0382fbfc3ee229e98e60798675ed16", + "reference": "0dcf28596f0382fbfc3ee229e98e60798675ed16", "shasum": "" }, "require": { @@ -2869,7 +2746,7 @@ "pay", "payment" ], - "time": "2014-09-17 00:39:29" + "time": "2015-03-30 00:28:33" }, { "name": "omnipay/firstdata", @@ -3737,16 +3614,16 @@ }, { "name": "omnipay/sagepay", - "version": "v2.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-sagepay.git", - "reference": "2d24d15c7a78e2fe1ffb7af705948a60a6492dc6" + "reference": "899507095428fa54276ba5ca89f11fd7f8fd78ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-sagepay/zipball/2d24d15c7a78e2fe1ffb7af705948a60a6492dc6", - "reference": "2d24d15c7a78e2fe1ffb7af705948a60a6492dc6", + "url": "https://api.github.com/repos/thephpleague/omnipay-sagepay/zipball/899507095428fa54276ba5ca89f11fd7f8fd78ab", + "reference": "899507095428fa54276ba5ca89f11fd7f8fd78ab", "shasum": "" }, "require": { @@ -3792,7 +3669,7 @@ "sage pay", "sagepay" ], - "time": "2014-09-17 00:40:02" + "time": "2015-04-02 17:46:20" }, { "name": "omnipay/securepay", @@ -4293,17 +4170,17 @@ }, { "name": "symfony/class-loader", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "56bf6fe551ca013471541d866f73a6cc70ece9c5" + "reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/56bf6fe551ca013471541d866f73a6cc70ece9c5", - "reference": "56bf6fe551ca013471541d866f73a6cc70ece9c5", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/861765b3e5f32979de5bd19ad2577cbb830a29d5", + "reference": "861765b3e5f32979de5bd19ad2577cbb830a29d5", "shasum": "" }, "require": { @@ -4340,21 +4217,21 @@ ], "description": "Symfony ClassLoader Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-27 10:19:51" }, { "name": "symfony/console", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1" + "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1", + "url": "https://api.github.com/repos/symfony/Console/zipball/5b91dc4ed5eb08553f57f6df04c4730a73992667", + "reference": "5b91dc4ed5eb08553f57f6df04c4730a73992667", "shasum": "" }, "require": { @@ -4398,21 +4275,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/debug", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c" + "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/5c1570dea188ade0c6c5e874c2f0a6570587aa1c", - "reference": "5c1570dea188ade0c6c5e874c2f0a6570587aa1c", + "url": "https://api.github.com/repos/symfony/Debug/zipball/d49a46a20a8f0544aedac54466750ad787d3d3e3", + "reference": "d49a46a20a8f0544aedac54466750ad787d3d3e3", "shasum": "" }, "require": { @@ -4459,11 +4336,11 @@ ], "description": "Symfony Debug Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-22 16:55:57" }, { "name": "symfony/event-dispatcher", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", @@ -4522,17 +4399,17 @@ }, { "name": "symfony/filesystem", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b" + "reference": "4983964b3693e4f13449cb3800c64a9112c301b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/fdc5f151bc2db066b51870d5bea3773d915ced0b", - "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4983964b3693e4f13449cb3800c64a9112c301b4", + "reference": "4983964b3693e4f13449cb3800c64a9112c301b4", "shasum": "" }, "require": { @@ -4568,21 +4445,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-22 16:55:57" }, { "name": "symfony/finder", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e" + "reference": "5dbe2e73a580618f5b4880fda93406eed25de251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/bebc7479c566fa4f14b9bcef9e32e719eabec74e", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e", + "url": "https://api.github.com/repos/symfony/Finder/zipball/5dbe2e73a580618f5b4880fda93406eed25de251", + "reference": "5dbe2e73a580618f5b4880fda93406eed25de251", "shasum": "" }, "require": { @@ -4618,21 +4495,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/http-foundation", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388" + "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/d527885e37b55ec0e3dc6f4b70566d0f9b2f2388", - "reference": "d527885e37b55ec0e3dc6f4b70566d0f9b2f2388", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a6337233f08f7520de97f4ffd6f00e947d892f9", + "reference": "8a6337233f08f7520de97f4ffd6f00e947d892f9", "shasum": "" }, "require": { @@ -4672,21 +4549,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-04-01 16:50:12" }, { "name": "symfony/http-kernel", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4" + "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/6f7b2d3ba8bf02cf77edb399696e85ef24a888a4", - "reference": "6f7b2d3ba8bf02cf77edb399696e85ef24a888a4", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/3829cacfe21eaf3f73604a62d79183d1f6e792c4", + "reference": "3829cacfe21eaf3f73604a62d79183d1f6e792c4", "shasum": "" }, "require": { @@ -4750,21 +4627,21 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2015-03-17 14:58:46" + "time": "2015-04-01 16:55:26" }, { "name": "symfony/process", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc" + "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", + "url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552", + "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552", "shasum": "" }, "require": { @@ -4800,21 +4677,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/routing", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2" + "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2", - "reference": "a7f3eb540e5c553c3c95993c6fc2e7edb2f3b9d2", + "url": "https://api.github.com/repos/symfony/Routing/zipball/4e173a645b63ff60a124f3741b4f15feebd908fa", + "reference": "4e173a645b63ff60a124f3741b4f15feebd908fa", "shasum": "" }, "require": { @@ -4869,21 +4746,21 @@ "uri", "url" ], - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/security-core", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Security/Core", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9" + "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/889290a5c00d3f174cc73ce13a11a0a6406939e9", - "reference": "889290a5c00d3f174cc73ce13a11a0a6406939e9", + "url": "https://api.github.com/repos/symfony/security-core/zipball/d25c17db741f58c0f615e52006a47f6fb23cd9b3", + "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3", "shasum": "" }, "require": { @@ -4933,21 +4810,21 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/translation", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9" + "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/043db5f1eef9598d1bc1d75b93304984c003d7d9", - "reference": "043db5f1eef9598d1bc1d75b93304984c003d7d9", + "url": "https://api.github.com/repos/symfony/Translation/zipball/bd939f05cdaca128f4ddbae1b447d6f0203b60af", + "reference": "bd939f05cdaca128f4ddbae1b447d6f0203b60af", "shasum": "" }, "require": { @@ -4992,21 +4869,21 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2015-03-14 11:42:25" + "time": "2015-03-30 15:54:10" }, { "name": "symfony/var-dumper", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/VarDumper", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda" + "reference": "aafae00236e147568832de3c65ccb94cfc836278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/61ee6c848fd2c623e13f59df48833f8b8bad7fda", - "reference": "61ee6c848fd2c623e13f59df48833f8b8bad7fda", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/aafae00236e147568832de3c65ccb94cfc836278", + "reference": "aafae00236e147568832de3c65ccb94cfc836278", "shasum": "" }, "require": { @@ -5052,7 +4929,7 @@ "debug", "dump" ], - "time": "2015-03-06 16:45:31" + "time": "2015-03-31 08:12:29" }, { "name": "twbs/bootstrap", @@ -5498,31 +5375,33 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb", + "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, "autoload": { "classmap": [ - "File/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -5539,7 +5418,7 @@ "filesystem", "iterator" ], - "time": "2013-10-10 15:34:57" + "time": "2015-04-02 05:19:05" }, { "name": "phpunit/php-text-template", @@ -5680,16 +5559,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.5.1", + "version": "4.6.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4" + "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4", - "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08b2aacdd8433abbba468f995d6d64b76a7a62ec", + "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec", "shasum": "" }, "require": { @@ -5701,17 +5580,17 @@ "php": ">=5.3.3", "phpspec/prophecy": "~1.3,>=1.3.1", "phpunit/php-code-coverage": "~2.0,>=2.0.11", - "phpunit/php-file-iterator": "~1.3.2", + "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0.2", + "phpunit/php-timer": "~1.0", "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.1", - "sebastian/diff": "~1.1", + "sebastian/diff": "~1.2", "sebastian/environment": "~1.2", "sebastian/exporter": "~1.2", "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.1|~3.0" }, "suggest": { "phpunit/php-invoker": "~1.1" @@ -5722,12 +5601,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.5.x-dev" + "dev-master": "4.6.x-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -5748,29 +5630,29 @@ "testing", "xunit" ], - "time": "2015-03-29 09:24:05" + "time": "2015-04-03 13:46:59" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "c63d2367247365f688544f0d500af90a11a44c65" + "reference": "74ffb87f527f24616f72460e54b595f508dccb5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65", - "reference": "c63d2367247365f688544f0d500af90a11a44c65", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c", + "reference": "74ffb87f527f24616f72460e54b595f508dccb5c", "shasum": "" }, "require": { - "doctrine/instantiator": "~1.0,>=1.0.1", + "doctrine/instantiator": "~1.0,>=1.0.2", "php": ">=5.3.3", "phpunit/php-text-template": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.3" + "phpunit/phpunit": "~4.4" }, "suggest": { "ext-soap": "*" @@ -5803,7 +5685,7 @@ "mock", "xunit" ], - "time": "2014-10-03 05:12:11" + "time": "2015-04-02 05:36:41" }, { "name": "sebastian/comparator", @@ -5871,16 +5753,16 @@ }, { "name": "sebastian/diff", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "5843509fed39dee4b356a306401e9dd1a931fec7" + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7", - "reference": "5843509fed39dee4b356a306401e9dd1a931fec7", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", "shasum": "" }, "require": { @@ -5892,7 +5774,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -5919,32 +5801,32 @@ "keywords": [ "diff" ], - "time": "2014-08-15 10:29:00" + "time": "2015-02-22 15:13:53" }, { "name": "sebastian/environment", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e", + "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.3" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -5969,7 +5851,7 @@ "environment", "hhvm" ], - "time": "2014-10-25 08:00:45" + "time": "2015-01-01 10:01:08" }, { "name": "sebastian/exporter", @@ -6143,16 +6025,16 @@ }, { "name": "sebastian/version", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b" + "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b", - "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", + "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", "shasum": "" }, "type": "library", @@ -6174,21 +6056,21 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-12-15 14:25:24" + "time": "2015-02-24 06:35:25" }, { "name": "symfony/yaml", - "version": "v2.6.5", + "version": "v2.6.6", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d" + "reference": "174f009ed36379a801109955fc5a71a49fe62dd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/0cd8e72071e46e15fc072270ae39ea1b66b10a9d", - "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4", + "reference": "174f009ed36379a801109955fc5a71a49fe62dd4", "shasum": "" }, "require": { @@ -6224,7 +6106,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" + "time": "2015-03-30 15:54:10" } ], "aliases": [], @@ -6236,8 +6118,7 @@ "webpatser/laravel-countries": 20, "lokielse/omnipay-alipay": 20, "alfaproject/omnipay-neteller": 20, - "alfaproject/omnipay-skrill": 20, - "calvinfroedge/php-payments": 20 + "alfaproject/omnipay-skrill": 20 }, "prefer-stable": false, "prefer-lowest": false,