Fix: Remove NewLineInterface

src/Format/Format.php

@@ -29,7 +29,7 @@ final class Format implements FormatInterface
     private $indent;
 
     /**
-     * @var NewLineInterface
+     * @var NewLine
      */
     private $newLine;
 
@@ -39,14 +39,14 @@ final class Format implements FormatInterface
     private $hasFinalNewLine;
 
     /**
-     * @param int              $jsonEncodeOptions
-     * @param Indent           $indent
-     * @param NewLineInterface $newLine
-     * @param bool             $hasFinalNewLine
+     * @param int     $jsonEncodeOptions
+     * @param Indent  $indent
+     * @param NewLine $newLine
+     * @param bool    $hasFinalNewLine
      *
      * @throws Exception\InvalidJsonEncodeOptionsException
      */
-    public function __construct(int $jsonEncodeOptions, Indent $indent, NewLineInterface $newLine, bool $hasFinalNewLine)
+    public function __construct(int $jsonEncodeOptions, Indent $indent, NewLine $newLine, bool $hasFinalNewLine)
     {
         if (0 > $jsonEncodeOptions) {
             throw Exception\InvalidJsonEncodeOptionsException::fromJsonEncodeOptions($jsonEncodeOptions);
@@ -80,7 +80,7 @@ public function indent(): Indent
         return $this->indent;
     }
 
-    public function newLine(): NewLineInterface
+    public function newLine(): NewLine
     {
         return $this->newLine;
     }
@@ -112,7 +112,7 @@ public function withIndent(Indent $indent): FormatInterface
         return $mutated;
     }
 
-    public function withNewLine(NewLineInterface $newLine): FormatInterface
+    public function withNewLine(NewLine $newLine): FormatInterface
     {
         $mutated = clone $this;
 
@@ -157,7 +157,7 @@ private static function detectIndent(string $encoded): Indent
         );
     }
 
