From 54b1decc1fa825f7f6f32d530f96b46f9c1eaeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 27 Mar 2017 16:15:37 +0200 Subject: [PATCH] Fix: Allow to install phpunit/phpunit:^5.2 --- composer.json | 2 +- composer.lock | 61 +++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index c1823c6..a67d1d4 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "zendframework/zend-serializer": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-filter": "^2.6", - "phpunit/phpunit": "^4.5", + "phpunit/phpunit": "^4.5 || ^5.2" , "squizlabs/php_codesniffer": "^2.3.1" }, "suggest": { diff --git a/composer.lock b/composer.lock index 453b910..9256ccf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +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": "cadb5798d25c53b25e14a550d37e654a", - "content-hash": "af95815a16c050b470fd3013669a2deb", + "content-hash": "f9e8bb831b91d7ba9dd1dd29a3951f4e", "packages": [ { "name": "zendframework/zend-stdlib", @@ -50,7 +49,7 @@ "stdlib", "zf2" ], - "time": "2016-02-03 16:53:37" + "time": "2016-02-03T16:53:37+00:00" } ], "packages-dev": [ @@ -79,7 +78,7 @@ "MIT" ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "time": "2014-12-30 15:22:37" + "time": "2014-12-30T15:22:37+00:00" }, { "name": "doctrine/instantiator", @@ -133,7 +132,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -182,7 +181,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2015-02-03 12:10:50" + "time": "2015-02-03T12:10:50+00:00" }, { "name": "phpspec/prophecy", @@ -244,7 +243,7 @@ "spy", "stub" ], - "time": "2016-02-15 07:46:21" + "time": "2016-02-15T07:46:21+00:00" }, { "name": "phpunit/php-code-coverage", @@ -306,7 +305,7 @@ "testing", "xunit" ], - "time": "2015-10-06 15:47:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", @@ -353,7 +352,7 @@ "filesystem", "iterator" ], - "time": "2015-06-21 13:08:43" + "time": "2015-06-21T13:08:43+00:00" }, { "name": "phpunit/php-text-template", @@ -394,7 +393,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -435,7 +434,7 @@ "keywords": [ "timer" ], - "time": "2015-06-21 08:01:12" + "time": "2015-06-21T08:01:12+00:00" }, { "name": "phpunit/php-token-stream", @@ -484,7 +483,7 @@ "keywords": [ "tokenizer" ], - "time": "2015-09-15 10:49:45" + "time": "2015-09-15T10:49:45+00:00" }, { "name": "phpunit/phpunit", @@ -556,7 +555,7 @@ "testing", "xunit" ], - "time": "2016-03-14 06:16:08" + "time": "2016-03-14T06:16:08+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -612,7 +611,7 @@ "mock", "xunit" ], - "time": "2015-10-02 06:51:40" + "time": "2015-10-02T06:51:40+00:00" }, { "name": "sebastian/comparator", @@ -676,7 +675,7 @@ "compare", "equality" ], - "time": "2015-07-26 15:48:44" + "time": "2015-07-26T15:48:44+00:00" }, { "name": "sebastian/diff", @@ -728,7 +727,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2015-12-08T07:14:41+00:00" }, { "name": "sebastian/environment", @@ -778,7 +777,7 @@ "environment", "hhvm" ], - "time": "2016-02-26 18:40:46" + "time": "2016-02-26T18:40:46+00:00" }, { "name": "sebastian/exporter", @@ -844,7 +843,7 @@ "export", "exporter" ], - "time": "2015-06-21 07:55:53" + "time": "2015-06-21T07:55:53+00:00" }, { "name": "sebastian/global-state", @@ -895,7 +894,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/recursion-context", @@ -948,7 +947,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11 19:50:13" + "time": "2015-11-11T19:50:13+00:00" }, { "name": "sebastian/version", @@ -983,7 +982,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21 13:59:46" + "time": "2015-06-21T13:59:46+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -1061,7 +1060,7 @@ "phpcs", "standards" ], - "time": "2016-04-03 22:58:34" + "time": "2016-04-03T22:58:34+00:00" }, { "name": "symfony/yaml", @@ -1110,7 +1109,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:55:57" + "time": "2016-03-04T07:55:57+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -1164,7 +1163,7 @@ "events", "zf2" ], - "time": "2016-02-18 20:53:00" + "time": "2016-02-18T20:53:00+00:00" }, { "name": "zendframework/zend-filter", @@ -1224,7 +1223,7 @@ "filter", "zf2" ], - "time": "2016-04-06 14:04:38" + "time": "2016-04-06T14:04:38+00:00" }, { "name": "zendframework/zend-inputfilter", @@ -1275,7 +1274,7 @@ "inputfilter", "zf2" ], - "time": "2016-02-18 19:49:24" + "time": "2016-02-18T19:49:24+00:00" }, { "name": "zendframework/zend-json", @@ -1330,7 +1329,7 @@ "json", "zf2" ], - "time": "2016-02-04 21:20:26" + "time": "2016-02-04T21:20:26+00:00" }, { "name": "zendframework/zend-math", @@ -1380,7 +1379,7 @@ "math", "zf2" ], - "time": "2016-02-02 23:15:14" + "time": "2016-02-02T23:15:14+00:00" }, { "name": "zendframework/zend-serializer", @@ -1436,7 +1435,7 @@ "serializer", "zf2" ], - "time": "2016-04-06 17:46:23" + "time": "2016-04-06T17:46:23+00:00" }, { "name": "zendframework/zend-servicemanager", @@ -1488,7 +1487,7 @@ "servicemanager", "zf" ], - "time": "2016-02-02 14:13:42" + "time": "2016-02-02T14:13:42+00:00" }, { "name": "zendframework/zend-validator", @@ -1559,7 +1558,7 @@ "validator", "zf2" ], - "time": "2016-04-06 15:44:10" + "time": "2016-04-06T15:44:10+00:00" } ], "aliases": [],