Merge branch 'master' into issue-41-psr-18

# Conflicts:
#	tests/BaseUnitTestCase.php
#	tests/CurlPromiseTest.php
#	tests/Functional/HttpClientTestCase.php
#	tests/HttpAsyncClientTestCase.php

Author: mekras

.gitattributes

@@ -3,6 +3,8 @@
 .gitattributes   export-ignore
 .gitignore       export-ignore
 .scrutinizer.yml export-ignore
+.styleci.yml     export-ignore
+.php_cs.yml      export-ignore
 .travis.yml      export-ignore
 CONDUCT.md       export-ignore
 CONTRIBUTING.md  export-ignore

tests/Unit/ClientTest.php

@@ -25,7 +25,7 @@ class ClientTest extends TestCase
      */
     public function testExpectHeader(): void
     {
-        $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->createMock(Client::class);
 
         $createHeaders = new \ReflectionMethod(Client::class, 'createHeaders');
         $createHeaders->setAccessible(true);
@@ -59,7 +59,7 @@ public function testWithNullPostFields(): void
 
     public function testRewindStream(): void
     {
-        $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->createMock(Client::class);
 
         $bodyOptions = new \ReflectionMethod(Client::class, 'addRequestBodyOptions');
         $bodyOptions->setAccessible(true);
@@ -74,7 +74,7 @@ public function testRewindStream(): void
 
     public function testRewindLargeStream(): void
     {
-        $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();
+        $client = $this->createMock(Client::class);
 
         $bodyOptions = new \ReflectionMethod(Client::class, 'addRequestBodyOptions');
         $bodyOptions->setAccessible(true);