mirror of
https://github.com/silverstripe/silverstripe-textextraction
synced 2024-09-30 21:29:14 +02:00
Merge pull request #52 from creative-commoners/pulls/3.0/fix-tests
FIX Ensure Tika responses are casted as strings, fixes broken unit tests
This commit is contained in:
commit
9c2da06178
@ -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
|
||||||
|
|
||||||
|
@ -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"
|
||||||
},
|
},
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user