Commit da85a661 authored by webchick's avatar webchick

Issue #2114823 by alexpott, neclimdul, Xano, cosmicdreams, chx: Update PHPUnit to 4.x.

parent 0c33183a

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
......@@ -779,6 +779,7 @@ function simpletest_phpunit_get_available_tests($module = NULL) {
// Find all the tests and get a list of unique class names.
$test_suite = $configuration->getTestSuiteConfiguration(NULL);
$test_classes = array();
/** @var $test_suite \PHPUnit_Framework_TestSuite[] */
foreach ($test_suite as $test) {
// PHPUnit returns a warning message if something is wrong with a test,
// throw an exception to avoid an error when trying to call getInfo() on
......@@ -787,9 +788,9 @@ function simpletest_phpunit_get_available_tests($module = NULL) {
throw new RuntimeException($test->getMessage());
}
$name = get_class($test);
if (!array_key_exists($name, $test_classes) && (!$module || substr($name, 0, $n) == $prefix)) {
$test_classes[$name] = $test->getInfo();
$name = $test->getName();
if ($test instanceof \Drupal\Tests\UnitTestCase && !array_key_exists($name, $test_classes) && (!$module || substr($name, 0, $n) == $prefix)) {
$test_classes[$name] = $test::getInfo();
}
}
......
../phpunit/phpunit/composer/bin/phpunit
\ No newline at end of file
../phpunit/phpunit/phpunit
\ No newline at end of file
This diff is collapsed.
......@@ -10,8 +10,8 @@
$vendorDir . '/phpunit/phpunit-mock-objects',
$vendorDir . '/phpunit/php-timer',
$vendorDir . '/phpunit/php-token-stream',
$vendorDir . '/phpunit/php-file-iterator',
$vendorDir . '/phpunit/php-code-coverage',
$vendorDir . '/phpunit/phpunit',
$vendorDir . '/symfony/yaml',
$vendorDir . '/phpunit/php-file-iterator',
);
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -7,3 +7,5 @@ cache.properties
phpunit.xml
/vendor
/composer.lock
/composer.phar
/.idea
language: php
php:
- 5.3.3
- 5.3
- 5.4
- 5.5
- 5.6
before_script:
- mkdir -p vendor/SebastianBergmann
- git clone --branch=3.7 --depth=100 --quiet git://github.com/sebastianbergmann/phpunit.git vendor/phpunit
- git clone --branch=1.2 --depth=100 --quiet git://github.com/sebastianbergmann/phpunit-mock-objects.git vendor/phpunit-mock-objects
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-text-template.git vendor/php-text-template
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-token-stream.git vendor/php-token-stream
- git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-file-iterator.git vendor/php-file-iterator
- git clone --branch=1.0 --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
- git clone --branch=master --depth=100 --quiet git://github.com/pear/pear-core.git vendor/pear-core
- git clone --branch=trunk --depth=100 --quiet git://github.com/pear/Console_Getopt.git vendor/console-getopt
- COMPOSER_ROOT_VERSION=dev-master composer install --dev --prefer-source
script: php -d include_path=vendor/php-text-template:vendor/php-token-stream:vendor/php-file-iterator:vendor/phpunit:vendor/phpunit-mock-objects:vendor/php-timer:vendor/php-invoker:vendor/pear-core:vendor/console-getopt:vendor:. ./vendor/phpunit/phpunit.php --configuration ./build/travis-ci.xml
script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
notifications:
email: false
irc: "irc.freenode.org#phpunit"
irc:
channels:
- "irc.freenode.org#phpunit"
use_notice: true
PHP_CodeCoverage 1.2
====================
This is the list of changes for the PHP_CodeCoverage 1.2 release series.
PHP_CodeCoverage 1.2.11
-----------------------
* Fixed #151: Blacklisted PHPUnit Phar.
* Fixed sebastianbergmann/phpunit#924.
PHP_CodeCoverage 1.2.10
-----------------------
* Fixed #158: Executable code on a line that has a comment is processed incorrectly.
* Eliminated the coupling to `PHPUnit_Util_Printer` in `PHP_CodeCoverage_Report_Text`.
PHP_CodeCoverage 1.2.9
----------------------
* Improved rendering of "lines covered" numbers for functions and methods with long names or argument lists.
* Fixed the title of the Y axis of the Code Coverage ./. Cyclomatic Complexity dashboard chart.
* Upgraded to Highcharts 2.3.5.
* Upgraded to jQuery 1.9.1.
PHP_CodeCoverage 1.2.8
----------------------
* Reduced vertical whitespace in sourcecode view.
* Upgraded to Bootstrap 2.2.2.
PHP_CodeCoverage 1.2.7
----------------------
* The `html5shiv.js` is now bundled.
* Fixed sebastianbergmann/phpunit#702: `@coversNothing` didn't work as documented.
PHP_CodeCoverage 1.2.6
----------------------
* Fixed #126: `E_NOTICE` thrown when generating coverage report.
PHP_CodeCoverage 1.2.5
----------------------
* Fixed regression introduced in PHP_CodeCoverage 1.2.4.
PHP_CodeCoverage 1.2.4
----------------------
* Fixed #123: Incorrect code coverage for interfaces.
PHP_CodeCoverage 1.2.3
----------------------
* Implemented #116: Do not rely on autoloader class map to populate blacklist.
* Added support for parentheses after method names in the `@covers` annotation.
* When `addUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now excluded from the code coverage.
* Fixed #81: Non-english locales broke the coverage bars in the HTML report.
* Fixed #118: Percentage for tested classes and traits displayed incorrectly.
* Fixed #121: One line `@covers` annotations did not work.
PHP_CodeCoverage 1.2.2
----------------------
* Fixed #115: Backwards compatibility wrapper for `trait_exists()` does not work.
PHP_CodeCoverage 1.2.1
----------------------
* Fixed invalid markup in the HTML report.
* The version number is now displayed when using PHP_CodeCoverage from a Composer install or Git checkout.
PHP_CodeCoverage 1.2.0
----------------------
* The HTML report has been redesigned.
* The new `@coversDefaultClass` annotation enables short `@covers` annotations when working with long class names or namespaces.
* The new `@coversNothing` annotation can be used so tests do not record any code coverage. Useful for integration testing.
* When `processUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now included in the code coverage but with all lines, including those that are not executable, counted as not executed.
* PHP_CodeCoverage 1.2 is only supported on PHP 5.3.3 (or later) and PHP 5.4.7 (or later) is highly recommended.
PHP_CodeCoverage
Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
All rights reserved.