Run phpcbf, sync changes with phan

And update tests

Author: TysonAndre

src/TolerantASTConverter/Bootstrap.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 // Listen for all errors
 error_reporting(E_ALL);

src/TolerantASTConverter/Cache.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TolerantASTConverter;
 
@@ -22,5 +24,5 @@ public function getIfExists(string $key);
      * @param T $value
      * @return bool true if successfully saved
      */
-    public function save(string $key, $value) : bool;
+    public function save(string $key, $value): bool;
 }

src/TolerantASTConverter/InvalidNodeException.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TolerantASTConverter;
 

src/TolerantASTConverter/NodeDumper.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TolerantASTConverter;
 
@@ -60,15 +62,15 @@ public function __construct(string $file_contents, bool $include_offset = false,
     /**
      * Should this include the byte offset in the file where the node occurred?
      */
-    public function setIncludeOffset(bool $include_offset) : void
+    public function setIncludeOffset(bool $include_offset): void
     {
         $this->include_offset = $include_offset;
     }
 
     /**
      * Should this include the token kind (default is just the text of the token)
      */
-    public function setIncludeTokenKind(bool $include_token_kind) : void
+    public function setIncludeTokenKind(bool $include_token_kind): void
     {
         $this->include_token_kind = $include_token_kind;
     }
@@ -77,7 +79,7 @@ public function setIncludeTokenKind(bool $include_token_kind) : void
      * Sets the text used for indentation (e.g. 4 spaces)
      * @suppress PhanUnreferencedPublicMethod
      */
-    public function setIndent(string $indent) : void
+    public function setIndent(string $indent): void
     {
         $this->indent = $indent;
     }
@@ -86,7 +88,7 @@ public function setIndent(string $indent) : void
      * Converts the class name of $ast_node to a short string describing that class name.
      * Removes the common `Microsoft\\PhpParser\\` prefix
      */
-    public static function dumpClassName(Node $ast_node) : string
+    public static function dumpClassName(Node $ast_node): string
     {
         $name = get_class($ast_node);
         if (\stripos($name, 'Microsoft\\PhpParser\\') === 0) {
@@ -100,7 +102,7 @@ public static function dumpClassName(Node $ast_node) : string
      * Converts the class name of $token to a short string describing that class name.
      * Removes the common `Microsoft\\PhpParser\\` prefix
      */
-    public static function dumpTokenClassName(Token $token) : string
+    public static function dumpTokenClassName(Token $token): string
     {
         $name = get_class($token);
         if (\stripos($name, 'Microsoft\\PhpParser\\') === 0) {
@@ -115,7 +117,7 @@ public static function dumpTokenClassName(Token $token) : string
      * @param string $padding (to be echoed before the current node
      * @throws Exception for invalid $ast_node values
      */
-    public function dumpTreeAsString($ast_node, string $key = '', string $padding = '') : string
+    public function dumpTreeAsString($ast_node, string $key = '', string $padding = ''): string
     {
         if ($ast_node instanceof Node) {
             $first_part = \sprintf(
@@ -156,7 +158,7 @@ public function dumpTreeAsString($ast_node, string $key = '', string $padding =
      * @throws Exception for invalid $ast_node values
      * @suppress PhanUnreferencedPublicMethod
      */
-    public function dumpTree($ast_node, string $key = '', string $padding = '') : void
+    public function dumpTree($ast_node, string $key = '', string $padding = ''): void
     {
         echo $this->dumpTreeAsString($ast_node, $key, $padding);
     }

src/TolerantASTConverter/ParseResult.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TolerantASTConverter;
 

src/TolerantASTConverter/StringUtil.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace TolerantASTConverter;
 
@@ -73,7 +75,7 @@ final class StringUtil
      *
      * @return string The parsed string
      */
-    public static function parse(string $str) : string
+    public static function parse(string $str): string
     {
         $c = $str[0];
         if ($c === '<') {
@@ -103,7 +105,7 @@ public static function parse(string $str) : string
      * Converts a fragment of raw (possibly indented)
      * heredoc to the string that the PHP interpreter would treat it as.
      */
-    public static function parseHeredoc(string $str) : string
+    public static function parseHeredoc(string $str): string
     {
         // TODO: handle dos newlines
         // TODO: Parse escape sequences
@@ -135,7 +137,7 @@ public static function parseHeredoc(string $str) : string
      * @return string String with escape sequences parsed
      * @throws InvalidNodeException for invalid code points
      */
-    public static function parseEscapeSequences($str, ?string $quote) : string
+    public static function parseEscapeSequences($str, ?string $quote): string
     {
         if (!is_string($str)) {
             // Invalid AST input; give up
@@ -150,7 +152,7 @@ public static function parseEscapeSequences($str, ?string $quote) : string
             /**
              * @param list<string> $matches
              */
-            static function (array $matches) : string {
+            static function (array $matches): string {
                 $str = $matches[1];
 
                 if (isset(self::REPLACEMENTS[$str])) {
@@ -179,7 +181,7 @@ static function (array $matches) : string {
      *
      * @throws InvalidNodeException for invalid code points
      */
-    private static function codePointToUtf8(int $num) : string
+    private static function codePointToUtf8(int $num): string
     {
         if ($num <= 0x7F) {
             return chr($num);
@@ -202,7 +204,7 @@ private static function codePointToUtf8(int $num) : string
      * @param string|int|float|bool|null|array|object $value
      * Source: Phan\Library\StringUtil
      */
-    public static function jsonEncode($value) : string
+    public static function jsonEncode($value): string
     {
         $result = \json_encode($value, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE | \JSON_PARTIAL_OUTPUT_ON_ERROR);
         return \is_string($result) ? $result : '(invalid data)';