Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Reset URI parts before parse #4288

Merged
merged 1 commit into from Apr 22, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions library/Zend/Uri/Uri.php
Expand Up @@ -253,6 +253,20 @@ public function isAbsolute()
return ($this->scheme !== null);
}

/**
* Reset URI parts
*/
protected function reset()
{
$this->setScheme(null);
$this->setPort(null);
$this->setUserInfo(null);
$this->setHost(null);
$this->setPath(null);
$this->setFragment(null);
$this->setQuery(null);
}

/**
* Parse a URI string
*
Expand All @@ -261,6 +275,8 @@ public function isAbsolute()
*/
public function parse($uri)
{
$this->reset();

// Capture scheme
if (($scheme = self::parseScheme($uri)) !== null) {
$this->setScheme($scheme);
Expand Down
14 changes: 14 additions & 0 deletions tests/ZendTest/Uri/UriTest.php
Expand Up @@ -1335,4 +1335,18 @@ public function notStringInputProvider()
array(array('scheme' => 'http', 'host' => 'example.com'))
);
}

public function testParseTwice()
{
$uri = new Uri();
$uri->parse('http://user@example.com:1/absolute/url?query#fragment');
$uri->parse('/relative/url');
$this->assertNull($uri->getScheme());
$this->assertNull($uri->getHost());
$this->assertNull($uri->getUserInfo());
$this->assertNull($uri->getPort());
$this->assertNull($uri->getQuery());
$this->assertNull($uri->getFragment());
}

}