merged branch stealth35/fix_2599 (PR symfony#2601)

fabpot · fabpot · commit 632a99fd7c82 · 2011-11-11T08:09:10.000+01:00
Commits ------- a245e15 [DomCrawler] trim URI in getURI Discussion ---------- [DomCrawler] trim URI in getURI Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#2599
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
@@ -77,7 +77,7 @@ public function getMethod()
      */
     public function getUri()
     {
-        $uri = $this->getRawUri();
+        $uri = trim($this->getRawUri());
 
         // absolute URL?
         if ('http' === substr($uri, 0, 4)) {
diff --git a/tests/Symfony/Tests/Component/DomCrawler/LinkTest.php b/tests/Symfony/Tests/Component/DomCrawler/LinkTest.php
@@ -79,6 +79,10 @@ public function getGetUriTests()
         return array(
             array('/foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
             array('/foo', 'http://localhost/bar/foo', 'http://localhost/foo'),
+            array('
+            /foo', 'http://localhost/bar/foo/', 'http://localhost/foo'),
+            array('/foo
+            ', 'http://localhost/bar/foo', 'http://localhost/foo'),
 
             array('foo', 'http://localhost/bar/foo/', 'http://localhost/bar/foo/foo'),
             array('foo', 'http://localhost/bar/foo', 'http://localhost/bar/foo'),

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function getMethod()`
`77`	`77`	`*/`
`78`	`78`	`public function getUri()`
`79`	`79`	`{`
`80`		`- $uri = $this->getRawUri();`
	`80`	`+ $uri = trim($this->getRawUri());`
`81`	`81`
`82`	`82`	`// absolute URL?`
`83`	`83`	`if ('http' === substr($uri, 0, 4)) {`