bug #49195 [Crawler] Fix regression where cdata nodes will return empty string (NanoSector)

fabpot · fabpot · commit fbb3f058d48e · 2023-08-01T09:43:51.000+02:00
This PR was submitted for the 6.4 branch but it was merged into the 6.3 branch instead. Discussion ---------- [Crawler] Fix regression where cdata nodes will return empty string | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A  Fixes a regression caused by the fix to #48682 where `<script>` tags would return empty string on the innerContent call, where in 6.2 this did work. Attached is a zipped PHPUnit test case used to verify the regression on 6.2 with a screenshot of its result. [CrawlerInnerTextTest.zip](https://github.com/symfony/symfony/files/10567760/CrawlerInnerTextTest.zip) ![image](https://user-images.githubusercontent.com/1280380/216297235-1eda66d3-6768-4e49-9812-2857cff67086.png) Commits ------- 23c1dda [Crawler] Fix regression where cdata nodes will return empty string
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -588,7 +588,7 @@ public function innerText(/* bool $normalizeWhitespace = true */): string
         $normalizeWhitespace = 1 <= \func_num_args() ? func_get_arg(0) : true;
 
         foreach ($this->getNode(0)->childNodes as $childNode) {
-            if (\XML_TEXT_NODE !== $childNode->nodeType) {
+            if (\XML_TEXT_NODE !== $childNode->nodeType && \XML_CDATA_SECTION_NODE !== $childNode->nodeType) {
                 continue;
             }
             if (!$normalizeWhitespace) {
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
@@ -377,6 +377,12 @@ public static function provideInnerTextExamples()
                 '',
                 '  ',
             ],
+            [
+                '//*[@id="complex-elements"]/*[@class="six"]',
+                'console.log("Test JavaScript content");',
+                'console.log("Test JavaScript content");',
+                ' console.log("Test JavaScript content"); ',
+            ],
         ];
     }
 
@@ -1311,6 +1317,7 @@ public function createTestCrawler($uri = null)
                         <div class="three"> Parent text <span>Child text</span> Parent text </div>
                         <div class="four">  <span>Child text</span>  </div>
                         <div class="five"><span>Child text</span>  <span>Another child</span></div>
+                        <script class="six" type="text/javascript"> console.log("Test JavaScript content"); </script>
                     </div>
                 </body>
             </html>

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ public function innerText(/* bool $normalizeWhitespace = true */): string`
`588`	`588`	`$normalizeWhitespace = 1 <= \func_num_args() ? func_get_arg(0) : true;`
`589`	`589`
`590`	`590`	`foreach ($this->getNode(0)->childNodes as $childNode) {`
`591`		`- if (\XML_TEXT_NODE !== $childNode->nodeType) {`
	`591`	`+ if (\XML_TEXT_NODE !== $childNode->nodeType && \XML_CDATA_SECTION_NODE !== $childNode->nodeType) {`
`592`	`592`	`continue;`
`593`	`593`	`}`
`594`	`594`	`if (!$normalizeWhitespace) {`