Fix: Run 'make cs'

ergebnis · Jun 2, 2018 · f770ba2 · f770ba2
1 parent 25519bd
commit f770ba2
Show file tree

Hide file tree

Showing 26 changed files with 95 additions and 50 deletions.
diff --git a/src/AutoFormatNormalizer.php b/src/AutoFormatNormalizer.php
@@ -42,7 +42,7 @@ public function __construct(
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/CallableNormalizer.php b/src/CallableNormalizer.php
@@ -27,7 +27,7 @@ public function __construct(callable $callable)
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/ChainNormalizer.php b/src/ChainNormalizer.php
@@ -27,7 +27,7 @@ public function __construct(NormalizerInterface ...$normalizers)
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/FinalNewLineNormalizer.php b/src/FinalNewLineNormalizer.php
@@ -17,13 +17,13 @@ final class FinalNewLineNormalizer implements NormalizerInterface
 {
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json
             ));
         }
 
-        return \rtrim($json) . PHP_EOL;
+        return \rtrim($json) . \PHP_EOL;
     }
 }
diff --git a/src/FixedFormatNormalizer.php b/src/FixedFormatNormalizer.php
@@ -42,7 +42,7 @@ public function __construct(
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/Format/Formatter.php b/src/Format/Formatter.php
@@ -31,7 +31,7 @@ public function format(string $json, FormatInterface $format): string
     {
         $decoded = \json_decode($json);
 
-        if (null === $decoded && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === $decoded && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/Format/Sniffer.php b/src/Format/Sniffer.php
@@ -17,7 +17,7 @@ final class Sniffer implements SnifferInterface
 {
     public function sniff(string $json): FormatInterface
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json
@@ -37,11 +37,11 @@ private function jsonEncodeOptions(string $json): int
         $jsonEncodeOptions = 0;
 
         if (false === \strpos($json, '\/')) {
-            $jsonEncodeOptions |= JSON_UNESCAPED_SLASHES;
+            $jsonEncodeOptions |= \JSON_UNESCAPED_SLASHES;
         }
 
         if (1 !== \preg_match('/(\\\\+)u([0-9a-f]{4})/i', $json)) {
-            $jsonEncodeOptions |= JSON_UNESCAPED_UNICODE;
+            $jsonEncodeOptions |= \JSON_UNESCAPED_UNICODE;
         }
 
         return $jsonEncodeOptions;
@@ -62,7 +62,7 @@ private function newLine(string $json): string
             return $match['newLine'];
         }
 
-        return PHP_EOL;
+        return \PHP_EOL;
     }
 
     private function hasFinalNewLine(string $json): bool

diff --git a/src/IndentNormalizer.php b/src/IndentNormalizer.php
@@ -50,7 +50,7 @@ public function __construct(string $indent, PrinterInterface $printer = null)
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/JsonEncodeNormalizer.php b/src/JsonEncodeNormalizer.php
@@ -39,7 +39,7 @@ public function __construct(int $jsonEncodeOptions)
 
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/NoFinalNewLineNormalizer.php b/src/NoFinalNewLineNormalizer.php
@@ -17,7 +17,7 @@ final class NoFinalNewLineNormalizer implements NormalizerInterface
 {
     public function normalize(string $json): string
     {
-        if (null === \json_decode($json) && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === \json_decode($json) && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json

diff --git a/src/SchemaNormalizer.php b/src/SchemaNormalizer.php
@@ -59,7 +59,7 @@ public function normalize(string $json): string
     {
         $decoded = \json_decode($json);
 
-        if (null === $decoded && JSON_ERROR_NONE !== \json_last_error()) {
+        if (null === $decoded && \JSON_ERROR_NONE !== \json_last_error()) {
             throw new \InvalidArgumentException(\sprintf(
                 '"%s" is not valid JSON.',
                 $json
@@ -215,7 +215,7 @@ private function normalizeObject(\stdClass $data, \stdClass $schema): \stdClass
                 $valueSchema
             );
 
-            unset($data->{$name});
+            $data->{$name} = null;
         }
 
         $remainingProperties = \get_object_vars($data);

diff --git a/test/Unit/AbstractNormalizerTestCase.php b/test/Unit/AbstractNormalizerTestCase.php
@@ -17,6 +17,9 @@
 use Localheinz\Test\Util\Helper;
 use PHPUnit\Framework;
 
+/**
+ * @internal
+ */
 abstract class AbstractNormalizerTestCase extends Framework\TestCase
 {
     use Helper;

diff --git a/test/Unit/AutoFormatNormalizerTest.php b/test/Unit/AutoFormatNormalizerTest.php
@@ -18,6 +18,9 @@
 use Localheinz\Json\Normalizer\NormalizerInterface;
 use Prophecy\Argument;
 
+/**
+ * @internal
+ */
 final class AutoFormatNormalizerTest extends AbstractNormalizerTestCase
 {
     public function testNormalizeUsesSnifferToSniffFormatNormalizesAndFormatsUsingSniffedFormat(): void

diff --git a/test/Unit/CallableNormalizerTest.php b/test/Unit/CallableNormalizerTest.php
@@ -15,6 +15,9 @@
 
 use Localheinz\Json\Normalizer\CallableNormalizer;
 
+/**
+ * @internal
+ */
 final class CallableNormalizerTest extends AbstractNormalizerTestCase
 {
     /**

diff --git a/test/Unit/ChainNormalizerTest.php b/test/Unit/ChainNormalizerTest.php
@@ -17,6 +17,9 @@
 use Localheinz\Json\Normalizer\NormalizerInterface;
 use Prophecy\Argument;
 
+/**
+ * @internal
+ */
 final class ChainNormalizerTest extends AbstractNormalizerTestCase
 {
     public function testNormalizePassesJsonThroughNormalizers(): void

diff --git a/test/Unit/FinalNewLineNormalizerTest.php b/test/Unit/FinalNewLineNormalizerTest.php
@@ -15,6 +15,9 @@
 
 use Localheinz\Json\Normalizer\FinalNewLineNormalizer;
 
+/**
+ * @internal
+ */
 final class FinalNewLineNormalizerTest extends AbstractNormalizerTestCase
 {
     /**
@@ -33,7 +36,7 @@ public function testNormalizeEnsuresSingleFinalNewLine(string $whitespace): void
 
         $json .= $whitespace;
 
-        $normalized = \rtrim($json) . PHP_EOL;
+        $normalized = \rtrim($json) . \PHP_EOL;
 
         $normalizer = new FinalNewLineNormalizer();
 
@@ -46,7 +49,7 @@ public function providerWhitespace(): \Generator
             '',
             ' ',
             "\t",
-            PHP_EOL,
+            \PHP_EOL,
         ];
 
         foreach ($values as $value) {

diff --git a/test/Unit/FixedFormatNormalizerTest.php b/test/Unit/FixedFormatNormalizerTest.php
@@ -18,6 +18,9 @@
 use Localheinz\Json\Normalizer\NormalizerInterface;
 use Prophecy\Argument;
 
+/**
+ * @internal
+ */
 final class FixedFormatNormalizerTest extends AbstractNormalizerTestCase
 {
     public function testNormalizeNormalizesAndFormatsUsingFormat(): void
@@ -80,7 +83,7 @@ public function providerFinalNewLine(): \Generator
             ],
             'with-final-new-line' => [
                 true,
-                PHP_EOL,
+                \PHP_EOL,
             ],
         ];
 

diff --git a/test/Unit/Format/FormatTest.php b/test/Unit/Format/FormatTest.php
@@ -18,6 +18,9 @@
 use Localheinz\Test\Util\Helper;
 use PHPUnit\Framework;
 
+/**
+ * @internal
+ */
 final class FormatTest extends Framework\TestCase
 {
     use Helper;
@@ -31,7 +34,7 @@ public function testConstructorRejectsInvalidEncodeOptions(): void
     {
         $jsonEncodeOptions = -1;
         $indent = '  ';
-        $newLine = PHP_EOL;
+        $newLine = \PHP_EOL;
         $hasFinalNewLine = true;
 
         $this->expectException(\InvalidArgumentException::class);
@@ -56,7 +59,7 @@ public function testConstructorRejectsInvalidEncodeOptions(): void
     public function testConstructorRejectsInvalidIndent(string $indent): void
     {
         $jsonEncodeOptions = 0;
-        $newLine = PHP_EOL;
+        $newLine = \PHP_EOL;
         $hasFinalNewLine = true;
 
         $this->expectException(\InvalidArgumentException::class);
@@ -141,7 +144,7 @@ public function providerInvalidNewLine(): \Generator
      */
     public function testConstructorSetsValues(string $indent, string $newLine, bool $hasFinalNewLine): void
     {
-        $jsonEncodeOptions = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
+        $jsonEncodeOptions = \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES;
 
         $format = new Format(
             $jsonEncodeOptions,
@@ -176,9 +179,9 @@ public function testWithJsonEncodeOptionsRejectsInvalidJsonEncodeOptions(): void
         $jsonEncodeOptions = -1;
 
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -194,9 +197,9 @@ public function testWithJsonEncodeOptionsRejectsInvalidJsonEncodeOptions(): void
     public function testWithJsonEncodeOptionsClonesFormatAndSetsJsonEncodeOptions(): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -217,9 +220,9 @@ public function testWithJsonEncodeOptionsClonesFormatAndSetsJsonEncodeOptions():
     public function testWithIndentRejectsInvalidIndent(string $indent): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -240,9 +243,9 @@ public function testWithIndentRejectsInvalidIndent(string $indent): void
     public function testWithIndentClonesFormatAndSetsIndent(string $indent): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -270,9 +273,9 @@ public function providerIndent(): \Generator
     public function testWithNewLineRejectsInvalidNewLine(string $newLine): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -293,9 +296,9 @@ public function testWithNewLineRejectsInvalidNewLine(string $newLine): void
     public function testWithNewLineClonesFormatAndSetsNewLine(string $newLine): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             true
         );
 
@@ -323,9 +326,9 @@ public function providerNewLine(): \Generator
     public function testWithHasFinalNewLineClonesFormatAndSetsFinalNewLine(bool $hasFinalNewLine): void
     {
         $format = new Format(
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+            \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES,
             '    ',
-            PHP_EOL,
+            \PHP_EOL,
             false
         );
 

diff --git a/test/Unit/Format/FormatterTest.php b/test/Unit/Format/FormatterTest.php
@@ -21,6 +21,9 @@
 use PHPUnit\Framework;
 use Prophecy\Argument;
 
+/**
+ * @internal
+ */
 final class FormatterTest extends Framework\TestCase
 {
     use Helper;
@@ -138,7 +141,7 @@ public function providerFinalNewLine(): \Generator
             ],
             'with-final-new-line' => [
                 true,
-                PHP_EOL,
+                \PHP_EOL,
             ],
         ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,9 @@ @@
     use Localheinz\Json\Normalizer\CallableNormalizer;
+    /**
+     * @internal
+     */
     final class CallableNormalizerTest extends AbstractNormalizerTestCase
     {
         /**
@@ Expand Down @@