Merge pull request #64 from GravityPDF/php-8.5

PHP 8.5 support

Author: jakejackson1

.github/workflows/coding-standard.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/lock.yml

@@ -11,10 +11,10 @@ jobs:
     name: 🔒 Lock closed issues and PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"
           issue-lock-reason: ""
           pr-inactive-days: "1"
-          pr-lock-reason: ""
+          pr-lock-reason: ""

.github/workflows/unit-testing.yml

@@ -7,15 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         include:
           - php: '8.3'
             report: true
 
     name: PHP ${{ matrix.php-versions }} PHPUnit Test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -24,7 +24,7 @@ jobs:
           ini-values: error_reporting=E_ALL
 
       - name: Install Composer Dependencies
-        uses: ramsey/composer-install@v3
+        uses: ramsey/composer-install@v4
 
       - name: Log debug information
         run: |
@@ -41,7 +41,7 @@ jobs:
 
       - name: Check Code Coverage
         if: ${{ matrix.report }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           directory: ./coverage/
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "gravitypdf/querypath",
   "type": "library",
-  "description": "PHP library for HTML(5)/XML querying (CSS 4 or XPath) and processing (like jQuery) with PHP8.3 support",
+  "description": "PHP library for HTML(5)/XML querying (CSS 4 or XPath) and processing (like jQuery) with PHP 7.0 to 8.5 support",
   "homepage": "https://github.com/gravitypdf/querypath",
   "license": "MIT",
   "keywords": [
@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "^7.1 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
     "masterminds/html5": "^2.0"
   },
   "autoload": {
@@ -55,4 +55,4 @@
     "arthurkushman/query-path": "3.1.4",
     "querypath/querypath": "3.0.5"
   }
-}
+}

src/CSS/DOMTraverser.php

@@ -104,7 +104,7 @@ public function __construct(SplObjectStorage $splos, bool $initialized = false,
 		/*
 		$this->dom = $dom;
 		$this->matches = new \SplObjectStorage();
-		$this->matches->attach($this->dom);
+		$this->matches->offsetSet($this->dom);
 		 */
 	}
 
@@ -149,7 +149,7 @@ public function find($selector): DOMTraverser
 				// fprintf(STDOUT, "Testing %s against %s.\n", $candidate->tagName, $selectorGroup[0]);
 				if ($this->matchesSelector($candidate, $selectorGroup)) {
 					// $this->debug('Attaching ' . $candidate->nodeName);
-					$found->attach($candidate);
+					$found->offsetSet($candidate);
 				}
 			}
 		}
@@ -477,7 +477,7 @@ protected function initialMatchOnID(SimpleSelector $selector, SplObjectStorage $
 		/** @var DOMElement $node */
 		foreach ($matches as $node) {
 			if ($node->getAttribute('id') === $id) {
-				$found->attach($node);
+				$found->offsetSet($node);
 			}
 
 			$nl = $this->initialXpathQuery($xpath, $node, $baseQuery);
@@ -524,7 +524,7 @@ protected function initialMatchOnClasses(SimpleSelector $selector, SplObjectStor
 			if ($node->hasAttribute('class')) {
 				$intersect = array_intersect($selector->classes, explode(' ', $node->getAttribute('class')));
 				if (count($intersect) === count($selector->classes)) {
-					$found->attach($node);
+					$found->offsetSet($node);
 				}
 			}
 
@@ -536,7 +536,7 @@ protected function initialMatchOnClasses(SimpleSelector $selector, SplObjectStor
 
 				$intersect = array_intersect($selector->classes, $classArray);
 				if (count($intersect) === count($selector->classes)) {
-					$found->attach($subNode);
+					$found->offsetSet($subNode);
 				}
 			}
 		}
@@ -590,7 +590,7 @@ protected function initialMatchOnElement(SimpleSelector $selector, SplObjectStor
 			// Capture the case where the initial element is the root element.
 			if ($node->tagName === $element
 				|| ($element === '*' && $node->parentNode instanceof DOMDocument)) {
-				$found->attach($node);
+				$found->offsetSet($node);
 			}
 			$nl = $node->getElementsByTagName($element);
 			if (! empty($nl) && $nl instanceof DOMNodeList) {
@@ -634,7 +634,7 @@ protected function initialMatchOnElementNS(SimpleSelector $selector, SplObjectSt
 			}
 		}
 		foreach ($detach as $rem) {
-			$elements->detach($rem);
+			$elements->offsetUnset($rem);
 		}
 		$selector->ns = null;
 
@@ -888,7 +888,7 @@ protected function setMatches($matches)
 	public function attachNodeList(DOMNodeList $nodeList, SplObjectStorage $splos)
 	{
 		foreach ($nodeList as $item) {
-			$splos->attach($item);
+			$splos->offsetSet($item);
 		}
 	}
 

src/CSS/DOMTraverser/PseudoClass.php

@@ -79,7 +79,7 @@ public function elementMatches($pseudoclass, $node, $scope, $value = null)
 				return false;
 			case 'indeterminate':
 				// Because sometimes screwing with people is fun.
-				return (boolean) mt_rand(0, 1);
+				return (bool) mt_rand(0, 1);
 			case 'lang':
 				// No value = exception.
 				if (! isset($value)) {
@@ -354,7 +354,7 @@ protected function containsExactly($node, $value): bool
 	protected function has($node, $selector): bool
 	{
 		$splos = new SPLObjectStorage();
-		$splos->attach($node);
+		$splos->offsetSet($node);
 		$traverser = new DOMTraverser($splos, true);
 		$results   = $traverser->find($selector)->matches();