Update internal codebase

bakame-php · Sep 25, 2023 · ea07f8a · ea07f8a
1 parent 9261f4f
commit ea07f8a
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/Parser.php b/src/Parser.php
@@ -21,7 +21,10 @@
 use function array_combine;
 use function array_fill;
 use function array_filter;
+use function array_key_exists;
+use function array_merge;
 use function array_pad;
+use function array_shift;
 use function array_slice;
 use function array_unique;
 use function count;
@@ -309,7 +312,7 @@ public function withoutFormatter(): self
      * @throws ParserError
      * @throws SyntaxError
      */
-    public function parseFile($filenameOrStream, $filenameContext = null): TabularDataReader
+    public function parseFile(mixed $filenameOrStream, $filenameContext = null): TabularDataReader
     {
         if (is_resource($filenameOrStream)) {
             return $this->parseHTML($this->streamToString($filenameOrStream));
@@ -332,23 +335,6 @@ public function parseFile($filenameOrStream, $filenameContext = null): TabularDa
         return $this->parseHTML($html);
     }
 
-    /**
-     * @param resource $stream
-     *
-     * @throws ParserError
-     */
-    private function streamToString($stream): string
-    {
-        set_error_handler(fn (int $errno, string $errstr, string $errfile, int $errline) => true);
-        $html = stream_get_contents($stream);
-        restore_error_handler();
-
-        return match (false) {
-            $html => throw new ParserError('The resource could not be read.'),
-            default => $html,
-        };
-    }
-
     /**
      * @throws ParserError
      * @throws SyntaxError
@@ -372,6 +358,23 @@ public function parseHTML(DOMDocument|DOMElement|SimpleXMLElement|Stringable|str
         return new ResultSet($this->extractTableContents($xpath, $header), $header);
     }
 
+    /**
+     * @param resource $stream
+     *
+     * @throws ParserError
+     */
+    private function streamToString($stream): string
+    {
+        set_error_handler(fn (int $errno, string $errstr, string $errfile, int $errline) => true);
+        $html = stream_get_contents($stream);
+        restore_error_handler();
+
+        return match (false) {
+            $html => throw new ParserError('The resource could not be read.'),
+            default => $html,
+        };
+    }
+
     /**
      * @throws ParserError
      */