From bff5eb2b7912aa638e56b2a9c11100a11ce09306 Mon Sep 17 00:00:00 2001 From: Martin Hipp Date: Mon, 25 Mar 2019 16:02:27 +1300 Subject: [PATCH 1/2] Return version number as string instead of floats so '1.20' does not become 1.2 --- src/Rest/TikaRestClient.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Rest/TikaRestClient.php b/src/Rest/TikaRestClient.php index 1ed762a..5e021f7 100644 --- a/src/Rest/TikaRestClient.php +++ b/src/Rest/TikaRestClient.php @@ -70,22 +70,22 @@ class TikaRestClient extends Client /** * Get version code * - * @return float + * @return string */ public function getVersion() { /** @var Response $response */ $response = $this->get('version', $this->getGuzzleOptions()); - $version = 0.0; + $version = 0; // Parse output if ($response->getStatusCode() == 200 && preg_match('/Apache Tika (?[\.\d]+)/', $response->getBody(), $matches) ) { - $version = (float)$matches['version']; + $version = $matches['version']; } - return $version; + return (string) $version; } /** From 20079bd33f9d28ac8352eb1f37f235c9ecc57d72 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 26 Jun 2019 15:17:34 +1200 Subject: [PATCH 2/2] Remove SilverStripe 4.0-4.2 from Travis builds --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 467c92b..b357725 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,13 @@ env: matrix: include: - php: 5.6 - env: DB=MYSQL RECIPE_VERSION=1.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 + env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - php: 7.0 - env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1 - - php: 7.1 - env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.2 env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 + - php: 7.1 + env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1 + - php: 7.2 + env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 - php: 7.3 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1