Merge branch 'master' of github.com:vaites/php-apache-tika

vaites · vaites · commit 72c09db2fbcf · 2025-10-04T09:34:52.000+02:00
diff --git a/src/Clients/CLIClient.php b/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();
 
diff --git a/tests/BaseTest.php b/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');
diff --git a/tests/CommonTest.php b/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');
diff --git a/tests/ErrorTest.php b/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');

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class CLIClient extends Client`
`50`	`50`	`*`
`51`	`51`	`* @throws \Exception`
`52`	`52`	`*/`
`53`		`- public function __construct(?string $path = null, string $java = null, bool $check = true)`
	`53`	`+ public function __construct(?string $path = null, ?string $java = null, bool $check = true)`
`54`	`54`	`{`
`55`	`55`	`parent::__construct();`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ abstract class BaseTest extends TestCase`
`45`	`45`	`*`
`46`	`46`	`* @throws \Exception`
`47`	`47`	`*/`
`48`		`- public function __construct(string $name = null, array $data = array(), $dataName = '')`
	`48`	`+ public function __construct(?string $name = null, array $data = array(), $dataName = '')`
`49`	`49`	`{`
`50`	`50`	`self::$version = getenv('APACHE_TIKA_VERSION');`
`51`	`51`	`self::$binaries = getenv('APACHE_TIKA_BINARIES');`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class CommonTest extends TestCase`
`33`	`33`	`/**`
`34`	`34`	`* Get env variables`
`35`	`35`	`*/`
`36`		`- public function __construct(string $name = null, array $data = array(), $dataName = '')`
	`36`	`+ public function __construct(?string $name = null, array $data = array(), $dataName = '')`
`37`	`37`	`{`
`38`	`38`	`self::$version = getenv('APACHE_TIKA_VERSION');`
`39`	`39`	`self::$binaries = getenv('APACHE_TIKA_BINARIES');`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ErrorTest extends TestCase`
`29`	`29`	`/**`
`30`	`30`	`* Get env variables`
`31`	`31`	`*/`
`32`		`- public function __construct(string $name = null, array $data = array(), $dataName = '')`
	`32`	`+ public function __construct(?string $name = null, array $data = array(), $dataName = '')`
`33`	`33`	`{`
`34`	`34`	`self::$version = getenv('APACHE_TIKA_VERSION');`
`35`	`35`	`self::$binaries = getenv('APACHE_TIKA_BINARIES');`