From 0ace239d8d0acb57bf43e3155302cc9ec95e975e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 22 Apr 2014 13:53:23 +0200
Subject: [PATCH] Install all testing deps by composer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml   | 3 ---
 composer.json | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35d6b2b353..a4f35bf8da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,6 @@ before_script:
 
     phpenv config-add test/travis.php.ini ;
 
-    pear channel-discover pear.phpunit.de ;
-    pear install phpunit/PHPUnit_Selenium ;
-
     composer install --dev --no-interaction ;
 
     fi ;
diff --git a/composer.json b/composer.json
index c67a71ff46..e5c79ed78c 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,8 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": ">=0.6"
+        "satooshi/php-coveralls": ">=0.6",
+        "phpunit/phpunit": ">=3.7",
+        "phpunit/phpunit-selenium": ">=1.2"
     }
 }