Merge branch 'Sam-Burns-php71' into 4.x

Forward port #2117
slimphp · Jan 7, 2017 · 4fe9cea · 4fe9cea
2 parents 1ee23ae + 795e036
commit 4fe9cea
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,6 @@ php:
   - 7.1
   - hhvm
 
-matrix:
-  allow_failures:
-    - php: 7.1
-
 before_script:
   - if [[ "$TRAVIS_PHP_VERSION" == '5.6' ]]; then composer require satooshi/php-coveralls:1.* squizlabs/php_codesniffer:2.* -n ; fi
   - if [[ "$TRAVIS_PHP_VERSION" != '5.6' ]]; then composer install -n ; fi

diff --git a/Slim/Http/Cookies.php b/Slim/Http/Cookies.php
@@ -174,7 +174,7 @@ public static function parseHeader($header)
         }
 
         $header = rtrim($header, "\r\n");
-        $pieces = preg_split('@\s*[;,]\s*@', $header);
+        $pieces = preg_split('@[;]\s*@', $header);
         $cookies = [];
 
         foreach ($pieces as $cookie) {

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -1542,9 +1542,22 @@ public function testRespondNoContent()
     public function testRespondWithPaddedStreamFilterOutput()
     {
         $availableFilter = stream_get_filters();
-        if (in_array('mcrypt.*', $availableFilter) && in_array('mdecrypt.*', $availableFilter)) {
+
+        if (version_compare(phpversion(), '7.0.0', '>=')) {
+            $filterName           = 'string.rot13';
+            $unfilterName         = 'string.rot13';
+            $specificFilterName   = 'string.rot13';
+            $specificUnfilterName = 'string.rot13';
+        } else {
+            $filterName           = 'mcrypt.*';
+            $unfilterName         = 'mdecrypt.*';
+            $specificFilterName   = 'mcrypt.rijndael-128';
+            $specificUnfilterName = 'mdecrypt.rijndael-128';
+        }
+
+        if (in_array($filterName, $availableFilter) && in_array($unfilterName, $availableFilter)) {
             $app = new App();
-            $app->get('/foo', function ($req, $res) {
+            $app->get('/foo', function ($req, $res) use ($specificFilterName, $specificUnfilterName) {
                 $key = base64_decode('xxxxxxxxxxxxxxxx');
                 $iv = base64_decode('Z6wNDk9LogWI4HYlRu0mng==');
 
@@ -1553,7 +1566,7 @@ public function testRespondWithPaddedStreamFilterOutput()
 
                 $stream = fopen('php://temp', 'r+');
 
-                $filter = stream_filter_append($stream, 'mcrypt.rijndael-128', STREAM_FILTER_WRITE, [
+                $filter = stream_filter_append($stream, $specificFilterName, STREAM_FILTER_WRITE, [
                     'key' => $key,
                     'iv' => $iv
                 ]);
@@ -1562,7 +1575,7 @@ public function testRespondWithPaddedStreamFilterOutput()
                 rewind($stream);
                 stream_filter_remove($filter);
 
-                stream_filter_append($stream, 'mdecrypt.rijndael-128', STREAM_FILTER_READ, [
+                stream_filter_append($stream, $specificUnfilterName, STREAM_FILTER_READ, [
                     'key' => $key,
                     'iv' => $iv
                 ]);

diff --git a/tests/Http/CookiesTest.php b/tests/Http/CookiesTest.php
@@ -161,6 +161,13 @@ public function testParseHeader()
         $this->assertEquals('Josh', $cookies['name']);
     }
 
+    public function testParseHeaderWithJsonArray()
+    {
+        $cookies = Cookies::parseHeader('foo=bar; testarray=["someVar1","someVar2","someVar3"]');
+        $this->assertEquals('bar', $cookies['foo']);
+        $this->assertContains('someVar3', json_decode($cookies['testarray']));
+    }
+
     public function testToHeaders()
     {
         $cookies = new Cookies;