Merge pull request #972 from virtualtam/travis/trusty

Travis: switch to Ubuntu Trusty build environment
This commit is contained in:
VirtualTam 2017-09-19 19:22:33 +02:00 committed by GitHub
commit 0cba184cf8
4 changed files with 20 additions and 25 deletions

View file

@ -1,12 +1,6 @@
sudo: false sudo: false
dist: precise dist: trusty
language: php language: php
addons:
apt:
packages:
- locales
- language-pack-de
- language-pack-fr
cache: cache:
directories: directories:
- $HOME/.composer/cache - $HOME/.composer/cache
@ -18,6 +12,7 @@ php:
install: install:
- composer self-update - composer self-update
- composer install --prefer-dist - composer install --prefer-dist
- locale -a
script: script:
- make clean - make clean
- make check_permissions - make check_permissions

View file

@ -81,12 +81,12 @@ class UtilsDeTest extends UtilsTest
} }
/** /**
* Test autoLocale with multiples value, the second one is valid * Test autoLocale with multiples value, the second one is available
*/ */
public function testAutoLocaleMultipleSecondValid() public function testAutoLocaleMultipleSecondAvailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
$header = 'pt_BR,fr-fr'; $header = 'mag_IN,fr-fr';
autoLocale($header); autoLocale($header);
$this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsDeTest extends UtilsTest
} }
/** /**
* Test autoLocale with an invalid value: defaults to en_US. * Test autoLocale with an unavailable value: defaults to en_US.
*/ */
public function testAutoLocaleInvalid() public function testAutoLocaleUnavailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
autoLocale('pt_BR'); autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current); setlocale(LC_ALL, $current);

View file

@ -81,12 +81,12 @@ class UtilsEnTest extends UtilsTest
} }
/** /**
* Test autoLocale with multiples value, the second one is valid * Test autoLocale with multiples value, the second one is available
*/ */
public function testAutoLocaleMultipleSecondValid() public function testAutoLocaleMultipleSecondAvailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
$header = 'pt_BR,fr-fr'; $header = 'mag_IN,fr-fr';
autoLocale($header); autoLocale($header);
$this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('fr_FR.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsEnTest extends UtilsTest
} }
/** /**
* Test autoLocale with an invalid value: defaults to en_US. * Test autoLocale with an unavailable value: defaults to en_US.
*/ */
public function testAutoLocaleInvalid() public function testAutoLocaleUnavailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
autoLocale('pt_BR'); autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current); setlocale(LC_ALL, $current);

View file

@ -81,12 +81,12 @@ class UtilsFrTest extends UtilsTest
} }
/** /**
* Test autoLocale with multiples value, the second one is valid * Test autoLocale with multiples value, the second one is available
*/ */
public function testAutoLocaleMultipleSecondValid() public function testAutoLocaleMultipleSecondAvailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
$header = 'pt_BR,de-de'; $header = 'mag_IN,de-de';
autoLocale($header); autoLocale($header);
$this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('de_DE.utf8', setlocale(LC_ALL, 0));
@ -106,12 +106,12 @@ class UtilsFrTest extends UtilsTest
} }
/** /**
* Test autoLocale with an invalid value: defaults to en_US. * Test autoLocale with an unavailable value: defaults to en_US.
*/ */
public function testAutoLocaleInvalid() public function testAutoLocaleUnavailable()
{ {
$current = setlocale(LC_ALL, 0); $current = setlocale(LC_ALL, 0);
autoLocale('pt_BR'); autoLocale('mag_IN');
$this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0)); $this->assertEquals('en_US.utf8', setlocale(LC_ALL, 0));
setlocale(LC_ALL, $current); setlocale(LC_ALL, $current);