Merge pull request #207 from alexander-schranz/enhancement/php-8-1-issues

dbu · web-flow · commit cf8bb4dff9ed · 2022-05-02T14:10:48.000+02:00
Fix some php 8.1 issues
diff --git a/src/PHPCR/Util/CND/Scanner/TokenQueue.php b/src/PHPCR/Util/CND/Scanner/TokenQueue.php
@@ -65,6 +65,7 @@ public function next()
         return next($this->tokens);
     }
 
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->tokens);
diff --git a/src/PHPCR/Util/NodeHelper.php b/src/PHPCR/Util/NodeHelper.php
@@ -53,7 +53,7 @@ public static function createPath(SessionInterface $session, $path)
     {
         $current = $session->getRootNode();
 
-        $segments = preg_split('#/#', $path, null, PREG_SPLIT_NO_EMPTY);
+        $segments = preg_split('#/#', $path, -1, PREG_SPLIT_NO_EMPTY);
         foreach ($segments as $segment) {
             if ($current->hasNode($segment)) {
                 $current = $current->getNode($segment);

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public function next()`
`65`	`65`	`return next($this->tokens);`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ #[\ReturnTypeWillChange]`
`68`	`69`	`public function getIterator()`
`69`	`70`	`{`
`70`	`71`	`return new \ArrayIterator($this->tokens);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static function createPath(SessionInterface $session, $path)`
`53`	`53`	`{`
`54`	`54`	`$current = $session->getRootNode();`
`55`	`55`
`56`		`- $segments = preg_split('#/#', $path, null, PREG_SPLIT_NO_EMPTY);`
	`56`	`+ $segments = preg_split('#/#', $path, -1, PREG_SPLIT_NO_EMPTY);`
`57`	`57`	`foreach ($segments as $segment) {`
`58`	`58`	`if ($current->hasNode($segment)) {`
`59`	`59`	`$current = $current->getNode($segment);`