Skip to content

Commit 5360f60

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: Improve the config validation in TwigBundle [WebProfilerBundle][logger] added missing deprecation message. [Security][Acl] enforce string identifiers [BrowserKit] Fix bug when uri starts with http. bumped Symfony version to 2.3.31 updated VERSION for 2.3.30 updated CHANGELOG for 2.3.30 Php Inspections (EA Extended): - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString -resolved implicit magic methods calls -resolved callable name case mismatches
2 parents de1d8db + 5ec7892 commit 5360f60

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Extension/Core/DataTransformer/DateTimeToStringTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function reverseTransform($value)
215215
}
216216

217217
if ($this->inputTimezone !== $this->outputTimezone) {
218-
$dateTime->setTimeZone(new \DateTimeZone($this->inputTimezone));
218+
$dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
219219
}
220220
} catch (TransformationFailedException $e) {
221221
throw $e;

Tests/AbstractLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
6161
try {
6262
// Wrap in <root> node so we can load HTML with multiple tags at
6363
// the top level
64-
$dom->loadXml('<root>'.$html.'</root>');
64+
$dom->loadXML('<root>'.$html.'</root>');
6565
} catch (\Exception $e) {
6666
$this->fail(sprintf(
6767
"Failed loading HTML:\n\n%s\n\nError: %s",

Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function testReverseTransformWithDifferentTimezones()
140140

141141
$output = new \DateTime('2010-02-03 16:05:06 Asia/Hong_Kong');
142142
$input = $output->format('Y-m-d H:i:s');
143-
$output->setTimeZone(new \DateTimeZone('America/New_York'));
143+
$output->setTimezone(new \DateTimeZone('America/New_York'));
144144

145145
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
146146
}

0 commit comments

Comments
 (0)