Skip to content

Commit 84533bf

Browse files
committed
Merge branch '2.4' into 2.5
* 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
2 parents cb62ec8 + 9ef3a5a commit 84533bf

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

phpunit.xml.dist

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit backupGlobals="false"
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5+
backupGlobals="false"
46
backupStaticAttributes="false"
57
colors="true"
68
convertErrorsToExceptions="true"
79
convertNoticesToExceptions="true"
810
convertWarningsToExceptions="true"
911
processIsolation="false"
1012
stopOnFailure="false"
11-
syntaxCheck="false"
1213
bootstrap="vendor/autoload.php"
1314
>
1415
<testsuites>

0 commit comments

Comments
 (0)