From 598a59927ef9ed318a4ab9cfbc9672dea4947894 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Thu, 21 Aug 2014 21:48:19 +1000
Subject: [PATCH] Update travis testing

---
 .scrutinizer.yml |  5 +++++
 .travis.yml      | 19 ++++++++++++++++---
 composer.json    |  1 -
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 .scrutinizer.yml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..e2cb043
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,5 @@
+imports:
+  - php
+
+tools:
+  external_code_coverage: true
diff --git a/.travis.yml b/.travis.yml
index 8ccaa8d..02f3ab8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,31 @@ language: php
 
 php:
   - 5.3
-  - 5.4
   - 5.5
   - 5.6
 
+matrix:
+  include:
+    - php: 5.5
+      env: SYMFONY_VERSION='2.3.*'
+    - php: 5.5
+      env: SYMFONY_VERSION='2.5.*'
+    - php: 5.5
+      env: SYMFONY_VERSION='dev-master'
+
 before_script:
   - /usr/share/elasticsearch/bin/elasticsearch -v
   - sudo /usr/share/elasticsearch/bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/2.0.0
   - sudo service elasticsearch restart
-  - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
   - composer install --dev --prefer-source
 
-script: vendor/bin/phpunit
+script: vendor/bin/phpunit --coverage-clover=coverage.clover
 
 services:
   - elasticsearch
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/composer.json b/composer.json
index 2fd9d3c..bb30928 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,6 @@
     "require-dev":{
         "doctrine/orm": "~2.2",
         "doctrine/doctrine-bundle": "~1.2@beta",
-        "doctrine/mongodb-odm": "1.0.*@beta",
         "jms/serializer-bundle": "@stable",
         "phpunit/phpunit": "~4.1",
         "propel/propel1": "1.6.*",