diff --git a/.travis.yml b/.travis.yml index 94f608ae..b00f9b5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,31 @@ sudo: false env: global: - - COMPOSER_ROOT_VERSION=1.4.x-dev + - COMPOSER_ROOT_VERSION=1.x-dev - CORE_RELEASE=master matrix: fast_finish: true include: - php: 5.6 - env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 + env: DB=MYSQL PHPUNIT_TEST=1 - php: 7.0 env: DB=MYSQL PHPUNIT_TEST=1 - php: 7.1 - env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1 + env: DB=MYSQL PHPUNIT_TEST=1 + - php: 7.2 + env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 PHPCS_TEST=1 + - php: 7.2 + env: DB=MYSQL PHPUNIT_TEST=1 PDO=1 + - php: 7.3 + env: DB=MYSQL PHPUNIT_TEST=1 + - php: 7.3 + env: DB=PGSQL PHPUNIT_TEST=1 before_script: # Init PHP + - printf "\n" | pecl install imagick + - composer self-update || true - phpenv rehash - phpenv config-rm xdebug.ini - export PATH=~/.config/composer/vendor/bin:$PATH @@ -28,6 +38,7 @@ before_script: - composer validate - composer install --prefer-dist - composer require --prefer-dist --no-update silverstripe/recipe-cms:4.4.x-dev + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev --prefer-dist; fi - composer update --prefer-dist - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1d2d9665..1b07be6c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -6,5 +6,13 @@ Requires PHPUnit ^5.7 tests/php - + + + + src/ + + tests/php/ + + + diff --git a/src/Flysystem/FlysystemAssetStore.php b/src/Flysystem/FlysystemAssetStore.php index f3ae5cc9..fff4b8d5 100644 --- a/src/Flysystem/FlysystemAssetStore.php +++ b/src/Flysystem/FlysystemAssetStore.php @@ -1016,7 +1016,7 @@ private function searchForEquivalentFileID($asset) [ ['"FileHash" like ?' => DB::get_conn()->escapeString($parsedFileID['Hash']) . '%'], ['not "FileHash" like ?' => DB::get_conn()->escapeString($file->getHash())], - 'WasPublished' => true + '"WasPublished"' => true ], "", 1