Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 2f4d0e9d3216 · 2019-08-14T14:45:29.000+02:00
* 4.4:
  Remove superfluous phpdoc tags
diff --git a/DateFormatter/IntlDateFormatter.php b/DateFormatter/IntlDateFormatter.php
@@ -225,7 +225,6 @@ public function format($timestamp)
     /**
      * Not supported. Formats an object.
      *
-     * @param object $object
      * @param mixed  $format
      * @param string $locale
      *
diff --git a/Locale/Locale.php b/Locale/Locale.php
@@ -105,9 +105,8 @@ public static function composeLocale(array $subtags)
     /**
      * Not supported. Checks if a language tag filter matches with locale.
      *
-     * @param string $langtag      The language tag to check
-     * @param string $locale       The language range to check against
-     * @param bool   $canonicalize
+     * @param string $langtag The language tag to check
+     * @param string $locale  The language range to check against
      *
      * @return string The corresponding locale code
      *

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ public function format($timestamp)`
`225`	`225`	`/**`
`226`	`226`	`* Not supported. Formats an object.`
`227`	`227`	`*`
`228`		`- * @param object $object`
`229`	`228`	`* @param mixed $format`
`230`	`229`	`* @param string $locale`
`231`	`230`	`*`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,8 @@ public static function composeLocale(array $subtags)`
`105`	`105`	`/**`
`106`	`106`	`* Not supported. Checks if a language tag filter matches with locale.`
`107`	`107`	`*`
`108`		`- * @param string $langtag The language tag to check`
`109`		`- * @param string $locale The language range to check against`
`110`		`- * @param bool $canonicalize`
	`108`	`+ * @param string $langtag The language tag to check`
	`109`	`+ * @param string $locale The language range to check against`
`111`	`110`	`*`
`112`	`111`	`* @return string The corresponding locale code`
`113`	`112`	`*`