From 1e5d93213e1c752f5fb83939834c6b8f79429368 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 8 Feb 2014 18:01:23 +0100 Subject: [PATCH 1/4] Upgrading PHPUnit to verify that sebastianbergmann/phpunit#1115 fixed ocramius/ProxyManager#140 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d17f35698..2a4905d8e 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "zendframework/zend-code": "2.*" }, "require-dev": { - "phpunit/phpunit": ">=3.7,<3.9", + "phpunit/phpunit": "~3.7", "phpmd/phpmd": "1.4.*", "squizlabs/php_codesniffer": "1.4.*", "satooshi/php-coveralls": "~0.6" From d9689a5bca96fdc382d5957c59665d3660541952 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 11 Feb 2014 18:32:45 +0100 Subject: [PATCH 2/4] Bumping ZF2 dep to >2.2.5, requiring entire framework for test runs --- composer.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 2a4905d8e..866bcecc4 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,14 @@ ], "require": { "php": ">=5.3.3", - "zendframework/zend-code": "2.*" + "zendframework/zend-code": ">2.2.5" }, "require-dev": { - "phpunit/phpunit": "~3.7", - "phpmd/phpmd": "1.4.*", - "squizlabs/php_codesniffer": "1.4.*", - "satooshi/php-coveralls": "~0.6" + "phpunit/phpunit": "~3.7", + "phpmd/phpmd": "1.4.*", + "squizlabs/php_codesniffer": "1.4.*", + "satooshi/php-coveralls": "~0.6", + "zendframework/zendframework": ">2.2.5" }, "suggest": { "zendframework/zend-stdlib": "To use the hydrator proxy", From 8640603160f6b5c3b071faad2e0c2f63ea086758 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 11 Feb 2014 18:41:34 +0100 Subject: [PATCH 3/4] Enforcing ZF dependency to >=2.3 to include zendframework/zf2#5804 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 866bcecc4..154a18cc7 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,14 @@ ], "require": { "php": ">=5.3.3", - "zendframework/zend-code": ">2.2.5" + "zendframework/zend-code": ">2.2.5,<3.0" }, "require-dev": { "phpunit/phpunit": "~3.7", "phpmd/phpmd": "1.4.*", "squizlabs/php_codesniffer": "1.4.*", "satooshi/php-coveralls": "~0.6", - "zendframework/zendframework": ">2.2.5" + "zendframework/zendframework": "~2.3" }, "suggest": { "zendframework/zend-stdlib": "To use the hydrator proxy", From ddebe323146eb24bfe7cce5baa919ef878e1dbc1 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 14 Feb 2014 07:41:36 +0100 Subject: [PATCH 4/4] Removing enforced zf2 installation for dev deps --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 154a18cc7..d25fff7f1 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,7 @@ "phpunit/phpunit": "~3.7", "phpmd/phpmd": "1.4.*", "squizlabs/php_codesniffer": "1.4.*", - "satooshi/php-coveralls": "~0.6", - "zendframework/zendframework": "~2.3" + "satooshi/php-coveralls": "~0.6" }, "suggest": { "zendframework/zend-stdlib": "To use the hydrator proxy",