Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 55aa6d6003c9 · 2017-11-07T12:56:23.000+01:00
* 2.7:
  Docblock fixes
diff --git a/Extension/Core/Type/DateType.php b/Extension/Core/Type/DateType.php
@@ -303,7 +303,7 @@ public function getBlockPrefix()
     private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)
     {
         $pattern = $formatter->getPattern();
-        $timezone = $formatter->getTimezoneId();
+        $timezone = $formatter->getTimeZoneId();
         $formattedTimestamps = array();
 
         if ($setTimeZone = \PHP_VERSION_ID >= 50500 || method_exists($formatter, 'setTimeZone')) {

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public function getBlockPrefix()`
`303`	`303`	`private function formatTimestamps(\IntlDateFormatter $formatter, $regex, array $timestamps)`
`304`	`304`	`{`
`305`	`305`	`$pattern = $formatter->getPattern();`
`306`		`- $timezone = $formatter->getTimezoneId();`
	`306`	`+ $timezone = $formatter->getTimeZoneId();`
`307`	`307`	`$formattedTimestamps = array();`
`308`	`308`
`309`	`309`	`if ($setTimeZone = \PHP_VERSION_ID >= 50500 \|\| method_exists($formatter, 'setTimeZone')) {`