[Parser] Values set to null are treated as undefined. Minor short cir…

…cuit if improvement to Guzzle\Http\Url
davedevelopment · Jul 12, 2012 · db66916 · db66916
1 parent 56c7fa0
commit db66916
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Guzzle/Http/Url.php b/src/Guzzle/Http/Url.php
@@ -271,10 +271,10 @@ public function setPath($path)
         if (is_array($path)) {
             $this->path = '/' . implode('/', $path);
         } else {
-            $this->path = $path;
-            if ($this->path != '*' && substr($this->path, 0, 1) != '/') {
-                $this->path = '/' . $path;
+            if (substr($path, 0, 1) != '/' && $path != '*') {
+                $path = '/' . $path;
             }
+            $this->path = $path;
         }
 
         return $this;

diff --git a/src/Guzzle/Parser/UriTemplate/UriTemplate.php b/src/Guzzle/Parser/UriTemplate/UriTemplate.php
@@ -130,7 +130,7 @@ private function expandMatch(array $matches)
 
         foreach ($parsed['values'] as $value) {
 
-            if (!array_key_exists($value['value'], $this->variables)) {
+            if (!array_key_exists($value['value'], $this->variables) || $this->variables[$value['value']] === null) {
                 continue;
             }
 

diff --git a/tests/Guzzle/Tests/Parser/UriTemplate/UriTemplateTest.php b/tests/Guzzle/Tests/Parser/UriTemplate/UriTemplateTest.php
@@ -24,6 +24,7 @@ public function templateProvider()
             'path'  => '/foo/bar',
             'x'     => '1024',
             'y'     => '768',
+            'null'  => null,
             'list'  => array('red', 'green', 'blue'),
             'keys'  => array(
                 "semi"  => ';',
@@ -103,6 +104,8 @@ public function templateProvider()
             array('{&list*}',            '&list=red&list=green&list=blue'),
             array('{&keys}',             '&keys=semi,%3B,dot,.,comma,%2C'),
             array('{&keys*}',            '&semi=%3B&dot=.&comma=%2C'),
+            array('{.null}',            ''),
+            array('{.null,var}',        '.value'),
             // Test that missing expansions are skipped
             array('test{&missing*}',     'test'),
             // Test that multiple expansions can be set