Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 798674b947b9 · 2019-08-03T16:00:31.000+02:00
* 3.4:
  Adopt `@PHPUnit55Migration:risky` rule of php-cs-fixer
diff --git a/DateFormatter/DateFormat/TimezoneTransformer.php b/DateFormatter/DateFormat/TimezoneTransformer.php
@@ -92,8 +92,8 @@ public function extractDateOptions(string $matched, int $length): array
      *
      * @return string A timezone identifier
      *
-     * @see    http://php.net/manual/en/timezones.others.php
-     * @see    http://www.twinsun.com/tz/tz-link.htm
+     * @see http://php.net/manual/en/timezones.others.php
+     * @see http://www.twinsun.com/tz/tz-link.htm
      *
      * @throws NotImplementedException   When the GMT time zone have minutes offset different than zero
      * @throws \InvalidArgumentException When the value can not be matched with pattern

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ public function extractDateOptions(string $matched, int $length): array`
`92`	`92`	`*`
`93`	`93`	`* @return string A timezone identifier`
`94`	`94`	`*`
`95`		`- * @see http://php.net/manual/en/timezones.others.php`
`96`		`- * @see http://www.twinsun.com/tz/tz-link.htm`
	`95`	`+ * @see http://php.net/manual/en/timezones.others.php`
	`96`	`+ * @see http://www.twinsun.com/tz/tz-link.htm`
`97`	`97`	`*`
`98`	`98`	`* @throws NotImplementedException When the GMT time zone have minutes offset different than zero`
`99`	`99`	`* @throws \InvalidArgumentException When the value can not be matched with pattern`