Skip to content

Commit fbda9cf

Browse files
committed
Merge branch '2.3' into 2.4
* 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
2 parents 1bf2554 + f135fbb commit fbda9cf

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Tests/Profiler/ProfilerTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,11 @@ protected function setUp()
7979

8080
protected function tearDown()
8181
{
82-
$this->storage->purge();
83-
$this->storage = null;
82+
if (null !== $this->storage) {
83+
$this->storage->purge();
84+
$this->storage = null;
8485

85-
@unlink($this->tmp);
86+
@unlink($this->tmp);
87+
}
8688
}
8789
}

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)