[Locale] throw NotImplementedException on unimplemented chars

src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Locale\Stub;
 
+use Symfony\Component\Locale\Exception\NotImplementedException;
 use Symfony\Component\Locale\Exception\MethodNotImplementedException;
 use Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedException;
 
@@ -70,27 +71,28 @@ class StubIntlDateFormatter
         $dateTime->setTimestamp($timestamp);
         $dateTime->setTimezone($this->dateTimeZone);
 
-        // not implemented: YuwWFgecSAZvVW
-        $specialChars = 'MLydGQqhDEaHkKmsz';
-        $specialCharsArray = str_split($specialChars);
-        $specialCharsMatch = implode('|', array_map(function($char) {
-            return $char . '+';
-        }, $specialCharsArray));
         $quoteMatch = "'(?:[^']+|'')*'";
-        $regExp = "/($quoteMatch|$specialCharsMatch)/";
+        $implementedCharsMatch = $this->buildCharsMatch('MLydGQqhDEaHkKmsz');
+
+        $notImplementedChars = 'YuwWFgecSAZvVW';
+        $notImplementedCharsMatch = $this->buildCharsMatch($notImplementedChars);
 
-        $callback = function($matches) use ($dateTime) {
-            $datePattern = $matches[0];
-            $length = strlen($datePattern);
+        $regExp = "/($quoteMatch|$implementedCharsMatch|$notImplementedCharsMatch)/";
 
-            if ("'" === $datePattern[0]) {
-                if (preg_match("/^'+$/", $datePattern)) {
-                    return str_replace("''", "'", $datePattern);
+        $pattern = $this->getPattern();
+
+        $callback = function($matches) use ($dateTime, $notImplementedChars, $pattern) {
+            $dateChars = $matches[0];
+            $length = strlen($dateChars);
+
+            if ("'" === $dateChars[0]) {
+                if (preg_match("/^'+$/", $dateChars)) {
+                    return str_replace("''", "'", $dateChars);
                 }
-                return str_replace("''", "'", substr($datePattern, 1, -1));
+                return str_replace("''", "'", substr($dateChars, 1, -1));
             }
 
-            switch ($datePattern[0]) {
+            switch ($dateChars[0]) {
                 case 'M':
                 case 'L':
                     $matchLengthMap = array(
@@ -208,10 +210,17 @@ class StubIntlDateFormatter
                 case 'z':
                     return $dateTime->format('\G\M\TP');
                     break;
+
+                default:
+                    // handle unimplemented characters
+                    if (false !== strpos($notImplementedChars, $dateChars[0])) {
+                        throw new NotImplementedException(sprintf("Unimplemented date character '%s' in format '%s'", $dateChars[0], $pattern));
+                    }
+                    break;
             }
         };
 
-        $formatted = preg_replace_callback($regExp, $callback, $this->getPattern());
+        $formatted = preg_replace_callback($regExp, $callback, $pattern);
 
         return $formatted;
     }
@@ -306,6 +315,16 @@ class StubIntlDateFormatter
         }
     }
 
+    protected function buildCharsMatch($specialChars) {
+        $specialCharsArray = str_split($specialChars);
+
+        $specialCharsMatch = implode('|', array_map(function($char) {
+            return $char . '+';
+        }, $specialCharsArray));
+
+        return $specialCharsMatch;
+    }
+
     static public function create($locale, $datetype, $timetype, $timezone = null, $calendar = null, $pattern = null)
     {
         return new self($locale, $datetype, $timetype, $timezone, $calendar, $pattern);

tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php

@@ -262,7 +262,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $this->skipIfIntlExtensionIsNotLoaded();
         $pattern = 'yyyy-MM-dd HH:mm:ss';
         $formatter = new \IntlDateFormatter('en', \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, $timezone, \IntlDateFormatter::GREGORIAN, $pattern);
-        $this->assertSame($expected, $formatter->format($timestamp), 'Check date format with intl extension.');
+        $this->assertSame($expected, $formatter->format($timestamp));
     }
 
     public function formatWithTimezoneProvider()
@@ -292,6 +292,16 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         );
     }
 
+    /**
+     * @expectedException Symfony\Component\Locale\Exception\NotImplementedException
+     */
+    public function testFormatWithUnimplementedCharsStub()
+    {
+        $pattern = 'Y';
+        $formatter = new StubIntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT, 'UTC', StubIntlDateFormatter::GREGORIAN, $pattern);
+        $formatter->format(0);
+    }
+
     /**
     * @dataProvider dateAndTimeTypeProvider
     */