fix: make sure parameters are parsed in MediaTypeParser

neoncitylights · Dec 9, 2023 · e208cee · e208cee
1 parent 3ff4bc7
commit e208cee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/MediaTypeParser.php b/src/MediaTypeParser.php
@@ -123,7 +123,7 @@ private function collectParameters( string $s, int $length, int &$position ): ar
 					fn( string $c ) => Utf8Utils::isHttpTokenCodepoint( $c ) )
 				&& Utf8Utils::onlyContains( $parameterValue,
 					fn( string $c ) => Utf8Utils::isHttpQuotedStringTokenCodepoint( $c ) )
-				&& isset( $parameters[$parameterValue] )
+				&& !isset( $parameters[$parameterName] )
 			) {
 				$parameters[$parameterName] = $parameterValue;
 			}

diff --git a/tests/MediaTypeParserTest.php b/tests/MediaTypeParserTest.php
@@ -25,14 +25,14 @@ public function testValidMediaTypes(
 		string $validMediaType,
 		string $expectedType,
 		string $expectedSubType,
-		// array $expectedParameters
+		array $expectedParameters
 	): void {
 		$parsedValue = $this->parser->parse( $validMediaType );
 
 		$this->assertInstanceOf( MediaType::class, $parsedValue );
 		$this->assertEquals( $expectedType, $parsedValue->getType() );
 		$this->assertEquals( $expectedSubType, $parsedValue->getSubType() );
-		// $this->assertEquals( $expectedParameters, $parsedValue->getParameters() );
+		$this->assertEquals( $expectedParameters, $parsedValue->getParameters() );
 	}
 
 	/**
@@ -50,37 +50,37 @@ public function provideValidMediaTypes(): array {
 				'text/plain',
 				'text',
 				'plain',
-				// [],
+				[],
 			],
 			[
 				'text/plain;charset=UTF-8',
 				'text',
 				'plain',
-				// [
-				// 	'charset' => 'UTF-8',
-				// ],
+				[
+					'charset' => 'UTF-8',
+				],
 			],
 			[
 				'  text/plain;charset=UTF-8  ',
 				'text',
 				'plain',
-				// [
-				// 	'charset' => 'UTF-8',
-				// ],
+				[
+					'charset' => 'UTF-8',
+				],
 			],
 			[
 				'  text/plain;   charset=UTF-8  ',
 				'text',
 				'plain',
-				// [
-				// 	'charset' => 'UTF-8',
-				// ],
+				[
+					'charset' => 'UTF-8',
+				],
 			],
 			[
 				'application/vnd.openxmlformats-officedocument.presentationml.presentation',
 				'application',
 				'vnd.openxmlformats-officedocument.presentationml.presentation',
-				// [],
+				[],
 			]
 		];
 	}