Merge pull request php-vcr#97 from jamiehannaford/various-fixes

Various fixes

Author: adri

src/VCR/Request.php

@@ -197,7 +197,13 @@ public function getUrl()
  */
  public function getHost()
  {
- return parse_url($this->getUrl(), PHP_URL_HOST);
+ $host = parse_url($this->getUrl(), PHP_URL_HOST);
+
+ if ($port = parse_url($this->getUrl(), PHP_URL_PORT)) {
+ $host .= ':' . $port;
+ }
+
+ return $host;
  }
 
  /**

src/VCR/RequestMatcher.php

@@ -71,7 +71,7 @@ public static function matchHeaders(Request $first, Request $second)
  {
  $firstHeaders = $first->getHeaders();
  foreach ($second->getHeaders() as $key => $pattern) {
- if (!isset($firstHeaders[$key])
+ if (!array_key_exists($key, $firstHeaders)
  || $pattern !== $firstHeaders[$key]) {
  return false;
  }

tests/VCR/RequestMatcherTest.php

@@ -56,6 +56,14 @@ public function testMatchingHeaders()
  $this->assertFalse(RequestMatcher::matchHeaders($first, $second));
  }
 
+ public function testHeaderMatchingAllowsEmptyVals()
+ {
+ $first = new Request('GET', 'http://example.com', array('Accept' => null, 'Content-Type' => 'application/json'));
+ $second = new Request('GET', 'http://example.com', array('Accept' => null, 'Content-Type' => 'application/json'));
+
+ $this->assertTrue(RequestMatcher::matchHeaders($first, $second));
+ }
+
  public function testMatchingPostFields()
  {
  $mock = array(

tests/VCR/RequestTest.php

@@ -210,4 +210,10 @@ public function testDoesntMatchBody()
  )
  );
  }
+
+ public function testGetHostReturnsBothHostAndPort()
+ {
+ $request = new Request('GET', 'http://example.com:5000/foo?param=key');
+ $this->assertEquals('example.com:5000', $request->getHost());
+ }
 }