Merge branch 'master' into 1.x

Author: vaites

src/Clients/CLIClient.php

@@ -50,7 +50,7 @@ class CLIClient extends Client
      *
      * @throws \Exception
      */
-    public function __construct(?string $path = null, string $java = null, bool $check = true)
+    public function __construct(?string $path = null, ?string $java = null, bool $check = true)
     {
         parent::__construct();
 

src/Clients/WebClient.php

@@ -303,7 +303,7 @@ public function getHeaders(): array
      */
     public function getHeader(string $name): ?string
     {
-        $value = [];
+        $value = null;
 
         foreach($this->options[CURLOPT_HTTPHEADER] as $header)
         {

tests/BaseTest.php

@@ -45,7 +45,7 @@ abstract class BaseTest extends TestCase
      * 
      * @throws \Exception
      */
-    public function __construct(string $name = null, array $data = array(), $dataName = '')
+    public function __construct(?string $name = null, array $data = array(), $dataName = '')
     {
         self::$version = getenv('APACHE_TIKA_VERSION');
         self::$binaries = getenv('APACHE_TIKA_BINARIES');

tests/CommonTest.php

@@ -33,7 +33,7 @@ class CommonTest extends TestCase
     /**
      * Get env variables
      */
-    public function __construct(string $name = null, array $data = array(), $dataName = '')
+    public function __construct(?string $name = null, array $data = array(), $dataName = '')
     {
         self::$version = getenv('APACHE_TIKA_VERSION');
         self::$binaries = getenv('APACHE_TIKA_BINARIES');

tests/ErrorTest.php

@@ -29,7 +29,7 @@ class ErrorTest extends TestCase
     /**
      * Get env variables
      */
-    public function __construct(string $name = null, array $data = array(), $dataName = '')
+    public function __construct(?string $name = null, array $data = array(), $dataName = '')
     {
         self::$version = getenv('APACHE_TIKA_VERSION');
         self::$binaries = getenv('APACHE_TIKA_BINARIES');