Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 42bb604383c4 · 2017-11-07T13:10:25.000+01:00
* 3.3:
  Random fixes
  Docblock fixes
  [HttpKernel] Enhance deprecation message
  [SecurityBundle] Fix the datacollector to properly support decision.object being null
diff --git a/Extension/Core/Type/DateType.php b/Extension/Core/Type/DateType.php
@@ -285,7 +285,7 @@ public function getBlockPrefix()
     private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
     {
         $pattern = $formatter->getPattern();
-        $timezone = $formatter->getTimezoneId();
+        $timezone = $formatter->getTimeZoneId();
         $formattedTimestamps = array();
 
         $formatter->setTimeZone('UTC');

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ public function getBlockPrefix()`
`285`	`285`	`private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)`
`286`	`286`	`{`
`287`	`287`	`$pattern = $formatter->getPattern();`
`288`		`- $timezone = $formatter->getTimezoneId();`
	`288`	`+ $timezone = $formatter->getTimeZoneId();`
`289`	`289`	`$formattedTimestamps = array();`
`290`	`290`
`291`	`291`	`$formatter->setTimeZone('UTC');`