8000 Merge branch '5.4' into 6.2 · symfony/css-selector@61444c8 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 61444c8

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s [Intl] fix test [Intl] Use VarExporter::export() in PhpBundleWriter Use triggering class to generate baseline for deprecation messages from DebugClassLoader [Security] Fix false-string handling in RememberMeAuthenticator [CssSelector] Tests on Xpath translator will always pass [Serializer] Fix Normalizer not utilizing converted name for index variadic param [DepdencyInjection] Fix costly logic when checking errored definitions fix children cond [DoctrineBridge] Load refreshed user proxy [DependencyInjection] Don't ignore attributes on the actual decorator [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs
2 parents aedf3cb + 0ad3f7e commit 61444c8

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

‎Tests/XPath/Fixtures/ids.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,8 @@
4545
</div>
4646
<div id="foobar-div" foobar="ab bc
4747
cde"><span id="foobar-span"></span></div>
48-
</body></html>
48+
<section>
49+
<span id="no-siblings-of-any-type"></span>
50+
</section>
51+
</body>
52+
</html>

‎Tests/XPath/TranslatorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function testHtmlIds($css, array $elementsId)
114114
$document->loadHTMLFile(__DIR__.'/Fixtures/ids.html');
115115
$document = simplexml_import_dom($document);
116116
$elements = $document->xpath($translator->cssToXPath($css));
117-
$this->assertCount(\count($elementsId), $elementsId);
117+
$this->assertCount(\count($elementsId), $elements);
118118
foreach ($elements as $element) {
119119
if (null !== $element->attributes()->id) {
120120
$this->assertContains((string) $element->attributes()->id, $elementsId);
@@ -302,14 +302,14 @@ public static function getHtmlIdsTestData()
302302
['li:nth-last-child(-n+1)', ['seventh-li']],
303303
['li:nth-last-child(-n+3)', ['fifth-li', 'sixth-li', 'seventh-li']],
304304
['ol:first-of-type', ['first-ol']],
305-
['ol:nth-child(1)', ['first-ol']],
305+
['ol:nth-child(4)', ['first-ol']],
306306
['ol:nth-of-type(2)', ['second-ol']],
307307
['ol:nth-last-of-type(1)', ['second-ol']],
308-
['span:only-child', ['foobar-span']],
308+
['span:only-child', ['foobar-span', 'no-siblings-of-any-type']],
309309
['li div:only-child', ['li-div']],
310310
['div *:only-child', ['li-div', 'foobar-span']],
311311
['p:only-of-type', ['paragraph']],
312-
[':only-of-type', ['html', 'li-div', 'foobar-span', 'paragraph']],
312+
[':only-of-type', ['html', 'li-div', 'foobar-span', 'no-siblings-of-any-type']],
313313
['div#foobar-div :only-of-type', ['foobar-span']],
314314
['a:empty', ['name-anchor']],
315315
['a:EMpty', ['name-anchor']],
@@ -318,8 +318,8 @@ public static function getHtmlIdsTestData()
318318
['html:root', ['html']],
319319
['li:root', []],
320320
['* :root', []],
321-
['*:contains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
322-
[':CONtains("link")', ['html', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
321+
['*:contains("link")', ['html', 'nil', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
322+
[':CONtains("link")', ['html', 'nil', 'outer-div', 'tag-anchor', 'nofollow-anchor']],
323323
['*:contains("LInk")', []], // case sensitive
324324
['*:contains("e")', ['html', 'nil', 'outer-div', 'first-ol', 'first-li', 'paragraph', 'p-em']],
325325
['*:contains("E")', []], // case-sensitive

0 commit comments

Comments
 (0)
0