Merge remote-tracking branch 'origin/master'

Author: WyriHaximus

appveyor.bat

@@ -0,0 +1,9 @@
+cd c:\tools\php
+copy php.ini-production php.ini /Y
+echo date.timezone="UTC" >> php.ini
+echo extension_dir=ext >> php.ini
+echo extension=php_openssl.dll >> php.ini
+echo extension=php_mbstring.dll >> php.ini
+echo extension=php_fileinfo.dll >> php.ini
+echo @php %%~dp0composer.phar %%* > composer.bat
+appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar

appveyor.yml

@@ -1,50 +1,44 @@
 build: false
 platform:
   - x64
-clone_folder: c:\projects\php-api-client
+clone_folder: c:\projects\php-project-workspace
 
 
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:
   - dependencies: lowest
+    php_ver_target: 7.0
   - dependencies: current
+    php_ver_target: 7.0
   - dependencies: highest
+    php_ver_target: 7.0
 
 ## Cache composer bits
 cache:
-    - c:\tools\php -> appveyor.yml
-    - c:\projects\php-api-client\vendor -> composer.lock
+    - C:\ProgramData\chocolatey\bin -> appveyor.yml
+    - C:\ProgramData\chocolatey\lib -> appveyor.yml
+    - C:\tools\php -> appveyor.yml
     - '%LOCALAPPDATA%\Composer\files -> composer.lock'
 
 ## Set up environment varriables
 init:
+    - SET COMPOSER_ROOT_VERSION=dev-master ## Temporary until we tag first versions
     - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
     - SET PHP=1
     - SET ANSICON=121x90 (121x90)
 
 ## Install PHP and composer, and run the appropriate composer command
 install:
-    - IF EXIST c:\tools\php (SET PHP=0)
-    - IF %PHP%==1 cinst -y OpenSSL.Light
-    - IF %PHP%==1 cinst -y php
-    - cd c:\tools\php
-    - IF %PHP%==1 copy php.ini-production php.ini /Y
-    - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
-    - IF %PHP%==1 echo extension_dir=ext >> php.ini
-    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
-    - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
-    - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-    - appveyor DownloadFile https://getcomposer.org/composer.phar
-    - cd c:\projects\php-api-client
-    - IF %dependencies%==lowest composer update --prefer-lowest --no-progress -n
-    - IF %dependencies%==current composer install --no-progress
-    - IF %dependencies%==highest composer update --no-progress -n
-    - composer show -i
+    - ps: IF (!(Test-Path c:\tools\php)) {appveyor-retry cinst -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $Env:php_ver_target | Select-Object -first 1) -replace '[php|]',''); cmd.exe /c 'appveyor.bat'}
+    - cd c:\projects\php-project-workspace
+    - IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress -n
+    - IF %dependencies%==current appveyor-retry composer install --no-progress
+    - IF %dependencies%==highest appveyor-retry composer update --no-progress -n
+    - composer show
 
 ## Run the actual test
 test_script:
-    - cd c:\projects\php-api-client
-    - composer qa-ci-windows
+    - cd c:\projects\php-project-workspace
+    - vendor/bin/phpunit -c phpunit.xml.dist

src/Transport/Client.php

@@ -16,6 +16,7 @@
 use Psr\Http\Message\UriInterface;
 use React\Cache\CacheInterface;
 use React\EventLoop\LoopInterface;
+use React\EventLoop\Timer\TimerInterface;
 use React\Promise\PromiseInterface;
 use function React\Promise\reject;
 use React\Promise\RejectedPromise;
@@ -209,12 +210,9 @@ public function request(RequestInterface $request, array $options = [], bool $re
             ));
         })->then(function (ResponseInterface $response) use ($request, $options, $refresh) {
             if (isset($options[RequestOptions::STREAM]) && $options[RequestOptions::STREAM] === true) {
-                return resolve(
-                    new Response(
-                        '',
-                        $response
-                    )
-                );
+                $responseWrapper = new Response('', $response);
+                $this->streamBody($responseWrapper);
+                return resolve($responseWrapper);
             }
 
             $contents = $response->getBody()->getContents();
@@ -245,6 +243,25 @@ public function request(RequestInterface $request, array $options = [], bool $re
         });
     }
 
+    protected function streamBody(Response $response)
+    {
+        $stream = $response->getResponse()->getBody();
+        $this->loop->addPeriodicTimer(0.001, function (TimerInterface $timer) use ($stream, $response) {
+            if ($stream->eof()) {
+                $timer->cancel();
+                $response->emit('end');
+                return;
+            }
+
+            $size = $stream->getSize();
+            if ($size === 0) {
+                return;
+            }
+
+            $response->emit('data', [$stream->read($size)]);
+        });
+    }
+
     protected function applyApiSettingsToRequest(RequestInterface $request): RequestInterface
     {
         $uri = $request->getUri();

src/Transport/Response.php

@@ -2,10 +2,14 @@
 
 namespace ApiClients\Foundation\Transport;
 
+use Evenement\EventEmitterInterface;
+use Evenement\EventEmitterTrait;
 use Psr\Http\Message\ResponseInterface;
 
-final class Response
+final class Response implements EventEmitterInterface
 {
+    use EventEmitterTrait;
+
     /**
      * @var string
      */

tests/Transport/ClientTest.php

@@ -241,7 +241,22 @@ public function testRequestStreaming()
         $cache = Phake::mock(CacheInterface::class);
 
         $stream = Phake::mock(StreamInterface::class);
-        Phake::when($stream)->getContents()->thenReturn('{"foo":"bar"}');
+        Phake::when($stream)->eof()
+            ->thenReturn(false)
+            ->thenReturn(false)
+            ->thenReturn(false)
+            ->thenReturn(true)
+        ;
+        Phake::when($stream)->getSize()
+            ->thenReturn(1)
+            ->thenReturn(1)
+            ->thenReturn(1)
+        ;
+        Phake::when($stream)->read(1)
+            ->thenReturn('a')
+            ->thenReturn('b')
+            ->thenReturn('c')
+        ;
 
         $response = Phake::mock(Response::class);
         Phake::when($response)->getBody()->thenReturn($stream);
@@ -276,6 +291,14 @@ public function testRequestStreaming()
         $this->assertInstanceOf(TransportResponse::class, $result);
         $this->assertSame('', $result->getBody());
 
+        $buffer = '';
+        $result->on('data', function ($data) use (&$buffer) {
+            $buffer .= $data;
+        });
+        $loop->run();
+
+        $this->assertSame('abc', $buffer);
+
         Phake::verifyNoInteraction($cache);
     }