MFoster
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+10-8Lines changed: 10 additions & 8 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+10-8Lines changed: 10 additions & 8 deletions
diff --git a/‎tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
+14Lines changed: 14 additions & 0 deletions b/‎tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
+14Lines changed: 14 additions & 0 deletions
@@ -86,12 +86,14 @@ private static function getPattern($currency)
             return '{{ widget }}';
         }
 
-        if (!isset(self::$patterns[\Locale::getDefault()])) {
-            self::$patterns[\Locale::getDefault()] = array();
+        $locale = \Locale::getDefault();
+
+        if (!isset(self::$patterns[$locale])) {
+            self::$patterns[$locale] = array();
         }
 
-        if (!isset(self::$patterns[\Locale::getDefault()][$currency])) {
-            $format = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::CURRENCY);
+        if (!isset(self::$patterns[$locale][$currency])) {
+            $format = new \NumberFormatter($locale, \NumberFormatter::CURRENCY);
             $pattern = $format->formatCurrency('123', $currency);
 
             // the spacings between currency symbol and number are ignored, because
@@ -103,14 +105,14 @@ private static function getPattern($currency)
             preg_match('/^([^\s\xc2\xa0]*)[\s\xc2\xa0]*123(?:[,.]0+)?[\s\xc2\xa0]*([^\s\xc2\xa0]*)$/u', $pattern, $matches);
 
             if (!empty($matches[1])) {
-                self::$patterns[\Locale::getDefault()] = $matches[1].' {{ widget }}';
+                self::$patterns[$locale][$currency] = $matches[1].' {{ widget }}';
             } elseif (!empty($matches[2])) {
-                self::$patterns[\Locale::getDefault()] = '{{ widget }} '.$matches[2];
+                self::$patterns[$locale][$currency] = '{{ widget }} '.$matches[2];
             } else {
-                self::$patterns[\Locale::getDefault()] = '{{ widget }}';
+                self::$patterns[$locale][$currency] = '{{ widget }}';
             }
         }
 
-        return self::$patterns[\Locale::getDefault()];
+        return self::$patterns[$locale][$currency];
     }
 }
@@ -33,4 +33,18 @@ public function testMoneyPatternWorksForYen()
         $view = $form->createView();
         $this->assertTrue((Boolean) strstr($view->get('money_pattern'), '¥'));
     }
+
+    // https://github.com/symfony/symfony/issues/5458
+    public function testPassDifferentPatternsForDifferentCurrencies()
+    {
+        \Locale::setDefault('de_DE');
+
+        $form1 = $this->factory->create('money', null, array('currency' => 'GBP'));
+        $form2 = $this->factory->create('money', null, array('currency' => 'EUR'));
+        $view1 = $form1->createView();
+        $view2 = $form2->createView();
+
+        $this->assertSame('{{ widget }} £', $view1->get('money_pattern'));
+        $this->assertSame('{{ widget }} €', $view2->get('money_pattern'));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -86,12 +86,14 @@ private static function getPattern($currency)`
`86`	`86`	`return '{{ widget }}';`
`87`	`87`	`}`
`88`	`88`
`89`		`- if (!isset(self::$patterns[\Locale::getDefault()])) {`
`90`		`- self::$patterns[\Locale::getDefault()] = array();`
	`89`	`+ $locale = \Locale::getDefault();`
	`90`	`+`
	`91`	`+ if (!isset(self::$patterns[$locale])) {`
	`92`	`+ self::$patterns[$locale] = array();`
`91`	`93`	`}`
`92`	`94`
`93`		`- if (!isset(self::$patterns[\Locale::getDefault()][$currency])) {`
`94`		`- $format = new \NumberFormatter(\Locale::getDefault(), \NumberFormatter::CURRENCY);`
	`95`	`+ if (!isset(self::$patterns[$locale][$currency])) {`
	`96`	`+ $format = new \NumberFormatter($locale, \NumberFormatter::CURRENCY);`
`95`	`97`	`$pattern = $format->formatCurrency('123', $currency);`
`96`	`98`
`97`	`99`	`// the spacings between currency symbol and number are ignored, because`
`@@ -103,14 +105,14 @@ private static function getPattern($currency)`
`103`	`105`	`preg_match('/^([^\s\xc2\xa0])[\s\xc2\xa0]123(?:[,.]0+)?[\s\xc2\xa0]([^\s\xc2\xa0])$/u', $pattern, $matches);`
`104`	`106`
`105`	`107`	`if (!empty($matches[1])) {`
`106`		`- self::$patterns[\Locale::getDefault()] = $matches[1].' {{ widget }}';`
	`108`	`+ self::$patterns[$locale][$currency] = $matches[1].' {{ widget }}';`
`107`	`109`	`} elseif (!empty($matches[2])) {`
`108`		`- self::$patterns[\Locale::getDefault()] = '{{ widget }} '.$matches[2];`
	`110`	`+ self::$patterns[$locale][$currency] = '{{ widget }} '.$matches[2];`
`109`	`111`	`} else {`
`110`		`- self::$patterns[\Locale::getDefault()] = '{{ widget }}';`
	`112`	`+ self::$patterns[$locale][$currency] = '{{ widget }}';`
`111`	`113`	`}`
`112`	`114`	`}`
`113`	`115`
`114`		`- return self::$patterns[\Locale::getDefault()];`
	`116`	`+ return self::$patterns[$locale][$currency];`
`115`	`117`	`}`
`116`	`118`	`}`