From 35cd15c271921e3a1abd32c879706d530b6af27a Mon Sep 17 00:00:00 2001 From: Charles Sprayberry Date: Sun, 16 Aug 2015 21:55:33 -0400 Subject: [PATCH] do some more cleanup --- .travis.yml | 5 ++--- composer.json | 6 +----- composer.lock | 25 +++++++++++-------------- travis-phpunit.xml.dist | 37 ------------------------------------- 4 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 travis-phpunit.xml.dist diff --git a/.travis.yml b/.travis.yml index cac0769..b27566d 100644 --- 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 index f8c2a1e..38551dd 100644 --- 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 index 6eea3f0..283af9e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +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": "809959960cda651fb0a0f58c93ae83de", + "hash": "2489b78ae70a2b8c590b3709a0eb86a2", "packages": [ { "name": "cspray/telluris", @@ -153,20 +153,20 @@ }, { "name": "morrisonlevi/ardent", - "version": "dev-master", + "version": "0.14.0", "source": { "type": "git", - "url": "https://github.com/cspray/Ardent.git", - "reference": "fa5e41022218d4cd876e0e79314d21ef8788d6db" + "url": "https://github.com/morrisonlevi/Ardent.git", + "reference": "0cc32e448436929787683a0aa1fdc45a2cadac9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cspray/Ardent/zipball/fa5e41022218d4cd876e0e79314d21ef8788d6db", - "reference": "fa5e41022218d4cd876e0e79314d21ef8788d6db", + "url": "https://api.github.com/repos/morrisonlevi/Ardent/zipball/0cc32e448436929787683a0aa1fdc45a2cadac9e", + "reference": "0cc32e448436929787683a0aa1fdc45a2cadac9e", "shasum": "" }, "require": { - "php": "~7.0" + "php": "~5.4" }, "type": "library", "extra": { @@ -175,10 +175,11 @@ } }, "autoload": { - "files": [ - "autoload.php" + "classmap": [ + "src/" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -199,10 +200,7 @@ "php", "spl" ], - "support": { - "source": "https://github.com/cspray/Ardent/tree/master" - }, - "time": "2015-06-27 13:41:54" + "time": "2014-04-10 17:06:39" }, { "name": "rdlowrey/auryn", @@ -1230,7 +1228,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "morrisonlevi/ardent": 20, "cspray/telluris": 20, "phpunit/phpunit-mock-objects": 20 }, diff --git a/travis-phpunit.xml.dist b/travis-phpunit.xml.dist deleted file mode 100644 index c6d820e..0000000 --- a/travis-phpunit.xml.dist +++ /dev/null @@ -1,37 +0,0 @@ - - - - ./test - ./test - - - - - - - - ./vendor - .composer - - - ./src - - -