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

bug #11194 [DomCrawler] Remove the query string and the anchor of the uri of a link (benja-M-1) 

This PR was squashed before being merged into the 2.3 branch (closes #11194).

Discussion
----------

[DomCrawler] Remove the query string and the anchor of the uri of a link

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

fe5d2d1 [DomCrawler] Remove the query string and the anchor of the uri of a link
This commit is contained in:
Christophe Coevoet 2014-07-04 00:18:40 +02:00
parent 5f8ee9d596 fe5d2d1554
commit 38be14dd14
2 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,34 +98,23 @@ class Link
return $this->currentUri;
}
// only an anchor
// an anchor
if ('#' === $uri[0]) {
$baseUri = $this->currentUri;
if (false !== $pos = strpos($baseUri, '#')) {
$baseUri = substr($baseUri, 0, $pos);
}
return $baseUri.$uri;
return $this->cleanupAnchor($this->currentUri).$uri;
}
// only a query string
$baseUri = $this->cleanupUri($this->currentUri);
if ('?' === $uri[0]) {
$baseUri = $this->currentUri;
// remove the query string from the current URI
if (false !== $pos = strpos($baseUri, '?')) {
$baseUri = substr($baseUri, 0, $pos);
}
return $baseUri.$uri;
}
// absolute URL with relative schema
if (0 === strpos($uri, '//')) {
return preg_replace('#^([^/]*)//.*$#', '$1', $this->currentUri).$uri;
return preg_replace('#^([^/]*)//.*$#', '$1', $baseUri).$uri;
}
$baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $this->currentUri);
$baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $baseUri);
// absolute path
if ('/' === $uri[0]) {
@ -194,4 +183,48 @@ class Link
$this->node = $node;
}
/**
* Removes the query string and the anchor from the given uri.
*
* @param string $uri The uri to clean
*
* @return string
*/
private function cleanupUri($uri)
{
return $this->cleanupQuery($this->cleanupAnchor($uri));
}
/**
* Remove the query string from the uri.
*
* @param $uri
*
* @return array
*/
private function cleanupQuery($uri)
{
if (false !== $pos = strpos($uri, '?')) {
return substr($uri, 0, $pos);
}
return $uri;
}
/**
* Remove the anchor from the uri.
*
* @param $uri
*
* @return string
*/
private function cleanupAnchor($uri)
{
if (false !== $pos = strpos($uri, '#')) {
return substr($uri, 0, $pos);
}
return $uri;
}
}

4
src/Symfony/Component/DomCrawler/Tests/LinkTest.php
View File

@ -101,7 +101,9 @@ class LinkTest extends \PHPUnit_Framework_TestCase
array('', 'http://localhost/bar/', 'http://localhost/bar/'),
array('#', 'http://localhost/bar/', 'http://localhost/bar/#'),
array('#bar', 'http://localhost/bar?a=b', 'http://localhost/bar?a=b#bar'),
array('#bar', 'http://localhost/bar/#foo', 'http://localhost/bar/#bar'),
array('?a=b', 'http://localhost/bar#foo', 'http://localhost/bar?a=b'),
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'),
@ -135,6 +137,8 @@ class LinkTest extends \PHPUnit_Framework_TestCase
array('../../', 'http://localhost/', 'http://localhost/'),
array('../../', 'http://localhost', 'http://localhost/'),
array('/foo', 'http://localhost?bar=1', 'http://localhost/foo'),
array('/foo', 'http://localhost#bar', 'http://localhost/foo'),
array('/foo', 'file:///', 'file:///foo'),
array('/foo', 'file:///bar/baz', 'file:///foo'),
array('foo', 'file:///', 'file:///foo'),