Merge branch 'main' into cleanup/hungarian-result

Author: JakeQZ

CHANGELOG.md

@@ -26,7 +26,7 @@ Please also have a look at our
 - Only allow `string` for some `OutputFormat` properties (#885)
 - Make all non-private properties `@internal` (#886)
 - Use more native type declarations and strict mode
-  (#641, #772, #774, #778, #804, #841, #873, #875, #891)
+  (#641, #772, #774, #778, #804, #841, #873, #875, #891, #922)
 - Add visibility to all class/interface constants (#469)
 
 ### Deprecated

src/Parsing/OutputException.php

@@ -10,10 +10,9 @@
 final class OutputException extends SourceException
 {
     /**
-     * @param string $sMessage
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sMessage, $lineNumber = 0)
+    public function __construct(string $sMessage, int $lineNumber = 0)
     {
         parent::__construct($sMessage, $lineNumber);
     }

src/Parsing/ParserState.php

@@ -146,7 +146,7 @@ public function parseIdentifier($bIgnoreCase = true)
         }
         $result = $this->parseCharacter(true);
         if ($result === null) {
-            throw new UnexpectedTokenException($result, $this->peek(5), 'identifier', $this->lineNumber);
+            throw new UnexpectedTokenException('', $this->peek(5), 'identifier', $this->lineNumber);
         }
         $sCharacter = null;
         while (!$this->isEnd() && ($sCharacter = $this->parseCharacter(true)) !== null) {
@@ -294,14 +294,19 @@ public function consume($mValue = 1): string
             $iLineCount = \substr_count($mValue, "\n");
             $iLength = $this->strlen($mValue);
             if (!$this->streql($this->substr($this->iCurrentPosition, $iLength), $mValue)) {
-                throw new UnexpectedTokenException($mValue, $this->peek(\max($iLength, 5)), $this->lineNumber);
+                throw new UnexpectedTokenException(
+                    $mValue,
+                    $this->peek(\max($iLength, 5)),
+                    'literal',
+                    $this->lineNumber
+                );
             }
             $this->lineNumber += $iLineCount;
             $this->iCurrentPosition += $this->strlen($mValue);
             return $mValue;
         } else {
             if ($this->iCurrentPosition + $mValue > $this->iLength) {
-                throw new UnexpectedEOFException($mValue, $this->peek(5), 'count', $this->lineNumber);
+                throw new UnexpectedEOFException((string) $mValue, $this->peek(5), 'count', $this->lineNumber);
             }
             $result = $this->substr($this->iCurrentPosition, $mValue);
             $iLineCount = \substr_count($result, "\n");

src/Parsing/SourceException.php

@@ -7,15 +7,14 @@
 class SourceException extends \Exception
 {
     /**
-     * @var int
+     * @var int<0, max>
      */
     private $lineNumber;
 
     /**
-     * @param string $sMessage
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sMessage, $lineNumber = 0)
+    public function __construct(string $sMessage, int $lineNumber = 0)
     {
         $this->lineNumber = $lineNumber;
         if ($lineNumber !== 0) {

src/Parsing/UnexpectedTokenException.php

@@ -20,19 +20,15 @@ class UnexpectedTokenException extends SourceException
     private $sFound;
 
     /**
-     * Possible values: literal, identifier, count, expression, search
-     *
-     * @var string
+     * @var 'literal'|'identifier'|'count'|'expression'|'search'|'custom'
      */
     private $sMatchType;
 
     /**
-     * @param string $sExpected
-     * @param string $sFound
-     * @param string $sMatchType
+     * @param 'literal'|'identifier'|'count'|'expression'|'search'|'custom' $sMatchType
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sExpected, $sFound, $sMatchType = 'literal', $lineNumber = 0)
+    public function __construct(string $sExpected, string $sFound, string $sMatchType = 'literal', int $lineNumber = 0)
     {
         $this->sExpected = $sExpected;
         $this->sFound = $sFound;