diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-08 13:46:35 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-08 13:46:35 +0200 |
| commit | 9b154c7de835da559fddd94a810aee2b7e12c03e (patch) | |
| tree | aaa1e503ddb619f92d1c8da38a07703c52a4b58d /phpunit.xml.dist | |
| parent | b0486bfef433b3e62586c6372343783427a58b62 (diff) | |
| parent | 1a80bb526695c58ab10e984ae968364fb00b4477 (diff) | |
| download | symfony-security-9b154c7de835da559fddd94a810aee2b7e12c03e.zip symfony-security-9b154c7de835da559fddd94a810aee2b7e12c03e.tar.gz symfony-security-9b154c7de835da559fddd94a810aee2b7e12c03e.tar.bz2 | |
Merge branch '2.3' into 2.4v2.4.7
* 2.3:
bumped Symfony version to 2.3.18
updated VERSION for 2.3.17
update CONTRIBUTORS for 2.3.17
updated CHANGELOG for 2.3.17
added XSD to PHPUnit configuration
bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
[Translation] Added unescaping of ids in PoFileLoader
updated italian translation for validation messages
[DomCrawler] Fix docblocks and formatting.
[DomCrawler] Remove the query string and the anchor of the uri of a link
Simplified the Travis test command
[Console] Make sure formatter is the same
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 65cc186..3298cea 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<phpunit backupGlobals="false" +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" + backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" @@ -8,7 +10,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="false" bootstrap="vendor/autoload.php" > <testsuites> |