Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '3.6'

Conflicts:
	ChangeLog.markdown
	README.markdown
	package.xml
  • Loading branch information...
commit 78d68045d1d7960a6a490f4d95677c826e8fa284 2 parents 2ba2cc4 + 4a3cafb
@edorian edorian authored
Showing with 50 additions and 1 deletion.
  1. +2 −1  ChangeLog.markdown
  2. +48 −0 README.markdown
View
3  ChangeLog.markdown
@@ -6,6 +6,7 @@ This is the list of changes for the PHPUnit 3.7 release series.
PHPUnit 3.7.0
-------------
+* PHPUnit 3.7 is only supported on PHP 5.3.3 (or later) and PHP 5.4.0 (or later) is highly recommended.
* Implemented #200: When using process-isolation don't die silently when unserializing the test result fails.
* Implemented #206: Added a `callback` constraint that is useful for making complex assertions.
* Implemented #207: Restore current working directory if is changed by a test case.
@@ -31,4 +32,4 @@ PHPUnit 3.7.0
* Removed `addUncoveredFilesFromWhitelist` configuration setting.
* Removed deprecated `--skeleton-class` and `--skeleton-test` switches. The functionality is now provided by the `phpunit-skel` command of the `PHPUnit_SkeletonGenerator` package.
* Removed deprecated `PHPUnit_Extensions_OutputTestCase` class.
-* PHPUnit 3.7 is only supported on PHP 5.3.3 (or later) and PHP 5.4.0 (or later) is highly recommended.
+
View
48 README.markdown
@@ -71,3 +71,51 @@ In addition to the checkouts listed above, the YAML component that is provided b
pear install pear.symfony.com/Yaml
The `phpunit/phpunit.php` script can be used to invoke the PHPUnit test runner.
+
+Contributing
+------------
+
+Contributions to PHPUnit, its related modules and its documentation are always welcome and best done using GitHub pull request.
+
+Please note that the `3.6.` branch is closed for features and that pull requests should to be based on `master` or the `3.7.` once it exists.
+
+We are trying to keep BC breaks in PHPUnit 3.7 to a absolute minimum so please take this into account when proposing changes.
+
+Due to time constraints we are not always able to respond as quickly as we'd like to so please do not take delays personal and feel free to remind us here or on IRC if you feel that we forgot to respond.
+
+### List of Contributors
+
+Thanks to everyone that has contributed to PHPUnit! You can find a detailed contributors list on every PHPUnit related package on GitHub. This list shows only the bigger components:
+
+- [PHPUnit core](https://github.com/sebastianbergmann/phpunit/graphs/contributors)
+- [PHP code coverage](https://github.com/sebastianbergmann/php-code-coverage/graphs/contributors)
+- [PHPUnit mock objects](https://github.com/sebastianbergmann/phpunit-mock-objects/graphs/contributors)
+
+A very special thanks to everyone that has contributed to the documentation and helped maintaining the translations:
+
+- [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
+
+### Running the test suite(s)
+
+It's not possible to use a system wide installed version of PHPUnit to run the test suite of a git checkout. Because of that is is necessary to change the include paths like describe above.
+
+This can be achieved with a small wrapper script designed to work with every module in the PHPUnit stack.
+
+Note that you might have to change the path to your pear installation here pointing to `/usr/local/lib/php`. You can find it using `pear config-show | grep php_dir`
+
+**Linux/Mac**
+
+`run-tests.sh`
+
+> \#!/bin/bash
+>
+> php -d include_path='.:../phpunit/:../dbunit/:../php-code-coverage/:../php-file-iterator/:../php-invoker/:../php-text-template/:../php-timer:../php-token-stream:../phpunit-mock-objects/:../phpunit-selenium/:../phpunit-story/:/usr/local/lib/php' ../phpunit/phpunit.php $*
+
+**Windows**
+
+`run-tests.bat`
+
+> @echo off
+>
+> php -d include_path='.;../phpunit/;../dbunit/;../php-code-coverage/;../php-file-iterator/;../php-invoker/;../php-text-template/;../php-timer;../php-token-stream;../phpunit-mock-objects/;../phpunit-selenium/;../phpunit-story/;C:/Program Files/PHP/pear' ../phpunit/phpunit.php %*
+
Please sign in to comment.
Something went wrong with that request. Please try again.