Skip to content

Commit 24f212b

Browse files
committed
Replace laminas/dom with symfony/dom-crawler
1 parent 590e375 commit 24f212b

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
},
1717
"require": {
1818
"php": "^5.6 || ^7.0 || ^8.0",
19-
"laminas/laminas-dom": "~2.7.2 || ^2.8"
19+
"symfony/css-selector": "^3.4|^4.4|^5.4|^6.0",
20+
"symfony/dom-crawler": "^3.4|^4.4|^5.4|^6.0"
2021
},
2122
"require-dev": {
2223
"symfony/phpunit-bridge": "^5.2 || ^6.2"

src/MarkupAssertionsTrait.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
namespace SteveGrunwell\PHPUnit_Markup_Assertions;
1010

11-
use DOMDocument;
12-
use Laminas\Dom\Document;
13-
use Laminas\Dom\Document\Query;
1411
use PHPUnit\Framework\RiskyTestError;
12+
use Symfony\Component\DomCrawler\Crawler;
1513

1614
trait MarkupAssertionsTrait
1715
{
@@ -220,15 +218,13 @@ public function assertElementNotRegExp($regexp, $selector = '', $markup = '', $m
220218
* @param string $markup The HTML for the DOMDocument.
221219
* @param string $query The DOM selector query.
222220
*
223-
* @return \Laminas\Dom\Document\NodeList
221+
* @return Crawler
224222
*/
225223
protected function executeDomQuery($markup, $query)
226224
{
227-
return Query::execute(
228-
$query,
229-
new Document('<?xml encoding="UTF-8">' . $markup, Document::DOC_HTML, 'UTF-8'),
230-
Query::TYPE_CSS
231-
);
225+
$dom = new Crawler($markup);
226+
227+
return $dom->filter($query);
232228
}
233229

234230
/**
@@ -277,7 +273,7 @@ protected function getInnerHtmlOfMatchedElements($markup, $query)
277273

278274
// Loop through results and collect their innerHTML values.
279275
foreach ($results as $result) {
280-
$document = new DOMDocument();
276+
$document = new \DOMDocument();
281277
$document->appendChild($document->importNode($result->firstChild, true));
282278

283279
$contents[] = trim(html_entity_decode($document->saveHTML()));

0 commit comments

Comments
 (0)