Lexer file structure changed and unnecessary exceptions removed

Author: remorhaz

src/Parser/Lexer/Scanner/LengthException.php src/Parser/Lexer/LengthException.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Remorhaz\JSONPointer\Parser\Lexer\Scanner;
+namespace Remorhaz\JSONPointer\Parser\Lexer;
 
 /**
- * SPL LengthException of lexical analyzer's text scanner.
+ * SPL LengthException of lexical analyzer.
  *
  * @see \LengthException
  * @package JSONPointer

src/Parser/Lexer/Lexer.php

@@ -82,7 +82,7 @@ public function readToken()
                 $token = $this
                     ->getScanner()
                     ->readToken();
-            } catch (Scanner\UnknownSyntaxException $e) {
+            } catch (UnknownSyntaxException $e) {
                 throw new UnknownSyntaxException(
                     "Unknown syntax error near position #{$this->getNextPosition()}",
                     $this->getNextPosition(),

src/Parser/Lexer/LogicException.php

@@ -3,7 +3,7 @@
 namespace Remorhaz\JSONPointer\Parser\Lexer;
 
 /**
- * SPL LogicException of lexical analyzer's token buffer.
+ * SPL LogicException of lexical analyzer.
  *
  * @see \LogicException
  * @package JSONPointer

src/Parser/Lexer/RegExpException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Remorhaz\JSONPointer\Parser\Lexer;
+
+/**
+ * Is thrown by lexical analyzer on PREG errors after matching
+ * regular expressions.
+ * 
+ * @package JSONPointer
+ */
+class RegExpException extends RuntimeException
+{
+}

src/Parser/Lexer/Scanner.php

@@ -59,12 +59,11 @@ public static function factory()
      * Returns source text.
      *
      * @return string
-     * @throws Scanner\RuntimeException
      */
     public function getText()
     {
         if (null === $this->text) {
-            throw new Scanner\RuntimeException("Text is not set");
+            throw new RuntimeException("Text is not set");
         }
         return $this->text;
     }
@@ -75,13 +74,12 @@ public function getText()
      *
      * @param string $text
      * @return $this
-     * @throws Scanner\RegExpException
      */
     public function setText($text)
     {
         PregHelper::assertValidUTF8(
             $text,
-            Scanner\RegExpException::class,
+            RegExpException::class,
             "Regular expression error on checking source text"
         );
         $this->text = (string) $text;
@@ -106,7 +104,6 @@ public function isEnd()
      * Reads next token from text.
      *
      * @return Token
-     * @throws Scanner/UnknownSyntaxException
      */
     public function readToken()
     {
@@ -125,7 +122,7 @@ public function readToken()
             $token = $this->matchNextToken($errorTypeList);
         }
         if (null === $token) {
-            throw new Scanner\UnknownSyntaxException("Unknown syntax error in source text");
+            throw new UnknownSyntaxException("Unknown syntax error in source text");
         }
         return $token;
     }
@@ -164,20 +161,18 @@ protected function matchNextToken(array $typeList)
      *
      * @param int $byteCount
      * @return $this
-     * @throws Scanner\LogicException
-     * @throws Scanner\DomainException
      */
     protected function advanceCursor($byteCount)
     {
         if (0 >= $byteCount) {
-            throw new Scanner\DomainException("Byte count to advance cursor must be positive");
+            throw new DomainException("Byte count to advance cursor must be positive");
         }
         if ($this->isEnd()) {
-            throw new Scanner\LogicException("Cursor is at the end of text and cannot be advanced");
+            throw new LogicException("Cursor is at the end of text and cannot be advanced");
         }
         $maxByteCount = strlen($this->getText()) - $this->cursor;
         if ($byteCount > $maxByteCount) {
-            throw new Scanner\LogicException("Cursor cannot be advanced beyond the end of text");
+            throw new LogicException("Cursor cannot be advanced beyond the end of text");
         }
         $this->cursor += $byteCount;
         $this->textAtCursor = null;
@@ -190,7 +185,7 @@ protected function getTextLength($text)
         $length = preg_match_all('#.#us', $text);
         PregHelper::assertMatchResult(
             $length,
-            Scanner\RegExpException::class,
+            RegExpException::class,
             "Regular expression error on getting token length"
         );
         return $length;
@@ -202,7 +197,6 @@ protected function getTextLength($text)
      *
      * @param int $type
      * @return string
-     * @throws Scanner\DomainException
      */
     protected function getTokenPattern($type)
     {
@@ -213,7 +207,7 @@ protected function getTokenPattern($type)
             Token::TYPE_ERROR_INVALID_ESCAPE => '~',
         ];
         if (!isset($patternMap[$type])) {
-            throw new Scanner\DomainException("Unknown token type: {$type}");
+            throw new DomainException("Unknown token type: {$type}");
         }
         $pattern = $patternMap[$type];
         return "#{$pattern}#uA";
@@ -224,15 +218,14 @@ protected function getTokenPattern($type)
      * Returns part of source string that starts at current cursor position.
      *
      * @return string
-     * @throws Scanner\LengthException
      * @todo Limit substring size with maximal token length (without breaking UTF-8).
      */
     protected function getTextAtCursor()
     {
         if (null === $this->textAtCursor) {
             $textAtCursor = substr($this->getText(), $this->cursor);
             if (strlen($textAtCursor) == 0) {
-                throw new Scanner\LengthException("No more text to match tokens");
+                throw new LengthException("No more text to match tokens");
             }
             $this->textAtCursor = $textAtCursor;
         }
@@ -245,21 +238,19 @@ protected function getTextAtCursor()
      *
      * @param int $type
      * @return string|null Token text or NULL.
-     * @throws Scanner\LengthException
-     * @throws Scanner\RegExpException
      */
     protected function matchTokenTextAtCursor($type)
     {
         $result = preg_match($this->getTokenPattern($type), $this->getTextAtCursor(), $matches);
         PregHelper::assertMatchResult(
             $result,
-            Scanner\RegExpException::class,
+            RegExpException::class,
             "Failed to match token text due to regular expression error"
         );
         if (1 === $result) {
             $text = $matches[0];
             if (strlen($text) == 0) {
-                throw new Scanner\LengthException("Matched token text is empty");
+                throw new LengthException("Matched token text is empty");
             }
         } else {
             $text = null;
@@ -275,7 +266,7 @@ protected function unescape($escapedText)
             '~1' => '/',
         ];
         if (!isset($unescapeMap[$escapedText])) {
-            throw new Scanner\DomainException("Unknown escape sequence: {$escapedText}");
+            throw new DomainException("Unknown escape sequence: {$escapedText}");
         }
         return $unescapeMap[$escapedText];
     }

src/Parser/Lexer/Scanner/DomainException.php

@@ -112,7 +112,7 @@ public function providerInvalidText()
 
 
     /**
-     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\Scanner\Exception
+     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\Exception
      */
     public function testReadingEmptyTextEndThrowsException()
     {

src/Parser/Lexer/Scanner/Exception.php

@@ -11,7 +11,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
 
 
     /**
-     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\Scanner\Exception
+     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\Exception
      */
     public function testUninitializedTextAccessThrowsException()
     {
@@ -72,7 +72,7 @@ public function testIsNotEndAfterSettingNonEmptyText()
     /**
      * @param string $text
      * @dataProvider providerBrokenUnicodeText
-     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\Scanner\RegExpException
+     * @expectedException \Remorhaz\JSONPointer\Parser\Lexer\RegExpException
      * @expectedExceptionCode PREG_BAD_UTF8_ERROR
      * @expectedExceptionMessage PREG_BAD_UTF8_ERROR
      */