Fixed issue with option propagation

Author: paquettg

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 2.1.1
+- Fixed issue with options not propagating properly.
+
 ## 2.1.0
 
 ### Added

src/StringEncoder/Encoder.php

@@ -49,7 +49,7 @@ public function getTargetEncoding(): ?string
      */
     public function setTargetEncoding(string $encoding): void
     {
-        $this->targetEncoding = EncodingDTO::makeFromString($encoding);
+        $this->targetEncoding = EncodingDTO::makeFromString($encoding, null, $this->options);
     }
 
     public function getSourceEncoding(): ?string
@@ -66,7 +66,7 @@ public function getSourceEncoding(): ?string
      */
     public function setSourceEncoding(string $encoding): void
     {
-        $this->sourceEncoding = EncodingDTO::makeFromString($encoding);
+        $this->sourceEncoding = EncodingDTO::makeFromString($encoding, null, $this->options);
     }
 
     public function convert(): ConvertReadInterface

src/StringEncoder/Options.php

@@ -30,7 +30,7 @@ class Options implements OptionsInterface
      */
     public function setDefaultTargetEncoding(string $defaultTargetEncoding): OptionsInterface
     {
-        $this->defaultTargetEncoding = EncodingDTO::makeFromString($defaultTargetEncoding);
+        $this->defaultTargetEncoding = EncodingDTO::makeFromString($defaultTargetEncoding, null, $this);
 
         return $this;
     }

tests/tests/EncoderOptionsTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace tests;
+
+use PHPUnit\Framework\TestCase;
+use StringEncoder\Encoder;
+use StringEncoder\Options;
+
+class EncoderOptionsTest extends TestCase
+{
+    private $encoder;
+
+    public function setUp(): void
+    {
+        $this->encoder = new Encoder();
+    }
+
+    public function testSetSource()
+    {
+        $this->encoder->setOptions(
+            (new Options())
+                ->setCaseSensitiveEncoding(false)
+        );
+        $this->encoder->setSourceEncoding('iso-8859-1');
+        $this->assertEquals('ISO-8859-1', $this->encoder->getSourceEncoding());
+    }
+
+    public function testSetTarget()
+    {
+        $this->encoder->setOptions(
+            (new Options())
+                ->setCaseSensitiveEncoding(false)
+        );
+        $this->encoder->setTargetEncoding('iso-8859-1');
+        $this->assertEquals('ISO-8859-1', $this->encoder->getTargetEncoding());
+    }
+}

tests/tests/OptionsTest.php

@@ -35,6 +35,19 @@ public function testSetOptionsInEncoder()
         $this->assertNull($this->encoder->getTargetEncoding());
     }
 
+    public function testSetDefaultTargetEncoding()
+    {
+        $this->options->setDefaultTargetEncoding('ISO-8859-1');
+        $this->assertEquals('ISO-8859-1', $this->options->getDefaultTargetEncoding()->getEncoding());
+    }
+
+    public function testSetDefaultTargetOptionsEncoding()
+    {
+        $this->options->setCaseSensitiveEncoding(false);
+        $this->options->setDefaultTargetEncoding('iso-8859-1');
+        $this->assertEquals('ISO-8859-1', $this->options->getDefaultTargetEncoding()->getEncoding());
+    }
+
     public function testSetRemoveUTF8BOM()
     {
         $this->options->setRemoveUTF8BOM(true);
@@ -46,4 +59,5 @@ public function testSetCaseSensitiveEncoding()
         $this->options->setCaseSensitiveEncoding(false);
         $this->assertFalse($this->options->isCaseSensitiveEncoding());
     }
+
 }