Merge pull request #603 from ergebnis/fix/rename

Fix: Rename method
ergebnis · Dec 29, 2021 · 0f993af · 0f993af
2 parents d573daa + 2612dde
commit 0f993af
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ For a full diff see [`1.0.3...main`][1.0.3...main].
 - Dropped support for PHP 7.3 ([#573]), by [@localheinz]
 - Renamed `Format::__toString()`, `Indent::__toString()`, and `Json::__toString()` to `Format::toString()`, `Indent::toString()`, and `Json::toString()`, requiring consumers to explicitly invoke methods instead of allowing to cast to `string` ([#589]), by [@localheinz]
 - Started using the `SchemaValidator` provided by `ergebnis/json-schema-validator` ([#595]), by [@localheinz]
+- Renamed `Format\JsonEncodeOptions::value()` to `Format\JsonEncodeOptions::toInt()` ([#603]), by [@localheinz]
 
 ### Fixed
 
@@ -434,6 +435,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#590]: https://github.com/ergebnis/json-normalizer/pull/590
 [#595]: https://github.com/ergebnis/json-normalizer/pull/595
 [#597]: https://github.com/ergebnis/json-normalizer/pull/597
+[#603]: https://github.com/ergebnis/json-normalizer/pull/603
 
 [@BackEndTea]: https://github.com/BackEndTea
 [@dependabot]: https://github.com/dependabot

diff --git a/src/Format/Formatter.php b/src/Format/Formatter.php
@@ -32,7 +32,7 @@ public function format(
         /** @var string $encoded */
         $encoded = \json_encode(
             $json->decoded(),
-            $format->jsonEncodeOptions()->value(),
+            $format->jsonEncodeOptions()->toInt(),
         );
 
         $printed = $this->printer->print(

diff --git a/src/Format/JsonEncodeOptions.php b/src/Format/JsonEncodeOptions.php
@@ -55,7 +55,7 @@ public static function fromJson(Json $json): self
         return self::fromInt($jsonEncodeOptions);
     }
 
-    public function value(): int
+    public function toInt(): int
     {
         return $this->value;
     }

diff --git a/src/JsonEncodeNormalizer.php b/src/JsonEncodeNormalizer.php
@@ -27,7 +27,7 @@ public function normalize(Json $json): Json
         /** @var string $encodedWithJsonEncodeOptions */
         $encodedWithJsonEncodeOptions = \json_encode(
             $json->decoded(),
-            $this->jsonEncodeOptions->value(),
+            $this->jsonEncodeOptions->toInt(),
         );
 
         return Json::fromEncoded($encodedWithJsonEncodeOptions);

diff --git a/test/Unit/Format/JsonEncodeOptionsTest.php b/test/Unit/Format/JsonEncodeOptionsTest.php
@@ -65,7 +65,7 @@ public function testFromIntReturnsJsonEncodeOptions(int $value): void
     {
         $jsonEncodeOptions = Format\JsonEncodeOptions::fromInt($value);
 
-        self::assertSame($value, $jsonEncodeOptions->value());
+        self::assertSame($value, $jsonEncodeOptions->toInt());
     }
 
     /**
@@ -94,7 +94,7 @@ public function testFromJsonReturnsJsonEncodeOptions(int $value, string $encoded
 
         $jsonEncodeOptions = Format\JsonEncodeOptions::fromJson($json);
 
-        self::assertSame($value, $jsonEncodeOptions->value());
+        self::assertSame($value, $jsonEncodeOptions->toInt());
     }
 
     /**

diff --git a/test/Unit/JsonTest.php b/test/Unit/JsonTest.php
@@ -56,7 +56,7 @@ public function testFromEncodedReturnsJson(string $encoded): void
 
         $format = Format\Format::fromJson($json);
 
-        self::assertSame($format->jsonEncodeOptions()->value(), $json->format()->jsonEncodeOptions()->value());
+        self::assertSame($format->jsonEncodeOptions()->toInt(), $json->format()->jsonEncodeOptions()->toInt());
         self::assertSame($format->indent()->toString(), $json->format()->indent()->toString());
         self::assertSame($format->newLine()->toString(), $json->format()->newLine()->toString());
         self::assertSame($format->hasFinalNewLine(), $json->format()->hasFinalNewLine());