Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 39 deletions

diff --git a/server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
deleted file mode 100755
index 0e4b586..0000000
--- a/server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Psr7;
-
-use GuzzleHttp\Psr7;
-use GuzzleHttp\Psr7\InflateStream;
-
-class InflateStreamtest extends \PHPUnit_Framework_TestCase
-{
-    public function testInflatesStreams()
-    {
-        $content = gzencode('test');
-        $a = Psr7\stream_for($content);
-        $b = new InflateStream($a);
-        $this->assertEquals('test', (string) $b);
-    }
-
-    public function testInflatesStreamsWithFilename()
-    {
-        $content = $this->getGzipStringWithFilename('test');
-        $a = Psr7\stream_for($content);
-        $b = new InflateStream($a);
-        $this->assertEquals('test', (string) $b);
-    }
-
-    private function getGzipStringWithFilename($original_string)
-    {
-        $gzipped = bin2hex(gzencode($original_string));
-
-        $header = substr($gzipped, 0, 20);
-        // set FNAME flag
-        $header[6]=0;
-        $header[7]=8;
-        // make a dummy filename
-        $filename = "64756d6d7900";
-        $rest = substr($gzipped, 20);
-
-        return hex2bin($header . $filename . $rest);
-    }
-}