Merge branch '3.3' into 3.4

* 3.3: (23 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  [PHPUnitBridge] don't remove when set to  empty string
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  ...

Author: nicolas-grekas

Collator/Collator.php

@@ -70,8 +70,6 @@ class Collator
     const SORT_STRING = 1;
 
     /**
-     * Constructor.
-     *
      * @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed

DateFormatter/DateFormat/FullTransformer.php

@@ -37,8 +37,6 @@ class FullTransformer
     private $timezone;
 
     /**
-     * Constructor.
-     *
      * @param string $pattern  The pattern to be used to format and/or parse values
      * @param string $timezone The timezone to perform the date/time calculations
      */

DateFormatter/DateFormat/MonthTransformer.php

@@ -59,9 +59,6 @@ class MonthTransformer extends Transformer
      */
     protected static $flippedShortMonths = array();
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         if (0 === count(self::$shortMonths)) {

DateFormatter/IntlDateFormatter.php

@@ -129,8 +129,6 @@ class IntlDateFormatter
     private $timeZoneId;
 
     /**
-     * Constructor.
-     *
      * @param string $locale   The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int    $datetype Type of date formatting, one of the format type constants
      * @param int    $timetype Type of time formatting, one of the format type constants

Exception/MethodArgumentNotImplementedException.php

@@ -17,8 +17,6 @@
 class MethodArgumentNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName The method name that raised the exception
      * @param string $argName    The argument name that is not implemented
      */

Exception/MethodArgumentValueNotImplementedException.php

@@ -17,8 +17,6 @@
 class MethodArgumentValueNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName        The method name that raised the exception
      * @param string $argName           The argument name
      * @param string $argValue          The argument value that is not implemented

Exception/MethodNotImplementedException.php

@@ -17,8 +17,6 @@
 class MethodNotImplementedException extends NotImplementedException
 {
     /**
-     * Constructor.
-     *
      * @param string $methodName The name of the method
      */
     public function __construct($methodName)

Exception/NotImplementedException.php

@@ -21,8 +21,6 @@ class NotImplementedException extends RuntimeException
     const INTL_INSTALL_MESSAGE = 'Please install the "intl" extension for full localization capabilities.';
 
     /**
-     * Constructor.
-     *
      * @param string $message The exception message. A note to install the intl extension is appended to this string
      */
     public function __construct($message)

Locale.php

@@ -67,21 +67,44 @@ public static function getDefaultFallback()
      */
     public static function getFallback($locale)
     {
-        if (false === $pos = strrpos($locale, '_')) {
-            if (self::$defaultFallback === $locale) {
-                return 'root';
-            }
+        if (function_exists('locale_parse')) {
+            $localeSubTags = locale_parse($locale);
+            if (1 === count($localeSubTags)) {
+                if (self::$defaultFallback === $localeSubTags['language']) {
+                    return 'root';
+                }
+
+                // Don't return default fallback for "root", "meta" or others
+                // Normal locales have two or three letters
+                if (strlen($locale) < 4) {
+                    return self::$defaultFallback;
+                }
 
-            // Don't return default fallback for "root", "meta" or others
-            // Normal locales have two or three letters
-            if (strlen($locale) < 4) {
-                return self::$defaultFallback;
+                return null;
             }
 
-            return;
+            array_pop($localeSubTags);
+
+            return locale_compose($localeSubTags);
+        }
+
+        if (false !== $pos = strrpos($locale, '_')) {
+            return substr($locale, 0, $pos);
         }
 
-        return substr($locale, 0, $pos);
+        if (false !== $pos = strrpos($locale, '-')) {
+            return substr($locale, 0, $pos);
+        }
+
+        if (self::$defaultFallback === $locale) {
+            return 'root';
+        }
+
+        // Don't return default fallback for "root", "meta" or others
+        // Normal locales have two or three letters
+        if (strlen($locale) < 4) {
+            return self::$defaultFallback;
+        }
     }
 
     /**

NumberFormatter/NumberFormatter.php

@@ -257,8 +257,6 @@ class NumberFormatter
     );
 
     /**
-     * Constructor.
-     *
      * @param string $locale  The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
      * @param int    $style   Style of the formatting, one of the format style constants.
      *                        The only supported styles are NumberFormatter::DECIMAL