Merge pull request #240 from wmde/numericLanguageCodes

Fix Alias/TermDeserializers failing on numeric array keys

Author: mariushoch

src/Deserializers/AliasGroupListDeserializer.php

@@ -66,10 +66,7 @@ private function deserializeAliasGroup( array $serialization, $languageCode ) {
 			$aliases[] = $aliasSerialization['value'];
 		}
 
-		return new AliasGroup(
-			$languageCode,
-			$aliases
-		);
+		return new AliasGroup( (string)$languageCode, $aliases );
 	}
 
 	private function assertIsValidAliasSerialization( $serialization, $requestedLanguage ) {
@@ -109,7 +106,7 @@ private function assertRequestedAndActualLanguageMatch(
 		array $serialization,
 		$requestedLanguage
 	) {
-		if ( $serialization['language'] !== $requestedLanguage ) {
+		if ( strcmp( $serialization['language'], $requestedLanguage ) !== 0 ) {
 			throw new DeserializationException(
 				'Deserialization of a value of the attribute language (actual)'
 					. ' that is not matching the language key (requested) is not supported: '

src/Deserializers/TermListDeserializer.php

@@ -66,7 +66,7 @@ private function assertRequestedAndActualLanguageMatch(
 		array $serialization,
 		$requestedLanguage
 	) {
-		if ( $serialization['language'] !== $requestedLanguage ) {
+		if ( strcmp( $serialization['language'], $requestedLanguage ) !== 0 ) {
 			throw new DeserializationException(
 				'Deserialization of a value of the attribute language (actual)'
 					. ' that is not matching the language key (requested) is not supported: '

tests/unit/Deserializers/AliasGroupListDeserializerTest.php

@@ -87,6 +87,10 @@ public function deserializationProvider() {
 					[ 'language' => 'en', 'value' => 'B' ],
 				] ],
 			],
+			'Matching numeric keys' => [
+				new AliasGroupList( [ new AliasGroup( '8', [ 'Eight' ] ) ] ),
+				[ '8' => [ [ 'language' => '8', 'value' => 'Eight' ] ] ],
+			],
 		];
 	}
 

tests/unit/Deserializers/TermListDeserializerTest.php

@@ -89,6 +89,10 @@ public function deserializationProvider() {
 					'de' => [ 'language' => 'de', 'value' => 'Delama' ],
 				],
 			],
+			'Matching numeric keys' => [
+				new TermList( [ new Term( '8', 'Eight' ) ] ),
+				[ '8' => [ 'language' => '8', 'value' => 'Eight' ] ],
+			],
 		];
 	}