do some more cleanup

labrador-kennel · Aug 17, 2015 · 35cd15c · 35cd15c
1 parent ff59cc7
commit 35cd15c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,9 @@ php:
   - 7.0
 
 before_script:
-  - pecl install -f xdebug-2.3.3
   - composer self-update
-  - composer update
+  - composer update --ignore-platform-reqs
 script:
-  - vendor/bin/phpunit --coverage-clover=coverage.clover --configuration travis-phpunit.xml.dist
+  - vendor/bin/phpunit --coverage-clover=coverage.clover
   - 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
@@ -14,17 +14,13 @@
         {
             "type": "vcs",
             "url": "https://github.com/cspray/phpunit-mock-objects"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/cspray/Ardent"
         }
     ],
     "require": {
         "php": "~7.0",
         "rdlowrey/auryn": "~1.0",
         "league/event": "~2.1",
-        "morrisonlevi/ardent": "dev-master",
+        "morrisonlevi/ardent": "~0.14",
         "cspray/telluris": "dev-master",
         "filp/whoops": "~1.1"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/travis-phpunit.xml.dist b/travis-phpunit.xml.dist