tonyair/silverstripe-textextraction
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-textextraction synced 2024-06-30 08:29:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from creative-commoners/pulls/3.0/fix-tests

Browse Source 
FIX Ensure Tika responses are casted as strings, fixes broken unit tests
This commit is contained in:
Dylan Wagstaff 2019-02-14 10:15:55 +13:00 committed by GitHub
commit 9c2da06178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -19,6 +19,8 @@ matrix:
- php: 7.1 - php: 7.1
env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=PGSQL RECIPE_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.2 - php: 7.2
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
- php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
before_script: before_script:
@ -34,7 +36,7 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-core "$RECIPE_VERSION" - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.1.x-dev; fi - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql 2.1.x-dev; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

6
composer.json
View File

@ -29,6 +29,12 @@
"squizlabs/php_codesniffer": "^3", "squizlabs/php_codesniffer": "^3",
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7"
}, },
"autoload": {
"psr-4": {
"SilverStripe\\TextExtraction\\": "src/",
"SilverStripe\\TextExtraction\\Tests\\": "tests/"
}
},
"suggest": { "suggest": {
"ext-fileinfo": "Improved support for file mime detection" "ext-fileinfo": "Improved support for file mime detection"
}, },

2
src/Rest/TikaRestClient.php
View File

@ -149,7 +149,7 @@ class TikaRestClient extends Client
Injector::inst()->get(LoggerInterface::class)->info($msg); Injector::inst()->get(LoggerInterface::class)->info($msg);
} }
return $text; return (string) $text;
} }
/** /**