Remove configuration class (#80)

Author: webignition

src/Parser/Configuration.php

@@ -3,7 +3,6 @@
 namespace webignition\InternetMediaType\Parser;
 
 use webignition\InternetMediaType\InternetMediaType;
-use webignition\InternetMediaType\Parameter\Parameter;
 use webignition\InternetMediaType\Parameter\Parser\AttributeFixer;
 use webignition\InternetMediaType\Parameter\Parser\AttributeParser;
 use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
@@ -24,7 +23,8 @@ class Parser
     public const TYPE_SUBTYPE_SEPARATOR = '/';
     public const TYPE_PARAMETER_SEPARATOR = ';';
 
-    private Configuration $configuration;
+    private bool $ignoreInvalidAttributes = false;
+    private bool $attemptToRecoverFromInvalidInternalCharacter = false;
     private bool $hasAttemptedToFixSubtypeInvalidInternalCharacter = false;
     private bool $hasAttemptedToFixAttributeInvalidInternalCharacter = false;
 
@@ -35,7 +35,6 @@ public function __construct(
         private TypeFixer $typeFixer,
         private AttributeFixer $attributeFixer,
     ) {
-        $this->configuration = new Configuration();
     }
 
     public static function create(): Parser
@@ -110,33 +109,15 @@ public function parse(string $internetMediaTypeString): ?InternetMediaTypeInterf
         }
     }
 
-    public function setConfiguration(Configuration $configuration): void
-    {
-        $this->configuration = $configuration;
-    }
-
-    public function getConfiguration(): Configuration
-    {
-        return $this->configuration;
-    }
-
     public function setIgnoreInvalidAttributes(bool $ignoreInvalidAttributes): void
     {
-        if (filter_var($ignoreInvalidAttributes, FILTER_VALIDATE_BOOLEAN)) {
-            $this->getConfiguration()->enableIgnoreInvalidAttributes();
-        } else {
-            $this->getConfiguration()->disableIgnoreInvalidAttributes();
-        }
+        $this->ignoreInvalidAttributes = $ignoreInvalidAttributes;
     }
 
     public function setAttemptToRecoverFromInvalidInternalCharacter(
         bool $attemptToRecoverFromInvalidInternalCharacter
     ): void {
-        if (filter_var($attemptToRecoverFromInvalidInternalCharacter, FILTER_VALIDATE_BOOLEAN)) {
-            $this->getConfiguration()->enableAttemptToRecoverFromInvalidInternalCharacter();
-        } else {
-            $this->getConfiguration()->disableAttemptToRecoverFromInvalidInternalCharacter();
-        }
+        $this->attemptToRecoverFromInvalidInternalCharacter = $attemptToRecoverFromInvalidInternalCharacter;
     }
 
     private function createParameterString(string $inputString, string $type, string $subtype): string
@@ -205,7 +186,7 @@ private function parseSubtype(string $inputString): string
             return $this->subtypeParser->parse($inputString);
         } catch (SubtypeParserException $subtypeParserException) {
             $shouldAttemptToFixInvalidInternalCharacter =
-                $this->getConfiguration()->attemptToRecoverFromInvalidInternalCharacter()
+                $this->attemptToRecoverFromInvalidInternalCharacter
                 && !$this->hasAttemptedToFixSubtypeInvalidInternalCharacter;
 
             if ($shouldAttemptToFixInvalidInternalCharacter) {
@@ -218,6 +199,8 @@ private function parseSubtype(string $inputString): string
                 }
             }
 
+            $this->hasAttemptedToFixSubtypeInvalidInternalCharacter = false;
+
             throw $subtypeParserException;
         }
     }
