Code enhancement and cleanup

yceruto · nicolas-grekas · commit 039bd4427c4b · 2016-09-06T09:26:07.000+02:00
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -564,7 +564,7 @@ public function setTimeZoneId($timeZoneId)
         try {
             $this->dateTimeZone = new \DateTimeZone($timeZoneId);
             if ('GMT' !== $timeZoneId && $this->dateTimeZone->getName() !== $timeZoneId) {
-                $timeZoneId = $timeZone = $this->getTimeZoneId();
+                $timeZone = $this->getTimeZoneId();
             }
         } catch (\Exception $e) {
             if (PHP_VERSION_ID >= 50500 || (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {
diff --git a/ResourceBundle/LanguageBundle.php b/ResourceBundle/LanguageBundle.php
@@ -42,6 +42,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
      * @param string                     $path
      * @param BundleEntryReaderInterface $reader
      * @param LocaleDataProvider         $localeProvider
+     * @param ScriptDataProvider         $scriptProvider
      */
     public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider, ScriptDataProvider $scriptProvider)
     {

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ public function setTimeZoneId($timeZoneId)`
`564`	`564`	`try {`
`565`	`565`	`$this->dateTimeZone = new \DateTimeZone($timeZoneId);`
`566`	`566`	`if ('GMT' !== $timeZoneId && $this->dateTimeZone->getName() !== $timeZoneId) {`
`567`		`- $timeZoneId = $timeZone = $this->getTimeZoneId();`
	`567`	`+ $timeZone = $this->getTimeZoneId();`
`568`	`568`	`}`
`569`	`569`	`} catch (\Exception $e) {`
`570`	`570`	`if (PHP_VERSION_ID >= 50500 \|\| (extension_loaded('intl') && method_exists('IntlDateFormatter', 'setTimeZone'))) {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter`
`42`	`42`	`* @param string $path`
`43`	`43`	`* @param BundleEntryReaderInterface $reader`
`44`	`44`	`* @param LocaleDataProvider $localeProvider`
	`45`	`+ * @param ScriptDataProvider $scriptProvider`
`45`	`46`	`*/`
`46`	`47`	`public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider, ScriptDataProvider $scriptProvider)`
`47`	`48`	`{`