diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-08 14:21:33 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-08 14:21:33 +0200 |
| commit | b4a38709f0ca040ea6710f0e8f60425bccd96036 (patch) | |
| tree | 03d8bed277a68a729cc77208d093fdd8b3328781 /phpunit.xml.dist | |
| parent | 78724ba5928b63e6c229a38ec057e979610ca2ae (diff) | |
| parent | 9b154c7de835da559fddd94a810aee2b7e12c03e (diff) | |
| download | symfony-security-b4a38709f0ca040ea6710f0e8f60425bccd96036.zip symfony-security-b4a38709f0ca040ea6710f0e8f60425bccd96036.tar.gz symfony-security-b4a38709f0ca040ea6710f0e8f60425bccd96036.tar.bz2 | |
Merge branch '2.4' into 2.5v2.5.1
* 2.4:
updated VERSION for 2.4.7
updated CHANGELOG for 2.4.7
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
add missing docblock for ProcessBuilder::addEnvironmentVariables()
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
Remove Expression Language services when the component is unavailable
[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> |