@@ -232,13 +215,12 @@ private function parseParameterString(string $parameterString): ?ParameterInterf
         try {
             return $this->parameterParser->parse($parameterString);
         } catch (AttributeParserException $attributeParserException) {
-            $shouldIgnoreInvalidAttributes = $this->getConfiguration()->ignoreInvalidAttributes();
-            if ($shouldIgnoreInvalidAttributes) {
+            if ($this->ignoreInvalidAttributes) {
                 return null;
             }
 
             $shouldAttemptToFixInvalidInternalCharacter =
-                $this->getConfiguration()->attemptToRecoverFromInvalidInternalCharacter()
+                $this->attemptToRecoverFromInvalidInternalCharacter
                 && !$this->hasAttemptedToFixAttributeInvalidInternalCharacter;
 
             if ($shouldAttemptToFixInvalidInternalCharacter) {
@@ -249,6 +231,8 @@ private function parseParameterString(string $parameterString): ?ParameterInterf
                 return $this->parameterParser->parse($fixedInputString);
             }
 
+            $this->hasAttemptedToFixAttributeInvalidInternalCharacter = false;
+
             throw $attributeParserException;
         }
     }

src/Parser/Parser.php

@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use webignition\InternetMediaType\Parameter\Parser\AttributeParserException;
-use webignition\InternetMediaType\Parser\Configuration;
 use webignition\InternetMediaType\Parser\ParseException;
 use webignition\InternetMediaType\Parser\Parser;
 use webignition\InternetMediaType\Parser\SubtypeParserException;
@@ -137,7 +136,7 @@ public function testParseAndFixInvalidMediaType(
         string $expectedSubtype,
         array $expectedParameters
     ): void {
-        $this->parser->getConfiguration()->enableAttemptToRecoverFromInvalidInternalCharacter();
+        $this->parser->setAttemptToRecoverFromInvalidInternalCharacter(true);
         $internetMediaType = $this->parser->parse($internetMediaTypeString);
         self::assertInstanceOf(InternetMediaTypeInterface::class, $internetMediaType);
 
@@ -199,68 +198,6 @@ public function parseAndFixInvalidMediaTypeDataProvider(): array
         ];
     }
 
-    public function testSetConfiguration(): void
-    {
-        $configuration = new Configuration();
-
-        $this->assertNotEquals(spl_object_hash($configuration), spl_object_hash($this->parser->getConfiguration()));
-
-        $this->parser->setConfiguration($configuration);
-        $this->assertEquals(spl_object_hash($configuration), spl_object_hash($this->parser->getConfiguration()));
-    }
-
-    /**
-     * @dataProvider setIgnoreInvalidAttributesDataProvider
-     */
-    public function testSetIgnoreInvalidAttributes(bool $ignoreInvalidAttributes): void
-    {
-        $this->parser->setIgnoreInvalidAttributes($ignoreInvalidAttributes);
-        $this->assertEquals($ignoreInvalidAttributes, $this->parser->getConfiguration()->ignoreInvalidAttributes());
-    }
-
-    /**
-     * @return array<mixed>
-     */
-    public function setIgnoreInvalidAttributesDataProvider(): array
-    {
-        return [
-            'true' => [
-                'ignoreInvalidAttributes' => true,
-            ],
-            'false' => [
-                'ignoreInvalidAttributes' => false,
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider setAttemptToRecoverFromInvalidInternalCharacterDataProvider
-     */
-    public function testSetAttemptToRecoverFromInvalidInternalCharacter(
-        bool $attemptToRecoverFromInvalidInternalCharacter
-    ): void {
-        $this->parser->setAttemptToRecoverFromInvalidInternalCharacter($attemptToRecoverFromInvalidInternalCharacter);
-        $this->assertEquals(
-            $attemptToRecoverFromInvalidInternalCharacter,
-            $this->parser->getConfiguration()->attemptToRecoverFromInvalidInternalCharacter()
-        );
-    }
-
-    /**
-     * @return array<mixed>
-     */
-    public function setAttemptToRecoverFromInvalidInternalCharacterDataProvider(): array
-    {
-        return [
-            'true' => [
-                'attemptToRecoverFromInvalidInternalCharacter' => true,
-            ],
-            'false' => [
-                'attemptToRecoverFromInvalidInternalCharacter' => false,
-            ],
-        ];
-    }
-
     /**
      * @dataProvider parseThrowsExceptionDataProvider
      *