Fix style

cerbero90 · Jun 22, 2023 · cbb672d · cbb672d
1 parent 47a419a
commit cbb672d
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 19 deletions.
diff --git a/src/Concerns/DetectsEndpoints.php b/src/Concerns/DetectsEndpoints.php
@@ -2,8 +2,8 @@
 
 namespace Cerbero\JsonParser\Concerns;
 
-use function is_array;
 use function in_array;
+use function is_array;
 
 /**
  * The trait to detect endpoints.

diff --git a/src/Concerns/GuzzleAware.php b/src/Concerns/GuzzleAware.php
@@ -4,8 +4,8 @@
 
 use Cerbero\JsonParser\Exceptions\GuzzleRequiredException;
 use GuzzleHttp\Client;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 
 /**

diff --git a/src/Exceptions/IntersectingPointersException.php b/src/Exceptions/IntersectingPointersException.php
@@ -19,6 +19,6 @@ class IntersectingPointersException extends Exception implements JsonParserExcep
      */
     public function __construct(public readonly Pointer $pointer1, public readonly Pointer $pointer2)
     {
-        parent::__construct("The pointers [$pointer1] and [$pointer2] are intersecting");
+        parent::__construct("The pointers [{$pointer1}] and [{$pointer2}] are intersecting");
     }
 }
diff --git a/src/Exceptions/InvalidPointerException.php b/src/Exceptions/InvalidPointerException.php
@@ -17,6 +17,6 @@ final class InvalidPointerException extends Exception implements JsonParserExcep
      */
     public function __construct(public readonly string $pointer)
     {
-        parent::__construct("The string [$pointer] is not a valid JSON pointer");
+        parent::__construct("The string [{$pointer}] is not a valid JSON pointer");
     }
 }
diff --git a/src/Exceptions/NodeNotFoundException.php b/src/Exceptions/NodeNotFoundException.php
@@ -17,6 +17,6 @@ class NodeNotFoundException extends Exception implements JsonParserException
      */
     public function __construct(public mixed $node)
     {
-        parent::__construct("The node [$node] was not found");
+        parent::__construct("The node [{$node}] was not found");
     }
 }
diff --git a/src/Exceptions/SyntaxException.php b/src/Exceptions/SyntaxException.php
@@ -24,7 +24,7 @@ final class SyntaxException extends Exception implements JsonParserException
      */
     public function __construct(public readonly string $value)
     {
-        parent::__construct("Syntax error: unexpected '$value'");
+        parent::__construct("Syntax error: unexpected '{$value}'");
     }
 
     /**

diff --git a/src/Pointers/Pointer.php b/src/Pointers/Pointer.php
@@ -7,9 +7,9 @@
 use Closure;
 use Stringable;
 
+use function array_slice;
 use function count;
 use function is_int;
-use function array_slice;
 
 /**
  * The JSON pointer.
@@ -123,13 +123,9 @@ public function matchesTree(Tree $tree): bool
      */
     public function includesTree(Tree $tree): bool
     {
-<<<<<<< HEAD
         $originalTree = $tree->original();
 
         if ($this->pointer == '' || end($this->referenceTokens) == end($originalTree)) {
-=======
-        if ($this->pointer == '') {
->>>>>>> develop
             return true;
         }
 

diff --git a/src/Sources/IterableSource.php b/src/Sources/IterableSource.php
@@ -4,8 +4,8 @@
 
 use Traversable;
 
-use function is_array;
 use function count;
+use function is_array;
 
 /**
  * The iterable source.

diff --git a/src/Sources/JsonResource.php b/src/Sources/JsonResource.php
@@ -4,8 +4,8 @@
 
 use Traversable;
 
-use function is_string;
 use function is_resource;
+use function is_string;
 
 /**
  * The resource source.

diff --git a/src/Tokens/Lexer.php b/src/Tokens/Lexer.php
@@ -4,9 +4,6 @@
 
 use Cerbero\JsonParser\Exceptions\SyntaxException;
 use Cerbero\JsonParser\Sources\Source;
-use Cerbero\JsonParser\Tokens\Token;
-use Cerbero\JsonParser\Tokens\Tokenizer;
-use Cerbero\JsonParser\Tokens\Tokens;
 use Cerbero\JsonParser\ValueObjects\Progress;
 use IteratorAggregate;
 use Traversable;

diff --git a/src/Tokens/Parser.php b/src/Tokens/Parser.php
@@ -127,7 +127,7 @@ public function current(): mixed
             return null;
         }
 
-        $this->key = $this->decoder->decode($state->tree->currentKey());
+        $this->key = $this->decoder->decode($this->state->tree->currentKey());
         $value = $this->decoder->decode($this->state->value());
 
         if ($value instanceof self) {

diff --git a/src/ValueObjects/Config.php b/src/ValueObjects/Config.php
@@ -2,9 +2,9 @@
 
 namespace Cerbero\JsonParser\ValueObjects;
 
-use Cerbero\JsonParser\Decoders\JsonDecoder;
 use Cerbero\JsonParser\Decoders\DecodedValue;
 use Cerbero\JsonParser\Decoders\Decoder;
+use Cerbero\JsonParser\Decoders\JsonDecoder;
 use Cerbero\JsonParser\Decoders\SimdjsonDecoder;
 use Cerbero\JsonParser\Exceptions\DecodingException;
 use Cerbero\JsonParser\Exceptions\SyntaxException;

diff --git a/src/ValueObjects/Tree.php b/src/ValueObjects/Tree.php
@@ -122,7 +122,7 @@ public function isDeep(): bool
         $pointer = $this->pointers->matching();
 
         return $pointer == '' ? false : $this->depth >= $pointer->depth;
-        return $pointer == '' ? $this->depth > 0 : $this->depth >= $pointer->depth;
+        // return $pointer == '' ? $this->depth > 0 : $this->depth >= $pointer->depth;
     }
 
     /**