diff options
| -rw-r--r-- | .travis.yml | 92 | ||||
| -rw-r--r-- | application/config/user_agents.php | 3 | ||||
| -rw-r--r-- | tests/codeigniter/helpers/text_helper_test.php | 7 |
3 files changed, 77 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 8525d5f6c..5070c24c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,17 @@ language: php -dist: trusty +os: linux +dist: xenial php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 - 7.2 - 7.3 - - 7.4snapshot + - 7.4 - nightly - - hhvm-3.30 - + env: - - DB=mysql - DB=mysqli - DB=pgsql - DB=sqlite @@ -22,38 +19,87 @@ env: - DB=pdo/pgsql - DB=pdo/sqlite -sudo: false +services: + - mysql + - postgresql + +cache: + directories: + - $HOME/.composer/cache before_script: - - sh -c "composer install --dev --no-progress" + - sh -c "composer install --no-progress" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7 -d mbstring.internal_encoding=UTF-8 vendor/bin/phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml -matrix: +jobs: allow_failures: - - php: 7.4snapshot - php: nightly - php: hhvm-3.30 - exclude: - - php: hhvm-3.30 + include: + - php: 5.4 + dist: trusty + env: DB=mysql + - php: 5.4 + dist: trusty + env: DB=mysqli + - php: 5.4 + dist: trusty env: DB=pgsql - - php: hhvm-3.30 + - php: 5.4 + dist: trusty + env: DB=sqlite + - php: 5.4 + dist: trusty + env: DB=pdo/mysql + - php: 5.4 + dist: trusty env: DB=pdo/pgsql - - php: 7.0 - env: DB=mysql - - php: 7.1 - env: DB=mysql - - php: 7.2 - env: DB=mysql - - php: 7.3 + - php: 5.4 + dist: trusty + env: DB=pdo/sqlite + - php: 5.5 + dist: trusty env: DB=mysql - - php: 7.4snapshot + - php: 5.5 + dist: trusty + env: DB=mysqli + - php: 5.5 + dist: trusty + env: DB=pgsql + - php: 5.5 + dist: trusty + env: DB=sqlite + - php: 5.5 + dist: trusty + env: DB=pdo/mysql + - php: 5.5 + dist: trusty + env: DB=pdo/pgsql + - php: 5.5 + dist: trusty + env: DB=pdo/sqlite + - php: 5.6 + dist: xenial env: DB=mysql - - php: nightly + - php: hhvm-3.30 + dist: trusty env: DB=mysql + - php: hhvm-3.30 + dist: trusty + env: DB=mysqli + - php: hhvm-3.30 + dist: trusty + env: DB=sqlite + - php: hhvm-3.30 + dist: trusty + env: DB=pdo/mysql + - php: hhvm-3.30 + dist: trusty + env: DB=pdo/sqlite branches: only: diff --git a/application/config/user_agents.php b/application/config/user_agents.php index c866903f6..21251f46f 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -218,5 +218,6 @@ $robots = array( 'curious george' => 'Curious George', 'ia_archiver' => 'Alexa Crawler', 'MJ12bot' => 'Majestic-12', - 'Uptimebot' => 'Uptimebot' + 'Uptimebot' => 'Uptimebot', + 'UptimeRobot' => 'UptimeRobot' ); diff --git a/tests/codeigniter/helpers/text_helper_test.php b/tests/codeigniter/helpers/text_helper_test.php index 36465f203..e51d96a29 100644 --- a/tests/codeigniter/helpers/text_helper_test.php +++ b/tests/codeigniter/helpers/text_helper_test.php @@ -64,7 +64,12 @@ class Text_helper_test extends CI_TestCase { public function test_convert_accented_characters() { - $this->ci_vfs_clone('application/config/foreign_chars.php'); + $path = 'application/config/foreign_chars.php'; + $this->ci_vfs_clone($path); + if (is_php('7.4')) + { + copy(PROJECT_BASE.$path, APPPATH.'../'.$path); + } $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ')); $this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü')); } |