diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DomCrawler] Fixed URIs being incorrectly generated

Browse Source 
When the path is not ending with a slash and the form/link has only ?get=params then the last bit of the path was incorrectly stripped
This commit is contained in:
Jordi Boggiano 2010-09-02 18:56:55 +02:00 committed by Fabien Potencier
parent a6da0fb0c4
commit 1719bfb871
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/DomCrawler/Crawler.php
View File

@ -567,10 +567,6 @@ class Crawler extends \SplObjectStorage
$path = parse_url($uri, PHP_URL_PATH);
if ('/' !== substr($path, -1)) {
$path = substr($path, 0, strrpos($path, '/') + 1);
}
return array(preg_replace('#^(.*?//[^/]+)\/.*$#', '$1', $uri), $path);
}

7
src/Symfony/Component/DomCrawler/Form.php
View File

@ -176,8 +176,13 @@ class Form implements \ArrayAccess
$uri .= $sep.$queryString;
}
$path = $this->path;
if ('?' !== substr($uri, 0, 1) && '/' !== substr($path, -1)) {
$path = substr($path, 0, strrpos($path, '/') + 1);
}
if ($uri && '/' !== $uri[0] && !$urlHaveScheme) {
$uri = $this->path.$uri;
$uri = $path.$uri;
}
if ($absolute && null !== $this->host && !$urlHaveScheme) {

7
src/Symfony/Component/DomCrawler/Link.php
View File

@ -67,8 +67,13 @@ class Link
$uri = $this->node->getAttribute('href');
$urlHaveScheme = 'http' === substr($uri, 0, 4);
$path = $this->path;
if ('?' !== substr($uri, 0, 1) && '/' !== substr($path, -1)) {
$path = substr($path, 0, strrpos($path, '/') + 1);
}
if ($uri && '/' !== $uri[0] && !$urlHaveScheme) {
$uri = $this->path.$uri;
$uri = $path.$uri;
}
if ($absolute && null !== $this->host && !$urlHaveScheme) {