diff --git a/.travis.yml b/.travis.yml index 16c2c44c3327..271252613ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,4 @@ before_install: install: travis_retry composer install --no-interaction --no-suggest -script: vendor/bin/paratest -p 4 --max-batch-size 256 +script: vendor/bin/phpunit diff --git a/composer.json b/composer.json index d335d9fee01c..b90afdc5c88d 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,6 @@ "require-dev": { "ext-sqlite3": "*", "alt-three/testbench": "^1.11", - "brianium/paratest": "^0.15.0", "filp/whoops": "^2.1", "fzaninotto/faker": "^1.6", "graham-campbell/testbench-core": "^1.1", diff --git a/composer.lock b/composer.lock index 734402b81120..d172bc65c025 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" ], - "content-hash": "70b2147b1fc8086bacd0dff2957d22a1", + "content-hash": "cdacb1da413997b10a4ab6fa68abd591", "packages": [ { "name": "alt-three/badger", @@ -4844,168 +4844,6 @@ ], "time": "2017-01-01T12:36:00+00:00" }, - { - "name": "brianium/habitat", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/brianium/habitat.git", - "reference": "d0979e3bb379cbc78ecb42b3ac171bc2b7e06d96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/brianium/habitat/zipball/d0979e3bb379cbc78ecb42b3ac171bc2b7e06d96", - "reference": "d0979e3bb379cbc78ecb42b3ac171bc2b7e06d96", - "shasum": "" - }, - "require-dev": { - "monolog/monolog": ">=1.5.0", - "phpunit/phpunit": ">=3.7.21" - }, - "type": "library", - "autoload": { - "psr-0": { - "Habitat": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian", - "email": "scaturrob@gmail.com", - "homepage": "http://brianscaturro.com", - "role": "Lead" - } - ], - "description": "A dependable php environment", - "time": "2013-06-08T04:42:29+00:00" - }, - { - "name": "brianium/paratest", - "version": "0.15.0", - "source": { - "type": "git", - "url": "https://github.com/brianium/paratest.git", - "reference": "13af4ef6631a2638498de9813bbe0f6493ba84ad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/brianium/paratest/zipball/13af4ef6631a2638498de9813bbe0f6493ba84ad", - "reference": "13af4ef6631a2638498de9813bbe0f6493ba84ad", - "shasum": "" - }, - "require": { - "brianium/habitat": "1.0.0", - "composer/semver": "~1.2", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-simplexml": "*", - "php": ">=5.5.11", - "phpunit/php-timer": ">=1.0.4", - "phpunit/phpunit": "~5.0", - "symfony/console": "~2.3|~3.0", - "symfony/process": "~2.3|~3.0" - }, - "bin": [ - "bin/paratest" - ], - "type": "library", - "autoload": { - "psr-0": { - "ParaTest": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Scaturro", - "email": "scaturrob@gmail.com", - "homepage": "http://brianscaturro.com", - "role": "Lead" - } - ], - "description": "Parallel testing for PHP", - "homepage": "https://github.com/brianium/paratest", - "keywords": [ - "concurrent", - "parallel", - "phpunit", - "testing" - ], - "time": "2017-06-13T19:50:32+00:00" - }, - { - "name": "composer/semver", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573", - "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", - "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "time": "2016-08-30T16:08:34+00:00" - }, { "name": "doctrine/instantiator", "version": "1.0.5",