Merge pull request #68 from TomasVotruba/patch-1

[WIP] travis: PHP 5.5+ added, run tests

.travis.yml

@@ -1,4 +1,18 @@
 language: php
+
 php:
+  - 5.3
   - 5.4
-  - 5.3
+  - 5.5
+  - 5.6
+  - 7.0
+
+matrix:
+  allow_failures:
+    - php: 7.0
+
+before_script:
+  - composer install
+
+script:
+  - phpunit

phpunit.xml.dist

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit
+	bootstrap="tests/bootstrap.php"
+	colors="true"
+>
     <testsuites>
         <testsuite name="Munee Test Suite">
             <directory>./tests/Munee/</directory>

tests/Munee/Cases/ResponseTest.php

@@ -55,7 +55,7 @@ public function testNonCachedResponse()
 
         $this->assertSame($checkHeaders['Cache-Control'], $setHeaders['Cache-Control']);
         unset($setHeaders['Cache-Control']);
-        $this->assertSame($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
+        $this->assertContains($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
         unset($setHeaders['Content-Type']);
         $this->assertSame($checkHeaders['Last-Modified'], $setHeaders['Last-Modified']);
         unset($setHeaders['Last-Modified']);
@@ -127,7 +127,7 @@ public function testExpiredRequestResponse()
 
         $this->assertSame($checkHeaders['Cache-Control'], $setHeaders['Cache-Control']);
         unset($setHeaders['Cache-Control']);
-        $this->assertSame($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
+        $this->assertContains($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
         unset($setHeaders['Content-Type']);
         $this->assertSame($checkHeaders['Last-Modified'], $setHeaders['Last-Modified']);
         unset($setHeaders['Last-Modified']);
@@ -166,6 +166,10 @@ protected function getHeaders()
         foreach ($rawHeaders as $header) {
             $headerParts = explode(':', $header, 2);
             if (2 == count($headerParts)) {
+                if ($headerParts[0] === 'Content-type') {
+                    // xdebug incompatible naming
+                    $headerParts[0] = 'Content-Type';
+                }
                 $ret[$headerParts[0]] = trim($headerParts[1]);
             } elseif (isset($ret[$headerParts[0]])) {
                 // If a header param is empty, make sure others with the same name are not set as well