Bug stream context (#2)

Check is_resource before requesting stream_context_get_options
sblum · May 14, 2018 · d40cf89 · d40cf89
1 parent 17784cc
commit d40cf89
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/Tests/Visionline/Crm/WebApi/FileTest.php b/Tests/Visionline/Crm/WebApi/FileTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Visionline\Crm\WebApi;
+
+use PHPUnit\Framework\TestCase;
+use Visionline\Crm\WebApi\Connection;
+use Visionline\Crm\WebApi\WebApi;
+
+class FileTest extends TestCase
+{
+    public function testGetFileWithDefaultStreamContext()
+    {
+        $connection = new Connection('app2.visionline.at', 5000, 'testUser', 'testPassword');
+
+        $webApi = new WebApi('https://app2.visionline.at:8443/WebApi/WebApi.asmx?WSDL', $connection, [
+            'debug' => true,
+        ]);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Could not get file extension from https://app2.visionline.at:8443/WebApi/GetFile.ashx?host=app2.visionline.at&port=5000&username=testUser&password=testPassword&id=1');
+
+        $webApi->getFile(1);
+    }
+}
diff --git a/Visionline/Crm/WebApi/WebApi.php b/Visionline/Crm/WebApi/WebApi.php
@@ -1350,7 +1350,7 @@ public function getFile($documents, $width = null, $height = null, $resizeMode =
     {
         $op = new FileGetOperation($this, $this->getFileUrl, $this->connection, $this->bufferSize);
 
-        return $op->exec($documents, \stream_context_get_options($this->stream_context), $width, $height, $resizeMode);
+        return $op->exec($documents, \is_resource($this->stream_context) ? \stream_context_get_options($this->stream_context) : [], $width, $height, $resizeMode);
     }
 
     /**
@@ -1372,7 +1372,7 @@ public function saveFile($document, $directory, $forceDownload = false, $width =
     {
         $op = new FileSaveOperation($this, $this->getFileUrl, $this->connection, $this->bufferSize, $directory, $forceDownload);
 
-        return $op->exec($document, \stream_context_get_options($this->stream_context), $width, $height, $resizeMode);
+        return $op->exec($document, \is_resource($this->stream_context) ? \stream_context_get_options($this->stream_context) : [], $width, $height, $resizeMode);
     }
 
     /**
@@ -1391,7 +1391,7 @@ public function saveFile($document, $directory, $forceDownload = false, $width =
     public function saveFiles($documents, $directory, $forceDownload = false, $width = null, $height = null, $resizeMode = null)
     {
         $op = new FileSaveOperation($this, $this->getFileUrl, $this->connection, $this->bufferSize, $directory, $forceDownload);
-        $result = $op->execMultiple($documents, \stream_context_get_options($this->stream_context), $width, $height, $resizeMode);
+        $result = $op->execMultiple($documents, \is_resource($this->stream_context) ? \stream_context_get_options($this->stream_context) : [], $width, $height, $resizeMode);
         $this->debug('saveFiles: result = ', $result);
 
         return $result;
@@ -1413,7 +1413,7 @@ public function saveFiles($documents, $directory, $forceDownload = false, $width
     public function passthruFile($document, $sendHeaders = false, $width = null, $height = null, $resizeMode = null, $attachment = false)
     {
         $op = new FilePassthruOperation($this, $this->getFileUrl, $this->connection, $this->bufferSize, $sendHeaders, $attachment);
-        $op->exec($document, \stream_context_get_options($this->stream_context), $width, $height, $resizeMode);
+        $op->exec($document, \is_resource($this->stream_context) ? \stream_context_get_options($this->stream_context) : [], $width, $height, $resizeMode);
     }
 
     /**