Merge pull request #146 from matejsuchanek/unicode

Add unicode modifier to regex
wmde · Aug 20, 2020 · ba9704f · ba9704f
2 parents 0ce1e1f + e1a1831
commit ba9704f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -6,7 +6,7 @@
 
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property name="lineLimit" value="103" />
+			<property name="lineLimit" value="102" />
 		</properties>
 	</rule>
 

diff --git a/src/ValueParsers/YearMonthTimeParser.php b/src/ValueParsers/YearMonthTimeParser.php
@@ -60,7 +60,8 @@ public function __construct(
 	protected function stringParse( $value ) {
 		// Matches year and month separated by a separator.
 		// \p{L} matches letters outside the ASCII range.
-		if ( !preg_match( '/^(-?[\d\p{L}]+)\s*?[\/\-\s.,]\s*(-?[\d\p{L}]+)$/', trim( $value ), $matches ) ) {
+		$regex = '/^(-?[\d\p{L}]+)\s*?[\/\-\s.,]\s*(-?[\d\p{L}]+)$/u';
+		if ( !preg_match( $regex, trim( $value ), $matches ) ) {
 			throw new ParseException( 'Failed to parse year and month', $value, self::FORMAT_NAME );
 		}
 		list( , $a, $b ) = $matches;

diff --git a/tests/ValueParsers/YearMonthTimeParserTest.php b/tests/ValueParsers/YearMonthTimeParserTest.php
@@ -35,6 +35,8 @@ protected function getInstance() {
 			->will( $this->returnValue( array(
 				'January' => 1,
 				'Jan' => 1,
+				// to test Unicode (it's Czech)
+				'Březen' => 3,
 				'April' => 4,
 				'June' => 6,
 			) ) );
@@ -96,6 +98,10 @@ public function validInputProvider() {
 			'jan/1999' =>
 				array( '+1999-01-00T00:00:00Z' ),
 
+			// Unicode
+			'Březen 1999' => array( '+1999-03-00T00:00:00Z' ),
+			'březen 1999' => array( '+1999-03-00T00:00:00Z' ),
+
 			// use different date separators
 			'1-1999' =>
 				array( '+1999-01-00T00:00:00Z' ),