From 2462b5432082ece43a5cccf55daf6e15eeffe790 Mon Sep 17 00:00:00 2001 From: Ivan Kurnosov Date: Sun, 2 Nov 2014 09:49:53 +1300 Subject: [PATCH] Fixed travis-ci builds --- .ci/common_env.sh | 2 +- .ci/phpunit-environment.conf | 5 - .ci/setup.sh | 11 +- .ci/start.sh | 2 +- .ci/vagrant_pre_setup.sh | 2 - .gitignore | 1 + .travis.yml | 4 +- .../ScreenshotListenerTest.php | 2 +- Tests/Selenium2TestCase/SuiteBuildingTest.php | 26 +- .../fixtures/SuiteBuildingSuites.php | 25 ++ Tests/SeleniumTestCase/SuiteBuildingTest.php | 30 +- .../fixtures/SuiteBuildingSuites.php | 29 ++ Vagrantfile | 2 +- composer.lock | 279 +++++++----------- 14 files changed, 172 insertions(+), 248 deletions(-) create mode 100644 Tests/Selenium2TestCase/fixtures/SuiteBuildingSuites.php create mode 100644 Tests/SeleniumTestCase/fixtures/SuiteBuildingSuites.php diff --git a/.ci/common_env.sh b/.ci/common_env.sh index 61acbed6..1f9e9024 100644 --- a/.ci/common_env.sh +++ b/.ci/common_env.sh @@ -2,5 +2,5 @@ SELENIUM_HUB_URL='http://127.0.0.1:4444' SELENIUM_JAR=/usr/share/selenium/selenium-server-standalone.jar -SELENIUM_DOWNLOAD_URL=http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.1.jar +SELENIUM_DOWNLOAD_URL=http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar PHP_VERSION=$(php -v) diff --git a/.ci/phpunit-environment.conf b/.ci/phpunit-environment.conf index 0b09e4d4..5e65f3f3 100644 --- a/.ci/phpunit-environment.conf +++ b/.ci/phpunit-environment.conf @@ -6,8 +6,3 @@ autostart=false ; selenium command=python -m SimpleHTTPServer 8080 directory=. ; python-webserver autostart=false ; python-webserver - -[program:php-webserver] -command=php -S localhost:8080 -directory=. ; php-webserver -autostart=false ; php-webserver diff --git a/.ci/setup.sh b/.ci/setup.sh index 60561a21..8828c634 100644 --- a/.ci/setup.sh +++ b/.ci/setup.sh @@ -1,5 +1,7 @@ #!/bin/bash +sudo apt-get update + if [ ! -f "/usr/local/bin/composer" ]; then echo "Installing Composer" php -r "readfile('https://getcomposer.org/installer');" | sudo php -d apc.enable_cli=0 -- --install-dir=/usr/local/bin --filename=composer @@ -8,7 +10,7 @@ else sudo /usr/local/bin/composer self-update fi -if [ ! -d vendor ] || [ ! -f vendor/autoload.php ]; then +if [ ! -d vendor ] || [ ! -f vendor/autoload.php ]; then echo "Installing dependencies" composer install --dev fi @@ -18,12 +20,7 @@ sudo apt-get install supervisor -y --no-install-recommends sudo cp ./.ci/phpunit-environment.conf /etc/supervisor/conf.d/ sudo sed -i "s/^directory=.*webserver$/directory=${ESCAPED_BUILD_DIR}\\/selenium-1-tests/" /etc/supervisor/conf.d/phpunit-environment.conf sudo sed -i "s/^autostart=.*selenium$/autostart=true/" /etc/supervisor/conf.d/phpunit-environment.conf - -if $(echo "$PHP_VERSION" | grep --quiet 'PHP 5.4'); then - sudo sed -i "s/^autostart=.*php-webserver$/autostart=true/" /etc/supervisor/conf.d/phpunit-environment.conf -else - sudo sed -i "s/^autostart=.*python-webserver$/autostart=true/" /etc/supervisor/conf.d/phpunit-environment.conf -fi +sudo sed -i "s/^autostart=.*python-webserver$/autostart=true/" /etc/supervisor/conf.d/phpunit-environment.conf echo "Installing Firefox" sudo apt-get install firefox -y --no-install-recommends diff --git a/.ci/start.sh b/.ci/start.sh index df1ce8e7..09d5d038 100644 --- a/.ci/start.sh +++ b/.ci/start.sh @@ -2,7 +2,7 @@ sudo supervisorctl reload -wget --retry-connrefused --tries=60 --waitretry=1 --output-file=/dev/null "$SELENIUM_HUB_URL/wd/hub/status" -O /dev/null +wget --retry-connrefused --tries=120 --waitretry=3 --output-file=/dev/null "$SELENIUM_HUB_URL/wd/hub/status" -O /dev/null if [ ! $? -eq 0 ]; then echo "Selenium Server not started" else diff --git a/.ci/vagrant_pre_setup.sh b/.ci/vagrant_pre_setup.sh index d3104892..48e63915 100644 --- a/.ci/vagrant_pre_setup.sh +++ b/.ci/vagrant_pre_setup.sh @@ -6,7 +6,5 @@ sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main restr sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-backports main restricted universe multiverse" /etc/apt/sources.list sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main restricted universe multiverse" /etc/apt/sources.list -apt-get update - # installing xvfb, java and php apt-get install xvfb openjdk-7-jre-headless php5-cli php5-curl php5-xdebug ncurses-term -y --no-install-recommends diff --git a/.gitignore b/.gitignore index 0095262b..2009bce1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ firefox/ /.buildpath /.settings /.vagrant/ +/.idea diff --git a/.travis.yml b/.travis.yml index e177e23c..a7cc170b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ php: - 5.5 - 5.6 - hhvm - + matrix: allow_failures: - php: hhvm before_script: ./.ci/before_script.sh -script: "vendor/bin/phpunit --verbose --debug Tests" +script: "vendor/bin/phpunit Tests" diff --git a/Tests/Selenium2TestCase/ScreenshotListenerTest.php b/Tests/Selenium2TestCase/ScreenshotListenerTest.php index 3902a859..c1f247be 100644 --- a/Tests/Selenium2TestCase/ScreenshotListenerTest.php +++ b/Tests/Selenium2TestCase/ScreenshotListenerTest.php @@ -27,7 +27,7 @@ public function testStoresAScreenshotInCaseOfFailure() { $this->url('html/test_open.html'); - $exception = $this->getMock('PHPUnit_Framework_AssertionFailedError'); + $exception = new PHPUnit_Framework_AssertionFailedError(); $this->listener->addFailure($this, $exception, NULL); $this->assertThereIsAScreenshotNamed('Tests_Selenium2TestCase_ScreenshotListenerTest__testStoresAScreenshotInCaseOfFailure*.png'); diff --git a/Tests/Selenium2TestCase/SuiteBuildingTest.php b/Tests/Selenium2TestCase/SuiteBuildingTest.php index e8fd1bed..6b01aebd 100644 --- a/Tests/Selenium2TestCase/SuiteBuildingTest.php +++ b/Tests/Selenium2TestCase/SuiteBuildingTest.php @@ -56,6 +56,7 @@ class Extensions_Selenium2SuiteBuildingTest extends PHPUnit_Framework_TestCase { public function testSampleTestCaseBuildsAFullSuiteContainingAllItsTests() { + require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php'; $suite = Extensions_Selenium2TestCaseSample::suite('Extensions_Selenium2TestCaseSample'); $this->assertInstanceOf('PHPUnit_Framework_TestSuite', $suite); $this->assertEquals(2, count($suite->tests())); @@ -63,32 +64,9 @@ public function testSampleTestCaseBuildsAFullSuiteContainingAllItsTests() public function testAMultipleBrowsersTestCaseBuildsACopyOfEachTestForEachBrowser() { + require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php'; $suite = Extensions_Selenium2MultipleBrowsersTestCaseSample::suite('Extensions_Selenium2MultipleBrowsersTestCaseSample'); $this->assertInstanceOf('PHPUnit_Framework_TestSuite', $suite); $this->assertEquals(2, count($suite->tests())); } } - -class Extensions_Selenium2TestCaseSample extends PHPUnit_Extensions_Selenium2TestCase -{ - public function testFirst() {} - public function testSecond() {} -} - -class Extensions_Selenium2MultipleBrowsersTestCaseSample extends PHPUnit_Extensions_Selenium2TestCase -{ - public static $browsers = array( - array( - 'browserName' => 'firefox', - 'host' => 'localhost', - 'port' => 4444, - ), - array( - 'browserName' => 'safari', - 'host' => 'localhost', - 'port' => 4444, - ), - ); - - public function testSingle() {} -} diff --git a/Tests/Selenium2TestCase/fixtures/SuiteBuildingSuites.php b/Tests/Selenium2TestCase/fixtures/SuiteBuildingSuites.php new file mode 100644 index 00000000..42356e04 --- /dev/null +++ b/Tests/Selenium2TestCase/fixtures/SuiteBuildingSuites.php @@ -0,0 +1,25 @@ + 'firefox', + 'host' => 'localhost', + 'port' => 4444, + ), + array( + 'browserName' => 'safari', + 'host' => 'localhost', + 'port' => 4444, + ), + ); + + public function testSingle() {} +} diff --git a/Tests/SeleniumTestCase/SuiteBuildingTest.php b/Tests/SeleniumTestCase/SuiteBuildingTest.php index 82d4b682..cd6969a4 100644 --- a/Tests/SeleniumTestCase/SuiteBuildingTest.php +++ b/Tests/SeleniumTestCase/SuiteBuildingTest.php @@ -56,6 +56,7 @@ class Extensions_SeleniumSuiteBuildingTest extends PHPUnit_Framework_TestCase { public function testSampleTestCaseBuildsAFullSuiteContainingAllItsTests() { + require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php'; $suite = Extensions_SeleniumTestCaseSample::suite('Extensions_SeleniumTestCaseSample'); $this->assertInstanceOf('PHPUnit_Framework_TestSuite', $suite); $this->assertEquals(2, count($suite->tests())); @@ -63,36 +64,9 @@ public function testSampleTestCaseBuildsAFullSuiteContainingAllItsTests() public function testAMultipleBrowsersTestCaseBuildsACopyOfEachTestForEachBrowser() { + require_once __DIR__ . '/fixtures/SuiteBuildingSuites.php'; $suite = Extensions_SeleniumMultipleBrowsersTestCaseSample::suite('Extensions_SeleniumMultipleBrowsersTestCaseSample'); $this->assertInstanceOf('PHPUnit_Framework_TestSuite', $suite); $this->assertEquals(2, count($suite->tests())); } } - -class Extensions_SeleniumTestCaseSample extends PHPUnit_Extensions_SeleniumTestCase -{ - public function testFirst() {} - public function testSecond() {} -} - -class Extensions_SeleniumMultipleBrowsersTestCaseSample extends PHPUnit_Extensions_SeleniumTestCase -{ - public static $browsers = array( - array( - 'name' => 'Firefox on Linux', - 'browser' => '*firefox', - 'host' => 'localhost', - 'port' => 4444, - 'timeout' => 30000, - ), - array( - 'name' => 'Safari on MacOS X', - 'browser' => '*safari', - 'host' => 'localhost', - 'port' => 4444, - 'timeout' => 30000, - ), - ); - - public function testSingle() {} -} diff --git a/Tests/SeleniumTestCase/fixtures/SuiteBuildingSuites.php b/Tests/SeleniumTestCase/fixtures/SuiteBuildingSuites.php new file mode 100644 index 00000000..6b95a267 --- /dev/null +++ b/Tests/SeleniumTestCase/fixtures/SuiteBuildingSuites.php @@ -0,0 +1,29 @@ + 'Firefox on Linux', + 'browser' => '*firefox', + 'host' => 'localhost', + 'port' => 4444, + 'timeout' => 30000, + ), + array( + 'name' => 'Safari on MacOS X', + 'browser' => '*safari', + 'host' => 'localhost', + 'port' => 4444, + 'timeout' => 30000, + ), + ); + + public function testSingle() {} +} diff --git a/Vagrantfile b/Vagrantfile index 28966115..0579f798 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,7 +16,7 @@ source ./.ci/start.sh SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "hashicorp/precise32" + config.vm.box = "hashicorp/precise64" config.vm.provision "shell", inline: $setupEnvironment end diff --git a/composer.lock b/composer.lock index f8ab9133..13ee9898 100644 --- a/composer.lock +++ b/composer.lock @@ -4,25 +4,24 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "0632c56b62c5a9d3e8e2edc16e9ea6e1", + "hash": "7921e5e23eeb06c23d2986324104d970", "packages": [ { - "name": "ocramius/instantiator", - "version": "1.1.1", + "name": "doctrine/instantiator", + "version": "1.0.4", "source": { "type": "git", - "url": "https://github.com/Ocramius/Instantiator.git", - "reference": "8aa99efa86c51319afc26d23254fe6a8b5a5144a" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/Instantiator/zipball/8aa99efa86c51319afc26d23254fe6a8b5a5144a", - "reference": "8aa99efa86c51319afc26d23254fe6a8b5a5144a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", + "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", "shasum": "" }, "require": { - "ocramius/lazy-map": "1.0.*", - "php": "~5.3" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { "athletic/athletic": "~0.1.8", @@ -34,12 +33,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-0": { - "Instantiator\\": "src" + "Doctrine\\Instantiator\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -54,96 +53,38 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/Ocramius/Instantiator", + "homepage": "https://github.com/doctrine/instantiator", "keywords": [ "constructor", "instantiate" ], - "time": "2014-08-11 23:48:35" - }, - { - "name": "ocramius/lazy-map", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/LazyMap.git", - "reference": "7fe3d347f5e618bcea7d39345ff83f3651d8b752" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/LazyMap/zipball/7fe3d347f5e618bcea7d39345ff83f3651d8b752", - "reference": "7fe3d347f5e618bcea7d39345ff83f3651d8b752", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "athletic/athletic": "~0.1.6", - "phpmd/phpmd": "1.5.*", - "phpunit/phpunit": ">=3.7", - "satooshi/php-coveralls": "~0.6", - "squizlabs/php_codesniffer": "1.4.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "LazyMap\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/", - "role": "Developer" - } - ], - "description": "A library that provides lazy instantiation logic for a map of objects", - "homepage": "https://github.com/Ocramius/LazyMap", - "keywords": [ - "lazy", - "lazy instantiation", - "lazy loading", - "map", - "service location" - ], - "time": "2013-11-09 22:30:54" + "time": "2014-10-13 12:58:55" }, { "name": "phpunit/php-code-coverage", - "version": "2.0.10", + "version": "2.0.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6d196af48e8c100a3ae881940123e693da5a9217" + "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6d196af48e8c100a3ae881940123e693da5a9217", - "reference": "6d196af48e8c100a3ae881940123e693da5a9217", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53603b3c995f5aab6b59c8e08c3a663d2cc810b7", + "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3.1", - "phpunit/php-text-template": "~1.2.0", - "phpunit/php-token-stream": "~1.2.2", - "sebastian/environment": "~1.0.0", - "sebastian/version": "~1.0.3" + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "~1.0", + "sebastian/version": "~1.0" }, "require-dev": { "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4.0.14" + "phpunit/phpunit": "~4.1" }, "suggest": { "ext-dom": "*", @@ -182,7 +123,7 @@ "testing", "xunit" ], - "time": "2014-08-06 06:39:42" + "time": "2014-08-31 06:33:04" }, { "name": "phpunit/php-file-iterator", @@ -319,45 +260,44 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" + "reference": "f8d5d08c56de5cfd592b3340424a81733259a876" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876", + "reference": "f8d5d08c56de5cfd592b3340424a81733259a876", "shasum": "" }, "require": { "ext-tokenizer": "*", "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], "description": "Wrapper around PHP's tokenizer extension.", @@ -365,20 +305,20 @@ "keywords": [ "tokenizer" ], - "time": "2014-03-03 05:10:30" + "time": "2014-08-31 06:12:13" }, { "name": "phpunit/phpunit", - "version": "4.2.0", + "version": "4.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "58db726aa45fe26bca93f692cb3d77e9a46b7830" + "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/58db726aa45fe26bca93f692cb3d77e9a46b7830", - "reference": "58db726aa45fe26bca93f692cb3d77e9a46b7830", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/23e4e0310f037aae873cc81b8658dbbb82878f71", + "reference": "23e4e0310f037aae873cc81b8658dbbb82878f71", "shasum": "" }, "require": { @@ -389,10 +329,10 @@ "ext-spl": "*", "php": ">=5.3.3", "phpunit/php-code-coverage": "~2.0", - "phpunit/php-file-iterator": "~1.3.1", + "phpunit/php-file-iterator": "~1.3.2", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": "~2.2", + "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.0", "sebastian/diff": "~1.1", "sebastian/environment": "~1.0", @@ -409,7 +349,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2.x-dev" + "dev-master": "4.3.x-dev" } }, "autoload": { @@ -439,29 +379,29 @@ "testing", "xunit" ], - "time": "2014-08-08 05:13:30" + "time": "2014-10-22 11:43:12" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "42e589e08bc86e3e9bdf20d385e948347788505b" + "reference": "c63d2367247365f688544f0d500af90a11a44c65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/42e589e08bc86e3e9bdf20d385e948347788505b", - "reference": "42e589e08bc86e3e9bdf20d385e948347788505b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65", + "reference": "c63d2367247365f688544f0d500af90a11a44c65", "shasum": "" }, "require": { - "ocramius/instantiator": "~1.0", + "doctrine/instantiator": "~1.0,>=1.0.1", "php": ">=5.3.3", "phpunit/php-text-template": "~1.2" }, "require-dev": { - "phpunit/phpunit": "4.2.*@dev" + "phpunit/phpunit": "~4.3" }, "suggest": { "ext-soap": "*" @@ -469,7 +409,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { @@ -478,9 +418,6 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -497,20 +434,20 @@ "mock", "xunit" ], - "time": "2014-08-02 13:50:58" + "time": "2014-10-03 05:12:11" }, { "name": "sebastian/comparator", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2" + "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2", - "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", + "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", "shasum": "" }, "require": { @@ -537,11 +474,6 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -553,6 +485,10 @@ { "name": "Bernhard Schussek", "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], "description": "Provides the functionality to compare PHP values for equality", @@ -562,29 +498,32 @@ "compare", "equality" ], - "time": "2014-05-02 07:05:58" + "time": "2014-05-11 23:00:21" }, { "name": "sebastian/diff", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d" + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", - "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7", + "reference": "5843509fed39dee4b356a306401e9dd1a931fec7", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -597,14 +536,13 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - }, { "name": "Kore Nordmann", "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" } ], "description": "Diff implementation", @@ -612,32 +550,32 @@ "keywords": [ "diff" ], - "time": "2013-08-03 16:46:33" + "time": "2014-08-15 10:29:00" }, { "name": "sebastian/environment", - "version": "1.0.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a" + "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a", - "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d", + "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*@dev" + "phpunit/phpunit": "~4.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -652,8 +590,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], "description": "Provides functionality to handle HHVM/PHP environments", @@ -663,27 +600,27 @@ "environment", "hhvm" ], - "time": "2014-02-18 16:17:19" + "time": "2014-10-22 06:38:05" }, { "name": "sebastian/exporter", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529" + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", - "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*@dev" + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { @@ -701,11 +638,6 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -714,14 +646,17 @@ "name": "Volker Dusch", "email": "github@wallbash.com" }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net", - "role": "Lead" - }, { "name": "Bernhard Schussek", "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], "description": "Provides the functionality to export PHP variables for visualization", @@ -730,7 +665,7 @@ "export", "exporter" ], - "time": "2014-02-16 08:26:31" + "time": "2014-09-10 00:51:36" }, { "name": "sebastian/version", @@ -769,17 +704,17 @@ }, { "name": "symfony/yaml", - "version": "v2.5.3", + "version": "v2.5.6", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f" + "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", - "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726", + "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726", "shasum": "" }, "require": { @@ -812,26 +747,18 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-08-05 09:00:40" + "time": "2014-10-01 05:50:18" } ], - "packages-dev": [ - - ], - "aliases": [ - - ], + "packages-dev": [], + "aliases": [], "minimum-stability": "stable", - "stability-flags": [ - - ], + "stability-flags": [], "prefer-stable": false, "platform": { "php": ">=5.3.3", "ext-curl": "*", "ext-dom": "*" }, - "platform-dev": [ - - ] + "platform-dev": [] }