diff --git a/composer.json b/composer.json index 1743c4b7..3026b933 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "^5.5.9", - "laravel/framework": "5.1.*", + "laravel/framework": "~5.1.3", "cachethq/segment": "^2.1", "doctrine/dbal": "^2.5", "fideloper/proxy": "^3.0", diff --git a/composer.lock b/composer.lock index 7b801e60..a62741a6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9d509846b47388afe62c85ee324b32c6", + "hash": "f721d6c74ddfb615d5eb8732cee8f415", "packages": [ { "name": "asm89/stack-cors", @@ -316,16 +316,16 @@ }, { "name": "doctrine/annotations", - "version": "v1.2.4", + "version": "v1.2.6", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", - "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4", + "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4", "shasum": "" }, "require": { @@ -380,7 +380,7 @@ "docblock", "parser" ], - "time": "2014-12-23 22:40:37" + "time": "2015-06-17 12:21:22" }, { "name": "doctrine/cache", @@ -1406,16 +1406,16 @@ }, { "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.1", + "version": "v0.3.2", "source": { "type": "git", "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "05bce997da20acf873e6bf396276798f3cd2c76a" + "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/05bce997da20acf873e6bf396276798f3cd2c76a", - "reference": "05bce997da20acf873e6bf396276798f3cd2c76a", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", + "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", "shasum": "" }, "require": { @@ -1425,6 +1425,7 @@ "require-dev": { "jakub-onderka/php-code-style": "~1.0", "jakub-onderka/php-parallel-lint": "~0.5", + "jakub-onderka/php-var-dump-check": "~0.1", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, @@ -1445,7 +1446,7 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2014-07-14 20:59:35" + "time": "2015-04-20 18:58:01" }, { "name": "jenssegers/date", @@ -1563,16 +1564,16 @@ }, { "name": "laravel/framework", - "version": "v5.1.1", + "version": "5.1.x-dev", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3a44db7e70146dc1282b39887b5faa67c8583015" + "reference": "2e4345ee6896aaacf79fa281ee5cc33b7ce6e548" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3a44db7e70146dc1282b39887b5faa67c8583015", - "reference": "3a44db7e70146dc1282b39887b5faa67c8583015", + "url": "https://api.github.com/repos/laravel/framework/zipball/2e4345ee6896aaacf79fa281ee5cc33b7ce6e548", + "reference": "2e4345ee6896aaacf79fa281ee5cc33b7ce6e548", "shasum": "" }, "require": { @@ -1687,7 +1688,7 @@ "framework", "laravel" ], - "time": "2015-06-09 14:13:59" + "time": "2015-06-18 14:30:44" }, { "name": "league/commonmark", @@ -3319,16 +3320,16 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { @@ -3339,7 +3340,7 @@ "ext-pdo": "*", "ext-phar": "*", "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "2.0.*@ALPHA" + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { @@ -3348,8 +3349,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Instantiator\\": "src" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3369,7 +3370,7 @@ "constructor", "instantiate" ], - "time": "2014-10-13 12:58:55" + "time": "2015-06-14 21:17:01" }, { "name": "fzaninotto/faker", @@ -3777,16 +3778,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.7.3", + "version": "4.7.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "41fea1e84ed84d373f5ac099a1276c4358c90708" + "reference": "e5f851f324f7add846316f39e668e9deac97a103" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41fea1e84ed84d373f5ac099a1276c4358c90708", - "reference": "41fea1e84ed84d373f5ac099a1276c4358c90708", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5f851f324f7add846316f39e668e9deac97a103", + "reference": "e5f851f324f7add846316f39e668e9deac97a103", "shasum": "" }, "require": { @@ -3800,7 +3801,7 @@ "phpunit/php-code-coverage": "~2.1", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0", + "phpunit/php-timer": ">=1.0.6", "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.1", "sebastian/diff": "~1.2", @@ -3845,7 +3846,7 @@ "testing", "xunit" ], - "time": "2015-06-11 16:20:25" + "time": "2015-06-18 13:33:26" }, { "name": "phpunit/phpunit-mock-objects",