Commit Graph

172 Commits

Author SHA1 Message Date
Guy Sartorelli 4674084d0d
Merge pull request #72 from creative-commoners/pulls/3/php81
ENH PHP 8.1 compatibility
2022-04-26 17:58:43 +12:00
Steve Boyd df8b17ab85 ENH PHP 8.1 compatibility 2022-04-13 13:51:04 +12:00
Michal Kleiner 77fecc4c53
Merge pull request #71 from GuySartorelli/patch-1
DOCS Fix incorrect PHPDoc about what null lifetime means.
2022-03-10 07:38:08 +13:00
Guy Sartorelli d03a9f06e2
DOCS Fix incorrect PHPDoc about what null lifetime means. 2022-03-09 16:03:03 +13:00
Michal Kleiner 88e7f27c5c
Merge pull request #69 from GuySartorelli/patch-1
DOCS Fix class reference for cache class
2022-03-07 11:31:11 +13:00
Guy Sartorelli 04e4b60435
DOCS Fix class reference for cache class
The `lifetime` config variable is on the `Cache` class, not the `Database` class.
2022-03-07 11:20:01 +13:00
Maxime Rainville 25d8a55058
Merge pull request #68 from creative-commoners/pulls/3/php74
DEP Set PHP 7.4 as the minimum version
2022-02-18 22:10:02 +13:00
Steve Boyd e8f015ddd2 DEP Set PHP 7.4 as the minimum version 2022-02-10 17:41:01 +13:00
Michal Kleiner 254c4e31f8
Merge pull request #67 from GuySartorelli/patch-1
DEP Loosen constraints for guzzlehttp/guzzle
2022-01-26 22:08:47 +13:00
GuySartorelli 7ad3fc9f13
DEP Loosen constraints for guzzlehttp/guzzle 2022-01-26 12:58:30 +13:00
Maxime Rainville eb36dcf5fb
Merge pull request #65 from creative-commoners/pulls/3/sapphire-test-nine
API phpunit 9 support
2021-11-01 22:37:19 +13:00
Steve Boyd b92616eb4e API phpunit 9 support 2021-10-27 18:16:05 +13:00
Steve Boyd 90d4812aa8 Merge branch '3.2' into 3 2021-05-21 14:30:19 +12:00
Maxime Rainville d1bdc003ad MNT Remove obsolete branch-alias 2021-05-05 11:17:57 +12:00
Steve Boyd 6af13768d3 Merge branch '3.1' into 3 2021-01-27 12:26:07 +13:00
Garion Herman 4250acb50e
Merge pull request #64 from creative-commoners/pulls/3.1/travis-shared
MNT Travis shared config
2021-01-27 11:59:07 +13:00
Steve Boyd 795abde8f1
Update build status badge 2021-01-21 16:43:07 +13:00
Steve Boyd d1e241ed56 MNT Travis shared config 2021-01-20 14:49:58 +13:00
Steve Boyd 8e9a0243bb Merge branch '3.1' into 3 2020-11-12 14:46:41 +13:00
Robbie Averill cb15845a95
Merge pull request #62 from creative-commoners/pulls/3.1/travis
Update travis 3.1
2020-06-23 09:34:53 -07:00
Steve Boyd 3564066245 Update travis 2020-06-23 16:26:32 +12:00
Steve Boyd 06995b2ec7 Merge branch '3.1' into 3 2020-06-18 13:30:39 +12:00
Maxime Rainville 01848af86d
Merge pull request #61 from creative-commoners/3.1
Update for 3.1
2020-06-15 18:35:27 +12:00
Steve Boyd e451f96b0b Update for 3.1 2020-06-15 16:17:53 +12:00
Robbie Averill d0a7db0b68
Merge pull request #60 from phptek/issue/58
FIX: Fixes #58 We always want $content (an array) passed to implode()
2019-12-16 12:04:39 -08:00
Russell Michell 42cc545414 FIX: Fixes #58 We always want $content (an array) passed to implode() 2019-12-16 10:06:55 +13:00
Robbie Averill 6234a971d1 Merge branch '3.0' 2019-08-28 10:56:39 +12:00
Robbie Averill 0d7c507b53 Use trusty in Travis builds 2019-08-28 10:56:33 +12:00
Robbie Averill d5313674c3 Merge branch '3.0' 2019-08-28 10:07:30 +12:00
Robbie Averill 32e2f9f84f FIX Ensure test uses database cache, it asserts assuming it is configured 2019-08-28 10:07:21 +12:00
Robbie Averill 5b967fd5d3 Merge branch '3.0' 2019-06-26 15:26:08 +12:00
Robbie Averill 943f393ee8
Merge pull request #55 from ichaber/fix/54-clean-temp-file
#54 Cleanup temporary file
2019-06-26 15:25:20 +12:00
Charlie Bergthaler 242e5a307d FIX Change check for cleanup of temp files only if file is instance of File. 2019-06-26 15:18:31 +12:00
Charlie Bergthaler a9270d73ad FIX Cleanup temporary file after extracting content in TikaServerTextExtractor and TikaTextExtractor 2019-06-26 15:18:31 +12:00
Robbie Averill b4c634bb1f Merge branch '3.0' 2019-06-26 15:17:42 +12:00
Robbie Averill 20079bd33f Remove SilverStripe 4.0-4.2 from Travis builds 2019-06-26 15:17:34 +12:00
Guy Marriott c5cfe4ea1e
Merge pull request #53 from martinhipp/bugfix/tika-version-number-checking
Return version number as string instead of float
2019-04-05 10:07:00 +13:00
Martin Hipp bff5eb2b79
Return version number as string instead of floats so '1.20' does not become 1.2 2019-04-05 09:56:45 +13:00
Robbie Averill 801cd9cacb Merge branch '3.0' 2019-02-22 09:34:11 +07:00
Dylan Wagstaff 9c2da06178
Merge pull request #52 from creative-commoners/pulls/3.0/fix-tests
FIX Ensure Tika responses are casted as strings, fixes broken unit tests
2019-02-14 10:15:55 +13:00
Robbie Averill 276fd9c856 Add PSR-4 autoloader and update Travis to include PHP 7.3 and SS 4.3 2019-02-13 11:42:51 +07:00
Robbie Averill 759d92ccb4 FIX Ensure Tika responses are casted as strings, fixes broken unit tests
They can be returned as a stream, but the TikaRestClient response is documented as a string
2019-02-13 11:42:51 +07:00
Robbie Averill b9502653c2
Merge pull request #51 from ishannz/patch-1
Update isAvailable check to work for identical versions
2019-02-13 11:28:04 +07:00
Robbie Averill 86eba78064 Add tests for isAvailable() 2019-02-13 11:23:28 +07:00
Ishan Jayamanne 21ed6e0f86 Update isAvailable check to work for identical versions
Tika server reports it's version as "Apache Tika 1.7". Unfortunately, `version_compare` in PHP says that version "1.7" is less than version "1.7.0", meaning that Tika server was incorrectly being ruled out unless you used Tika server version 1.8 (where "1.8" > "1.7.0").

Changing the comparison string to just "1.7" means they match exactly, and therefore `version_compare` will return `0` rather than `-1`.
2019-02-13 11:15:54 +07:00
Robbie Averill 75a8c66eee Merge branch '3.0' 2018-07-09 10:04:00 +12:00
Robbie Averill 07c000dc0d Remove obsolete branch alias 2018-07-09 10:03:13 +12:00
Dylan Wagstaff 03d1fef4ae
Merge pull request #47 from creative-commoners/pulls/3.0/fix-extractors
FIX Update Guzzle implementations in extractors to ensure they're working
2018-07-09 09:57:17 +12:00
Robbie Averill e1e7cdbfa4 FIX Update SolrCellTextExtractor to use a Guzzle 6 API implementation 2018-07-06 16:11:59 +12:00
Robbie Averill 231a2091af FIX Update Guzzle implementations in Tika extractors 2018-07-06 16:11:59 +12:00