Merge pull request #213 from phpcr/fix-cnd-parser-eof

dbu · web-flow · commit f0708262e90f · 2023-02-20T17:14:44.000+01:00
fix eof detection for PHP 7+
diff --git a/src/PHPCR/Util/CND/Reader/BufferReader.php b/src/PHPCR/Util/CND/Reader/BufferReader.php
@@ -114,8 +114,9 @@ public function currentChar()
      */
     public function isEof()
     {
-        return $this->currentChar() === $this->getEofMarker()
-            || $this->currentChar() === false
+        $currentChar = $this->currentChar();
+        // substr after end of string returned false in PHP 5 and returns '' since PHP 7
+        return in_array($currentChar, [$this->getEofMarker(), false, ''], true)
             || $this->startPos > strlen($this->buffer)
             || $this->forwardPos > strlen($this->buffer);
     }

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,9 @@ public function currentChar()`
`114`	`114`	`*/`
`115`	`115`	`public function isEof()`
`116`	`116`	`{`
`117`		`- return $this->currentChar() === $this->getEofMarker()`
`118`		`- \|\| $this->currentChar() === false`
	`117`	`+ $currentChar = $this->currentChar();`
	`118`	`+ // substr after end of string returned false in PHP 5 and returns '' since PHP 7`
	`119`	`+ return in_array($currentChar, [$this->getEofMarker(), false, ''], true)`
`119`	`120`	`\|\| $this->startPos > strlen($this->buffer)`
`120`	`121`	`\|\| $this->forwardPos > strlen($this->buffer);`
`121`	`122`	`}`