From 5f64e55f41fc48412eb63f6678412c3ef8b85e47 Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 15:23:30 -0200 Subject: [PATCH 1/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ec55039..50485b5 100755 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "zendframework/zend-stdlib": "dev-master", "doctrine/doctrine-orm-module": "dev-master", "spiffy/spiffy-test": "dev-master", - "phpunit/phpunit": "dev-master", + "phpunit/phpunit": "dev-master" }, "minimum-stability": "dev", "require-dev": { From 2c4df4c8cbebe301aaa22992f89ebb82379994f6 Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 15:30:57 -0200 Subject: [PATCH 2/8] Update composer.json --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 50485b5..499fd76 100755 --- a/composer.json +++ b/composer.json @@ -18,17 +18,17 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-mvc": "dev-master", - "zendframework/zend-serializer": "dev-master", - "zendframework/zend-version": "dev-master", - "zendframework/zend-form": "dev-master", - "zendframework/zend-mail": "dev-master", - "zendframework/zend-mime": "dev-master", - "zendframework/zend-test": "dev-master", - "zendframework/zend-stdlib": "dev-master", - "doctrine/doctrine-orm-module": "dev-master", - "spiffy/spiffy-test": "dev-master", - "phpunit/phpunit": "dev-master" + "zendframework/zend-mvc": "2.*", + "zendframework/zend-serializer": "2.*", + "zendframework/zend-version": "2.*", + "zendframework/zend-form": "2.*", + "zendframework/zend-mail": "2.*", + "zendframework/zend-mime": "2.*", + "zendframework/zend-test": "2.*", + "zendframework/zend-stdlib": "2.*", + "doctrine/doctrine-orm-module": "2.*", + "spiffy/spiffy-test": "2.*", + "phpunit/phpunit": "3.7.x-dev" }, "minimum-stability": "dev", "require-dev": { From 6557c73960c61b87b9ec3ac944beaad24e633b3f Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 15:34:23 -0200 Subject: [PATCH 3/8] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 499fd76..259160a 100755 --- a/composer.json +++ b/composer.json @@ -26,8 +26,8 @@ "zendframework/zend-mime": "2.*", "zendframework/zend-test": "2.*", "zendframework/zend-stdlib": "2.*", - "doctrine/doctrine-orm-module": "2.*", - "spiffy/spiffy-test": "2.*", + "doctrine/doctrine-orm-module": "0.8.0", + "spiffy/spiffy-test": "0.1.4", "phpunit/phpunit": "3.7.x-dev" }, "minimum-stability": "dev", From e31ac3d4930528441ff563afebb06eda97fd006d Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 15:39:17 -0200 Subject: [PATCH 4/8] Update composer.json --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 259160a..5ff7c36 100755 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-mvc": "2.*", - "zendframework/zend-serializer": "2.*", - "zendframework/zend-version": "2.*", - "zendframework/zend-form": "2.*", - "zendframework/zend-mail": "2.*", - "zendframework/zend-mime": "2.*", - "zendframework/zend-test": "2.*", - "zendframework/zend-stdlib": "2.*", + "zendframework/zend-mvc": "2.3.*", + "zendframework/zend-serializer": "2.3.*", + "zendframework/zend-version": "2.3.*", + "zendframework/zend-form": "2.3.*", + "zendframework/zend-mail": "2.3.*", + "zendframework/zend-mime": "2.3.*", + "zendframework/zend-test": "2.3.*", + "zendframework/zend-stdlib": "2.3.*", "doctrine/doctrine-orm-module": "0.8.0", "spiffy/spiffy-test": "0.1.4", "phpunit/phpunit": "3.7.x-dev" From 72286ed44f118f2a872a5ca1e28124513eb28d6e Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 15:55:36 -0200 Subject: [PATCH 5/8] Update composer.json --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 5ff7c36..f9f4609 100755 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-mvc": "2.3.*", - "zendframework/zend-serializer": "2.3.*", - "zendframework/zend-version": "2.3.*", - "zendframework/zend-form": "2.3.*", - "zendframework/zend-mail": "2.3.*", - "zendframework/zend-mime": "2.3.*", - "zendframework/zend-test": "2.3.*", - "zendframework/zend-stdlib": "2.3.*", + "zendframework/zend-mvc": "2.3.*@dev", + "zendframework/zend-serializer": "2.3.*@dev", + "zendframework/zend-version": "2.3.*@dev", + "zendframework/zend-form": "2.3.*@dev", + "zendframework/zend-mail": "2.3.*@dev", + "zendframework/zend-mime": "2.3.*@dev", + "zendframework/zend-test": "2.3.*@dev", + "zendframework/zend-stdlib": "2.3.*@dev", "doctrine/doctrine-orm-module": "0.8.0", "spiffy/spiffy-test": "0.1.4", "phpunit/phpunit": "3.7.x-dev" From 6d7acf686ddc645ed76b926784c10ff20a80125a Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 16:16:52 -0200 Subject: [PATCH 6/8] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f9f4609..4b174b9 100755 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-mvc": "2.3.*@dev", + "zendframework/zend-mvc": "2.3.x-dev", "zendframework/zend-serializer": "2.3.*@dev", "zendframework/zend-version": "2.3.*@dev", "zendframework/zend-form": "2.3.*@dev", From 47c273496179b37128535ae7636189851f3f51e2 Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 16:22:52 -0200 Subject: [PATCH 7/8] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 4b174b9..94274dc 100755 --- a/composer.json +++ b/composer.json @@ -18,7 +18,6 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-mvc": "2.3.x-dev", "zendframework/zend-serializer": "2.3.*@dev", "zendframework/zend-version": "2.3.*@dev", "zendframework/zend-form": "2.3.*@dev", From e525e2fbe28a1873fd4e4c5648e18e93675b0149 Mon Sep 17 00:00:00 2001 From: Jesus Vieira de Lima Date: Sat, 14 Feb 2015 16:32:19 -0200 Subject: [PATCH 8/8] Update composer.json --- composer.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 94274dc..533eafd 100755 --- a/composer.json +++ b/composer.json @@ -18,13 +18,14 @@ ], "require": { "php": ">=5.4", - "zendframework/zend-serializer": "2.3.*@dev", - "zendframework/zend-version": "2.3.*@dev", - "zendframework/zend-form": "2.3.*@dev", - "zendframework/zend-mail": "2.3.*@dev", - "zendframework/zend-mime": "2.3.*@dev", - "zendframework/zend-test": "2.3.*@dev", - "zendframework/zend-stdlib": "2.3.*@dev", + "zendframework/zend-mvc": "2.2.*", + "zendframework/zend-serializer": "2.2.*", + "zendframework/zend-version": "2.2.*", + "zendframework/zend-form": "2.2.*", + "zendframework/zend-mail": "2.2.*", + "zendframework/zend-mime": "2.2.*", + "zendframework/zend-test": "2.2.*", + "zendframework/zend-stdlib": "2.2.*", "doctrine/doctrine-orm-module": "0.8.0", "spiffy/spiffy-test": "0.1.4", "phpunit/phpunit": "3.7.x-dev"