tonyair/silverstripe-textextraction
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-textextraction synced 2024-10-22 11:06:00 +02:00
Code Issues Projects Releases Wiki Activity

Ensure that the version number has a major, minor and patch number

Browse Source
This commit is contained in:
Steve Boyd 2018-07-11 14:03:00 +12:00
parent 9f04583ed5
commit 4429acb6ec
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/extractors/TikaServerTextExtractor.php
View File

@ -70,9 +70,17 @@ class TikaServerTextExtractor extends FileTextExtractor
public function isAvailable() public function isAvailable()
{ {
$version = $this->getVersion();
// ensure that the version number has a major, minor and patch number
// reason being that version_compare('1.7', '1.7.0') will return -1 instead of 0
for ($i = 0; $i < 2; $i++) {
if (substr_count($version, '.') < 2) {
$version .= '.0';
}
}
return $this->getServerEndpoint() && return $this->getServerEndpoint() &&
$this->getClient()->isAvailable() && $this->getClient()->isAvailable() &&
version_compare($this->getVersion(), '1.7.0') >= 0; version_compare($version, '1.7.0') >= 0;
} }
public function supportsExtension($extension) public function supportsExtension($extension)