From a90bc0bcc80700d6c233f3fcfabca999d4c56205 Mon Sep 17 00:00:00 2001 From: Andrew Elkins Date: Wed, 24 Sep 2014 11:44:13 -0700 Subject: [PATCH 1/2] Update to use Laravel 5 development --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 03227970..bc4b5e78 100644 --- a/composer.json +++ b/composer.json @@ -15,13 +15,13 @@ ], "require": { "php": ">=5.4.0", - "illuminate/support": "~4.0|~5.0", + "illuminate/support": "~4.0|5.0.*@dev", "laravelbook/ardent": "~2.4" }, "require-dev": { "phpunit/phpunit": "~4.0", "mockery/mockery": "~0.9", - "illuminate/database": "~4.0", + "illuminate/database": "~4.0|5.0.*@dev", "symfony/process": "~2.3" }, "repositories": [ @@ -58,5 +58,6 @@ "branch-alias": { "dev-master": "1.2-dev" } - } + }, + "minimum-stability": "dev" } From cbabd04e0a2ea838c16edc4e9b7f5b832f6e5e2c Mon Sep 17 00:00:00 2001 From: Andrew Elkins Date: Wed, 24 Sep 2014 11:52:18 -0700 Subject: [PATCH 2/2] Changing to 1.3 This is actually a fairly interesting change do to the addition of ``` "minimum-stability": "dev" ``` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bc4b5e78..e7d11375 100644 --- a/composer.json +++ b/composer.json @@ -56,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "minimum-stability": "dev"