bug #24975 [DomCrawler] Type fix Crawler:: discoverNamespace() (VolCh)

stof · stof · commit b2719d3176e6 · 2017-11-16T13:59:59.000+01:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [DomCrawler] Type fix Crawler:: discoverNamespace() Based on 3.x behavior | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? |no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR |  Commits ------- e39e8c2 [DomCrawler] Fix return type Crawler:: discoverNamespace()
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1110,7 +1110,7 @@ private function createDOMXPath(\DOMDocument $document, array $prefixes = array(
     /**
      * @throws \InvalidArgumentException
      */
-    private function discoverNamespace(\DOMXPath $domxpath, string $prefix): string
+    private function discoverNamespace(\DOMXPath $domxpath, string $prefix): ?string
     {
         if (isset($this->namespaces[$prefix])) {
             return $this->namespaces[$prefix];
@@ -1122,6 +1122,8 @@ private function discoverNamespace(\DOMXPath $domxpath, string $prefix): string
         if ($node = $namespaces->item(0)) {
             return $node->nodeValue;
         }
+
+        return null;
     }
 
     private function findNamespacePrefixes(string $xpath): array

Original file line number	Diff line number	Diff line change
`@@ -1110,7 +1110,7 @@ private function createDOMXPath(\DOMDocument $document, array $prefixes = array(`
`1110`	`1110`	`/**`
`1111`	`1111`	`* @throws \InvalidArgumentException`
`1112`	`1112`	`*/`
`1113`		`- private function discoverNamespace(\DOMXPath $domxpath, string $prefix): string`
	`1113`	`+ private function discoverNamespace(\DOMXPath $domxpath, string $prefix): ?string`
`1114`	`1114`	`{`
`1115`	`1115`	`if (isset($this->namespaces[$prefix])) {`
`1116`	`1116`	`return $this->namespaces[$prefix];`
`@@ -1122,6 +1122,8 @@ private function discoverNamespace(\DOMXPath $domxpath, string $prefix): string`
`1122`	`1122`	`if ($node = $namespaces->item(0)) {`
`1123`	`1123`	`return $node->nodeValue;`
`1124`	`1124`	`}`
	`1125`	`+`
	`1126`	`+ return null;`
`1125`	`1127`	`}`
`1126`	`1128`
`1127`	`1129`	`private function findNamespacePrefixes(string $xpath): array`