-    private static function detectNewLine(string $encoded): NewLineInterface
+    private static function detectNewLine(string $encoded): NewLine
     {
         if (1 === \preg_match('/(?P<newLine>\r\n|\n|\r)/', $encoded, $match)) {
             return NewLine::fromString($match['newLine']);

src/Format/FormatInterface.php

@@ -21,7 +21,7 @@ public function jsonEncodeOptions(): int;
 
     public function indent(): Indent;
 
-    public function newLine(): NewLineInterface;
+    public function newLine(): NewLine;
 
     public function hasFinalNewLine(): bool;
 
@@ -36,7 +36,7 @@ public function withJsonEncodeOptions(int $jsonEncodeOptions): self;
 
     public function withIndent(Indent $indent): self;
 
-    public function withNewLine(NewLineInterface $newLine): self;
+    public function withNewLine(NewLine $newLine): self;
 
     public function withHasFinalNewLine(bool $hasFinalNewLine): self;
 }

src/Format/NewLine.php

@@ -15,7 +15,7 @@
 
 use Localheinz\Json\Normalizer\Exception;
 
-final class NewLine implements NewLineInterface
+final class NewLine
 {
     /**
      * @var string
@@ -37,9 +37,9 @@ public function __toString(): string
      *
      * @throws Exception\InvalidNewLineStringException
      *
-     * @return NewLineInterface
+     * @return self
      */
-    public static function fromString(string $string): NewLineInterface
+    public static function fromString(string $string): self
     {
         if (1 !== \preg_match('/^(?>\r\n|\n|\r)$/', $string)) {
             throw Exception\InvalidNewLineStringException::fromString($string);

test/Unit/Format/FormatTest.php

@@ -17,7 +17,7 @@
 use Localheinz\Json\Normalizer\Format\Format;
 use Localheinz\Json\Normalizer\Format\FormatInterface;
 use Localheinz\Json\Normalizer\Format\Indent;
-use Localheinz\Json\Normalizer\Format\NewLineInterface;
+use Localheinz\Json\Normalizer\Format\NewLine;
 use Localheinz\Json\Normalizer\JsonInterface;
 use Localheinz\Test\Util\Helper;
 use PHPUnit\Framework;
@@ -38,15 +38,15 @@ public function testConstructorRejectsInvalidJsonEncodeOptions(): void
     {
         $jsonEncodeOptions = -1;
         $indent = Indent::fromString('  ');
-        $newLine = $this->prophesize(NewLineInterface::class);
+        $newLine = NewLine::fromString("\r\n");
         $hasFinalNewLine = true;
 
         $this->expectException(Exception\InvalidJsonEncodeOptionsException::class);
 
         new Format(
             $jsonEncodeOptions,
             $indent,
-            $newLine->reveal(),
+            $newLine,
             $hasFinalNewLine
         );
     }
@@ -60,18 +60,18 @@ public function testConstructorSetsValues(bool $hasFinalNewLine): void
     {
         $jsonEncodeOptions = \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES;
         $indent = Indent::fromString('  ');
-        $newLine = $this->prophesize(NewLineInterface::class);
+        $newLine = NewLine::fromString("\r\n");
 
         $format = new Format(
             $jsonEncodeOptions,
             $indent,
-            $newLine->reveal(),
+            $newLine,
             $hasFinalNewLine
         );
 
         $this->assertSame($jsonEncodeOptions, $format->jsonEncodeOptions());
         $this->assertSame($indent, $format->indent());
-        $this->assertSame($newLine->reveal(), $format->newLine());
+        $this->assertSame($newLine, $format->newLine());
         $this->assertSame($hasFinalNewLine, $format->hasFinalNewLine());
     }
 
@@ -82,7 +82,7 @@ public function testWithJsonEncodeOptionsRejectsInvalidJsonEncodeOptions(): void
         $format = new Format(
             \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             Indent::fromString('  '),
-            $this->prophesize(NewLineInterface::class)->reveal(),
+            NewLine::fromString("\r\n"),
             true
         );
 
@@ -96,7 +96,7 @@ public function testWithJsonEncodeOptionsClonesFormatAndSetsJsonEncodeOptions():
         $format = new Format(
             \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             Indent::fromString('  '),
-            $this->prophesize(NewLineInterface::class)->reveal(),
+            NewLine::fromString("\r\n"),
             true
         );
 
@@ -116,7 +116,7 @@ public function testWithIndentClonesFormatAndSetsIndent(): void
         $format = new Format(
             \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             Indent::fromString('  '),
-            $this->prophesize(NewLineInterface::class)->reveal(),
+            NewLine::fromString("\r\n"),
             true
         );
 
@@ -129,20 +129,20 @@ public function testWithIndentClonesFormatAndSetsIndent(): void
 
     public function testWithNewLineClonesFormatAndSetsNewLine(): void
     {
-        $newLine = $this->prophesize(NewLineInterface::class);
+        $newLine = NewLine::fromString("\r\n");
 
         $format = new Format(
             \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             Indent::fromString('  '),
-            $this->prophesize(NewLineInterface::class)->reveal(),
+            NewLine::fromString("\r"),
             true
         );
 
-        $mutated = $format->withNewLine($newLine->reveal());
+        $mutated = $format->withNewLine($newLine);
 
         $this->assertInstanceOf(FormatInterface::class, $mutated);
         $this->assertNotSame($format, $mutated);
-        $this->assertSame($newLine->reveal(), $mutated->newLine());
+        $this->assertSame($newLine, $mutated->newLine());
     }
 
     /**
@@ -155,7 +155,7 @@ public function testWithHasFinalNewLineClonesFormatAndSetsFinalNewLine(bool $has
         $format = new Format(
             \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             Indent::fromString('  '),
-            $this->prophesize(NewLineInterface::class)->reveal(),
+            NewLine::fromString("\r\n"),
             false
         );
 

test/Unit/Format/FormatterTest.php

@@ -17,7 +17,7 @@
 use Localheinz\Json\Normalizer\Format\Formatter;
 use Localheinz\Json\Normalizer\Format\FormatterInterface;
 use Localheinz\Json\Normalizer\Format\Indent;
-use Localheinz\Json\Normalizer\Format\NewLineInterface;
+use Localheinz\Json\Normalizer\Format\NewLine;
 use Localheinz\Json\Normalizer\JsonInterface;
 use Localheinz\Json\Printer;
 use Localheinz\Test\Util\Helper;
@@ -54,13 +54,7 @@ public function testFormatEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixes
         ]);
 
         $indent = Indent::fromString($indentString);
-
-        $newLine = $this->prophesize(NewLineInterface::class);
-
-        $newLine
-            ->__toString()
-            ->shouldBeCalled()
-            ->willReturn($newLineString);
+        $newLine = NewLine::fromString($newLineString);
 
         $encoded = <<<'JSON'
 {
@@ -105,7 +99,7 @@ public function testFormatEncodesWithJsonEncodeOptionsIndentsAndPossiblySuffixes
         $format
             ->newLine()
             ->shouldBeCalled()
-            ->willReturn($newLine->reveal());
+            ->willReturn($newLine);
 
         $format
             ->hasFinalNewLine()

test/Unit/Format/NewLineTest.php

@@ -15,22 +15,13 @@
 
 use Localheinz\Json\Normalizer\Exception;
 use Localheinz\Json\Normalizer\Format\NewLine;
-use Localheinz\Json\Normalizer\Format\NewLineInterface;
-use Localheinz\Test\Util\Helper;
 use PHPUnit\Framework;
 
 /**
  * @internal
  */
 final class NewLineTest extends Framework\TestCase
 {
-    use Helper;
-
-    public function testImplementsNewLineInterface(): void
-    {
-        $this->assertClassImplementsInterface(NewLineInterface::class, NewLine::class);
-    }
-
     /**
      * @dataProvider providerInvalidNewLineString
      *
@@ -72,7 +63,7 @@ public function testFromStringReturnsNewLine(string $string): void
     {
         $newLine = NewLine::fromString($string);
 
-        $this->assertInstanceOf(NewLineInterface::class, $newLine);
+        $this->assertInstanceOf(NewLine::class, $newLine);
         $this->assertSame($string, $newLine->__toString());
     }