From 96247ec5ba54719d485ffa0ed9eda2abe81bf2e5 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 3 Nov 2014 20:29:46 +0700
Subject: [PATCH] Fixes #6829 : fix coveralls error calls comes by phpcov

---
 .travis.yml         |  2 +-
 CONTRIBUTING.md     |  2 +-
 composer.json       | 26 ++------------------------
 tests/Bootstrap.php |  2 +-
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dadc85e8cf2..fabccc11417 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ script:
 
 after_script:
   # Merges the individual clover reports of each component into a single clover.xml
-  - php vendor/bin/phpcov.php --merge --clover build/logs/clover.xml --whitelist library build/coverage
+  - php vendor/bin/phpcov merge --clover build/logs/clover.xml --whitelist library build/coverage
   - php vendor/bin/coveralls
 
 notifications:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ccfb8a243b5..dc321e1ad24 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,7 +39,7 @@ For sensitive email communications, please use [our PGP key](http://framework.ze
 
 To run tests:
 
-- Make sure you have a recent version of PHPUnit installed; 3.7.0
+- Make sure you have a recent version of PHPUnit installed; 4.3.4
   minimally.
 - Enter the `tests/` subdirectory.
 - Execute PHPUnit, providing a path to a component directory for which
diff --git a/composer.json b/composer.json
index a35231f9c04..084f736b93b 100644
--- a/composer.json
+++ b/composer.json
@@ -8,27 +8,6 @@
     ],
     "homepage": "http://framework.zend.com/",
     "license": "BSD-3-Clause",
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "sebastianbergmann/phpcov",
-                "version": "1.1.0",
-                "dist": {
-                    "url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
-                    "type": "zip"
-                },
-                "source": {
-                    "url": "https://github.com/sebastianbergmann/phpcov.git",
-                    "type": "git",
-                    "reference": "1.1.0"
-                },
-                "bin": [
-                    "phpcov.php"
-                ]
-            }
-        }
-    ],
     "require": {
         "php": ">=5.3.23",
         "zendframework/zendxml": "~1.0-dev"
@@ -39,9 +18,8 @@
         "ircmaxell/security-lib": "dev-master",
         "mikey179/vfsStream": "1.2.*",
         "fabpot/php-cs-fixer": "dev-master#fcbb09b5204",
-        "phpunit/PHPUnit": "3.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "sebastianbergmann/phpcov": "1.1.0"
+        "phpunit/phpcov": "2.0.*",
+        "satooshi/php-coveralls": "dev-master"
     },
     "suggest": {
         "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index dfb1957c430..07b60dc4478 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -15,7 +15,7 @@
 
 if (class_exists('PHPUnit_Runner_Version', true)) {
     $phpUnitVersion = PHPUnit_Runner_Version::id();
-    if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '3.7.0', '<')) {
+    if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '4.3.4', '<')) {
         echo 'This version of PHPUnit (' . PHPUnit_Runner_Version::id() . ') is not supported'
            . ' in Zend Framework 2.x unit tests. Supported is version 3.7.0  or higher.'
            . ' See also: https://github.com/zendframework/zf2/blob/master/CONTRIBUTING.md#running-tests' . PHP_EOL;