merged branch matthijsvandenbos/matthijsvandenbos/link-handle-scheme (PR symfony#7214)

fabpot · fabpot · commit 8e99eb07d3d9 · 2013-02-28T13:27:29.000+01:00
This PR was merged into the 2.1 branch. Commits ------- 8f8ba38 [DomCrawler] fix handling of schemes by Link::getUri() Discussion ---------- [DomCrawler] fixed handling of schemes by Link::getUri() A link (anchor tag with an href attr) in pages crawled by the Crawler can contain any valid URI, including mailto: links. Currently this is not correctly supported by `Link::getUri`. Schemes that do not start with 'http' are treated as relative URIs and appenden to the base URI. This leads to strange URIs like this: http://foo.com/mailto:foo@bar.com Fixed `Link::getUri` to treat any URI with a schema part as an absolute URL. Updated the unit tests to test for this. --------------------------------------------------------------------------- by matthijsvandenbos at 2013-02-28T11:55:18Z Ok, I will update the pull request --------------------------------------------------------------------------- by matthijsvandenbos at 2013-02-28T12:25:45Z Fixed
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
@@ -89,7 +89,7 @@ public function getUri()
         $uri = trim($this->getRawUri());
 
         // absolute URL?
-        if (0 === strpos($uri, 'http')) {
+        if (null !== parse_url($uri, PHP_URL_SCHEME)) {
             return $uri;
         }
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/LinkTest.php b/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
@@ -93,6 +93,8 @@ public function getGetUriTests()
             array('?a=b', 'http://localhost/bar/', 'http://localhost/bar/?a=b'),
 
             array('http://login.foo.com/foo', 'http://localhost/bar/', 'http://login.foo.com/foo'),
+            array('https://login.foo.com/foo', 'https://localhost/bar/', 'https://login.foo.com/foo'),
+            array('mailto:foo@bar.com', 'http://localhost/foo', 'mailto:foo@bar.com'),
 
             array('?foo=2', 'http://localhost?foo=1', 'http://localhost?foo=2'),
             array('?foo=2', 'http://localhost/?foo=1', 'http://localhost/?foo=2'),

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getUri()`
`89`	`89`	`$uri = trim($this->getRawUri());`
`90`	`90`
`91`	`91`	`// absolute URL?`
`92`		`- if (0 === strpos($uri, 'http')) {`
	`92`	`+ if (null !== parse_url($uri, PHP_URL_SCHEME)) {`
`93`	`93`	`return $uri;`
`94`	`94`	`}`
`95`	`95`