From c2e7672dee63edc257a82ac82f077db356b5810d Mon Sep 17 00:00:00 2001 From: Alexis von Glasow Date: Wed, 15 Mar 2017 09:08:25 +0100 Subject: [PATCH 01/35] CI: Set up Travis. --- .travis.yml | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +-- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..1eaf4f4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,70 @@ +language: php + +matrix: + include: + - php: 5.5 + - php: 5.6 + - php: 7.0 + - php: 7.1 + env: + - ENABLE_XDEBUG=true + - php: 7.1 + env: + - ENABLE_DEVTOOLS=true + - php: nightly + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + - php: hhvm + sudo: required + dist: trusty + group: edge + allow_failures: + - php: nightly + - php: hhvm-3.12 + - php: hhvm + fast_finish: true + +os: + - linux + +notifications: + irc: "chat.freenode.net#hoaproject" + +sudo: false + +env: + global: + - secure: "AAAAB3NzaC1yc2EAAAADAQABAAAAgQCecwgg2D4ihDiYD9Af7hU7oroL108l1BJaxZ9N0GXmoaJj3JOHKjXgUjizhma5nftXRBJOcIhT4GsLAnFeNKgJv/97cAvm7miHeTLYPOiOpkrf/Zl7UIQ0MKSX91YKdneAGRDFaY0Tq5B9KjK68vu0Cof35h+cf59Ld3hTzrGPZw==" + +cache: + directories: + - vendor/ + +before_script: + - export PATH="$PATH:$HOME/.composer/vendor/bin" + - if [[ ! $ENABLE_XDEBUG ]]; then + phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; + fi + +script: + - composer install + - vendor/bin/hoa test:run + - if [[ $ENABLE_DEVTOOLS ]]; then + composer global require friendsofphp/php-cs-fixer; + vendor/bin/hoa devtools:cs --diff --dry-run .; + fi + +addons: + apt: + packages: + - unicode + - unicode-data + - ttf-ancient-fonts + - xfonts-efont-unicode + - unifont + - ttf-unifont + - locales + - language-pack-en + - language-pack-fr diff --git a/README.md b/README.md index c934a74..1c3e10f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ ---

- Build status - Code coverage + Build status + Code coverage Packagist License

From 900ce05e7d4eeddc32532076ac8c7646e8240349 Mon Sep 17 00:00:00 2001 From: Alexis von Glasow Date: Fri, 27 Oct 2017 14:33:34 +0200 Subject: [PATCH 02/35] fixup! CI: Set up Travis. --- .travis.yml | 2 ++ custom.ini | 1 + 2 files changed, 3 insertions(+) create mode 100644 custom.ini diff --git a/.travis.yml b/.travis.yml index 1eaf4f4..409c69a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,12 +44,14 @@ cache: before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" + - phpenv config-add custom.ini - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi script: - composer install + - php -i | grep 'ICU version' - vendor/bin/hoa test:run - if [[ $ENABLE_DEVTOOLS ]]; then composer global require friendsofphp/php-cs-fixer; diff --git a/custom.ini b/custom.ini new file mode 100644 index 0000000..b90acbd --- /dev/null +++ b/custom.ini @@ -0,0 +1 @@ +extension = "intl.so" From 726362e487f50c5dc3b2c24f737b2120abcc8d66 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 01:03:47 +0100 Subject: [PATCH 03/35] debuging travis --- .travis.yml | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 409c69a..6898735 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,42 +2,16 @@ language: php matrix: include: - - php: 5.5 - - php: 5.6 - - php: 7.0 - php: 7.1 env: - ENABLE_XDEBUG=true - - php: 7.1 - env: - - ENABLE_DEVTOOLS=true - - php: nightly - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - - php: hhvm - sudo: required - dist: trusty - group: edge - allow_failures: - - php: nightly - - php: hhvm-3.12 - - php: hhvm fast_finish: true os: - linux -notifications: - irc: "chat.freenode.net#hoaproject" - sudo: false -env: - global: - - secure: "AAAAB3NzaC1yc2EAAAADAQABAAAAgQCecwgg2D4ihDiYD9Af7hU7oroL108l1BJaxZ9N0GXmoaJj3JOHKjXgUjizhma5nftXRBJOcIhT4GsLAnFeNKgJv/97cAvm7miHeTLYPOiOpkrf/Zl7UIQ0MKSX91YKdneAGRDFaY0Tq5B9KjK68vu0Cof35h+cf59Ld3hTzrGPZw==" - cache: directories: - vendor/ @@ -50,17 +24,19 @@ before_script: fi script: + - php -i | grep 'intl' + - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ - composer install - - php -i | grep 'ICU version' - - vendor/bin/hoa test:run - - if [[ $ENABLE_DEVTOOLS ]]; then - composer global require friendsofphp/php-cs-fixer; - vendor/bin/hoa devtools:cs --diff --dry-run .; - fi +# - vendor/bin/hoa test:run +# - if [[ $ENABLE_DEVTOOLS ]]; then +# composer global require friendsofphp/php-cs-fixer; +# vendor/bin/hoa devtools:cs --diff --dry-run .; +# fi addons: apt: packages: + - libicu-dev - unicode - unicode-data - ttf-ancient-fonts From 6d4714d739f0a543402f27a67aa725151fd4415c Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 01:22:40 +0100 Subject: [PATCH 04/35] rebuild intl.so --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6898735..964df8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,9 @@ before_script: fi script: + - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /usr/local/src/php-src.tar.bz2 && cd /usr/local/src/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - php -i | grep 'intl' + - php -i | grep 'mbstring' - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ - composer install # - vendor/bin/hoa test:run From d902477181f94d45c13627f048e9b88775b45955 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 01:32:43 +0100 Subject: [PATCH 05/35] move workdir intl compilation on travis home --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 964df8d..a010876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_script: fi script: - - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /usr/local/src/php-src.tar.bz2 && cd /usr/local/src/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install + - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - php -i | grep 'intl' - php -i | grep 'mbstring' - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ From 614c77903eb2fe16077897334344a342716b8f31 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 01:41:35 +0100 Subject: [PATCH 06/35] working dir travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a010876..499a474 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ script: - php -i | grep 'intl' - php -i | grep 'mbstring' - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ + - cd $TRAVIS_BUILD_DIR - composer install # - vendor/bin/hoa test:run # - if [[ $ENABLE_DEVTOOLS ]]; then From 5322bfab7a89c6616856b54bd8f38b69a4a587d3 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 11:21:07 +0100 Subject: [PATCH 07/35] debug travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 499a474..e23c706 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ os: sudo: false -cache: - directories: - - vendor/ +#cache: +# directories: +# - vendor/ before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" @@ -30,7 +30,7 @@ script: - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ - cd $TRAVIS_BUILD_DIR - composer install -# - vendor/bin/hoa test:run + - vendor/bin/hoa test:run # - if [[ $ENABLE_DEVTOOLS ]]; then # composer global require friendsofphp/php-cs-fixer; # vendor/bin/hoa devtools:cs --diff --dry-run .; From 0af2d53c45d07b4e6ff18b23d2bd1877daba731f Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Fri, 24 Nov 2017 14:49:47 +0100 Subject: [PATCH 08/35] debug travis --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e23c706..1825fd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,6 @@ os: sudo: false -#cache: -# directories: -# - vendor/ - before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - phpenv config-add custom.ini @@ -24,17 +20,14 @@ before_script: fi script: + - phpenv config-rm intl.ini - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - php -i | grep 'intl' - php -i | grep 'mbstring' - - ls -lh /home/travis/.phpenv/versions/7.1.11/lib/php/extensions/no-debug-zts-20160303/ + - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions - cd $TRAVIS_BUILD_DIR - composer install - vendor/bin/hoa test:run -# - if [[ $ENABLE_DEVTOOLS ]]; then -# composer global require friendsofphp/php-cs-fixer; -# vendor/bin/hoa devtools:cs --diff --dry-run .; -# fi addons: apt: @@ -49,3 +42,4 @@ addons: - locales - language-pack-en - language-pack-fr + - tree From 236dab88ad96730017fde6cde2607fa3cb9d6c22 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:05:20 +0100 Subject: [PATCH 09/35] debug travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1825fd7..004a88f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,9 @@ before_script: fi script: - - phpenv config-rm intl.ini + - grep -Rni 'intl.so' /home/travis - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - php -i | grep 'intl' - - php -i | grep 'mbstring' - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions - cd $TRAVIS_BUILD_DIR - composer install From 2016b06098b0ea3b4ac9848cd7ec94720a2a45e8 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:19:48 +0100 Subject: [PATCH 10/35] debug travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 004a88f..e2887d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,13 @@ before_script: - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - -script: - - grep -Rni 'intl.so' /home/travis - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install + - grep -Rni 'intl.so' /home/travis/.phpenv/versions/7.1.11/ - php -i | grep 'intl' - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions - - cd $TRAVIS_BUILD_DIR + + +script: - composer install - vendor/bin/hoa test:run From 7ebfc052f4743d91844c0d270c1ab426d72eab2e Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:24:44 +0100 Subject: [PATCH 11/35] remove intl as extension --- custom.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/custom.ini b/custom.ini index b90acbd..e69de29 100644 --- a/custom.ini +++ b/custom.ini @@ -1 +0,0 @@ -extension = "intl.so" From 98b72a19de5208633261974af7cd963011f1f341 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:26:25 +0100 Subject: [PATCH 12/35] debug travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2887d5..fa1e99c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,9 @@ before_script: phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - - grep -Rni 'intl.so' /home/travis/.phpenv/versions/7.1.11/ - php -i | grep 'intl' - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions - + - cd $TRAVIS_BUILD_DIR script: - composer install From 59260b2403a1aa73b6a42c54731ed9b261d9f551 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:33:20 +0100 Subject: [PATCH 13/35] debug travis --- .travis.yml | 1 + custom.ini | 0 2 files changed, 1 insertion(+) delete mode 100644 custom.ini diff --git a/.travis.yml b/.travis.yml index fa1e99c..9023874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ before_script: - cd $TRAVIS_BUILD_DIR script: + - ls -lha - composer install - vendor/bin/hoa test:run diff --git a/custom.ini b/custom.ini deleted file mode 100644 index e69de29..0000000 From 8a67713395020ebab4a46278adcf62d9e0b162df Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:35:17 +0100 Subject: [PATCH 14/35] debug travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9023874..b3a5979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ sudo: false before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - - phpenv config-add custom.ini - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi From dac9721146d46c9759b43753ea7198bc5dc2b45c Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:42:39 +0100 Subject: [PATCH 15/35] debug travis --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3a5979..1da1239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,6 @@ before_script: - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - - php -i | grep 'intl' - - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions - - cd $TRAVIS_BUILD_DIR script: - ls -lha From 849e5403290a2dac4043711ccaf326f5e3bc021b Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:46:39 +0100 Subject: [PATCH 16/35] debug travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1da1239..5d2fe49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ os: sudo: false +cache: + directories: + - vendor/ + before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - if [[ ! $ENABLE_XDEBUG ]]; then From a4e2119a1efe23aedb93243a27e86c7972e8ecf3 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:48:52 +0100 Subject: [PATCH 17/35] debug travis --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d2fe49..cc6d506 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,17 +27,3 @@ script: - composer install - vendor/bin/hoa test:run -addons: - apt: - packages: - - libicu-dev - - unicode - - unicode-data - - ttf-ancient-fonts - - xfonts-efont-unicode - - unifont - - ttf-unifont - - locales - - language-pack-en - - language-pack-fr - - tree From 9711f8b296b7faaa78f847235a813532b782b5ef Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 12:56:59 +0100 Subject: [PATCH 18/35] debug travis --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc6d506..4de7366 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php matrix: include: - - php: 7.1 + - php: 7.0 env: - ENABLE_XDEBUG=true fast_finish: true @@ -12,10 +12,6 @@ os: sudo: false -cache: - directories: - - vendor/ - before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - if [[ ! $ENABLE_XDEBUG ]]; then From 26497301d66f9e90373d6879b8e08803dc67488f Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 13:19:19 +0100 Subject: [PATCH 19/35] debug travis --- .travis.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4de7366..4f32898 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,72 @@ language: php matrix: include: + - php: 5.5 + - php: 5.6 - php: 7.0 + - php: 7.1 env: - ENABLE_XDEBUG=true + - php: 7.1 + env: + - ENABLE_DEVTOOLS=true + - php: nightly + - php: hhvm-3.12 + sudo: required + dist: trusty + group: edge + - php: hhvm + sudo: required + dist: trusty + group: edge + allow_failures: + - php: nightly + - php: hhvm-3.12 + - php: hhvm fast_finish: true os: - linux +notifications: + irc: "chat.freenode.net#hoaproject" + sudo: false +env: + global: + - secure: "AAAAB3NzaC1yc2EAAAADAQABAAAAgQCecwgg2D4ihDiYD9Af7hU7oroL108l1BJaxZ9N0GXmoaJj3JOHKjXgUjizhma5nftXRBJOcIhT4GsLAnFeNKgJv/97cAvm7miHeTLYPOiOpkrf/Zl7UIQ0MKSX91YKdneAGRDFaY0Tq5B9KjK68vu0Cof35h+cf59Ld3hTzrGPZw==" + +cache: + directories: + - vendor/ + before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" + - phpenv config-add custom.ini - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi script: - - ls -lha - composer install + - php -i | grep 'ICU version' - vendor/bin/hoa test:run + - if [[ $ENABLE_DEVTOOLS ]]; then + composer global require friendsofphp/php-cs-fixer; + vendor/bin/hoa devtools:cs --diff --dry-run .; + fi + +addons: + apt: + packages: + - unicode + - unicode-data + - ttf-ancient-fonts + - xfonts-efont-unicode + - unifont + - ttf-unifont + - locales + - language-pack-en + - language-pack-fr From 082ea77de1215d5614c62bf14dc24116cabbb696 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 26 Nov 2017 13:25:25 +0100 Subject: [PATCH 20/35] debug travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f32898..2b1c700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,6 @@ cache: before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - - phpenv config-add custom.ini - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi From 7ea47437a20fa32042fa83f007e9a12c881bc9f9 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 00:14:01 +0100 Subject: [PATCH 21/35] debug travis --- .travis.yml | 43 +++++++------------------------------------ 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b1c700..b3a5979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,64 +2,35 @@ language: php matrix: include: - - php: 5.5 - - php: 5.6 - - php: 7.0 - php: 7.1 env: - ENABLE_XDEBUG=true - - php: 7.1 - env: - - ENABLE_DEVTOOLS=true - - php: nightly - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - - php: hhvm - sudo: required - dist: trusty - group: edge - allow_failures: - - php: nightly - - php: hhvm-3.12 - - php: hhvm fast_finish: true os: - linux -notifications: - irc: "chat.freenode.net#hoaproject" - sudo: false -env: - global: - - secure: "AAAAB3NzaC1yc2EAAAADAQABAAAAgQCecwgg2D4ihDiYD9Af7hU7oroL108l1BJaxZ9N0GXmoaJj3JOHKjXgUjizhma5nftXRBJOcIhT4GsLAnFeNKgJv/97cAvm7miHeTLYPOiOpkrf/Zl7UIQ0MKSX91YKdneAGRDFaY0Tq5B9KjK68vu0Cof35h+cf59Ld3hTzrGPZw==" - -cache: - directories: - - vendor/ - before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi + - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install + - php -i | grep 'intl' + - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions + - cd $TRAVIS_BUILD_DIR script: + - ls -lha - composer install - - php -i | grep 'ICU version' - vendor/bin/hoa test:run - - if [[ $ENABLE_DEVTOOLS ]]; then - composer global require friendsofphp/php-cs-fixer; - vendor/bin/hoa devtools:cs --diff --dry-run .; - fi addons: apt: packages: + - libicu-dev - unicode - unicode-data - ttf-ancient-fonts @@ -69,4 +40,4 @@ addons: - locales - language-pack-en - language-pack-fr - + - tree From 5719bda1e9c721756c46b04ae5bf723027d92967 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 00:37:48 +0100 Subject: [PATCH 22/35] Fix test related to Translit ASCII --- Source/Ustring.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Ustring.php b/Source/Ustring.php index dcf0f00..8d82c8b 100644 --- a/Source/Ustring.php +++ b/Source/Ustring.php @@ -423,7 +423,7 @@ function (array $matches) { ); } - $string = static::transcode($string, 'UTF-8', 'ASCII//IGNORE//TRANSLIT'); + $string = static::transcode($string, 'UTF-8', 'ASCII//TRANSLIT'); $this->_string = preg_replace('#(?:[\'"`^](\w))#u', '\1', $string); return $this; @@ -431,7 +431,7 @@ function (array $matches) { $string = \Normalizer::normalize($string, \Normalizer::NFKD); $string = preg_replace('#\p{Mn}+#u', '', $string); - $this->_string = static::transcode($string, 'UTF-8', 'ASCII//IGNORE//TRANSLIT'); + $this->_string = static::transcode($string, 'UTF-8', 'ASCII//TRANSLIT'); return $this; } From 0de8be2ee5a317b095cb806dc9f3996f90348676 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 00:38:00 +0100 Subject: [PATCH 23/35] debug travis --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3a5979..be5ceab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,13 +17,11 @@ before_script: - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - curl -Ss http://ie1.php.net/distributions/php-7.1.11.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - - php -i | grep 'intl' - - tree /home/travis/.phpenv/versions/7.1.11/lib/php/extensions + - echo $TRAVIS_PHP_VERSION + - curl -Ss http://ie1.php.net/distributions/php-$TRAVIS_PHP_VERSION.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - cd $TRAVIS_BUILD_DIR script: - - ls -lha - composer install - vendor/bin/hoa test:run @@ -39,5 +37,3 @@ addons: - ttf-unifont - locales - language-pack-en - - language-pack-fr - - tree From 2324518572e8fe9fed75379840055f35301513d7 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 00:45:25 +0100 Subject: [PATCH 24/35] debug travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index be5ceab..c963872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ matrix: - php: 7.1 env: - ENABLE_XDEBUG=true + - PHP_SRC_VERSION=7.1.11 fast_finish: true os: @@ -17,8 +18,7 @@ before_script: - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - echo $TRAVIS_PHP_VERSION - - curl -Ss http://ie1.php.net/distributions/php-$TRAVIS_PHP_VERSION.tar.bz2 -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install + - curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install - cd $TRAVIS_BUILD_DIR script: From ab086dc10e99fb9aac565ed7ad2add83f96bf993 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:03:48 +0100 Subject: [PATCH 25/35] cache compilation intl.so --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c963872..7e2832f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,27 @@ matrix: os: - linux +notifications: + irc: "chat.freenode.net#hoaproject" + sudo: false +env: + global: + - secure: "AAAAB3NzaC1yc2EAAAADAQABAAAAgQCecwgg2D4ihDiYD9Af7hU7oroL108l1BJaxZ9N0GXmoaJj3JOHKjXgUjizhma5nftXRBJOcIhT4GsLAnFeNKgJv/97cAvm7miHeTLYPOiOpkrf/Zl7UIQ0MKSX91YKdneAGRDFaY0Tq5B9KjK68vu0Cof35h+cf59Ld3hTzrGPZw==" + +cache: + directories: + - vendor/ + - /home/travis/php-src + before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make && make install + - [[ ! -d /home/travis/php-src ]] && curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make + - cd /home/travis/php-src/ext/intl && make install - cd $TRAVIS_BUILD_DIR script: @@ -37,3 +50,4 @@ addons: - ttf-unifont - locales - language-pack-en + - language-pack-fr From b4b684649f96ed0992ea6f3aa5ef241ea48c0a5d Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:08:24 +0100 Subject: [PATCH 26/35] debug travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e2832f..85fc7c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,9 @@ before_script: - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - [[ ! -d /home/travis/php-src ]] && curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make + - if [[ ! -d /home/travis/php-src ]]; then + curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make + fi - cd /home/travis/php-src/ext/intl && make install - cd $TRAVIS_BUILD_DIR From 82b54a2c5800ce4047feffb945c300481159ccfe Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:14:54 +0100 Subject: [PATCH 27/35] debug travis --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85fc7c9..3b0b41f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,14 @@ before_script: phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - if [[ ! -d /home/travis/php-src ]]; then - curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2 && cd /home/travis/ && mkdir php-src && tar xjf php-src.tar.bz2 -C php-src --strip-components=1 && cd php-src/ext/intl && phpize && ./configure && make + curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2; + cd /home/travis/; + mkdir php-src; + tar xjf php-src.tar.bz2 -C php-src --strip-components=1; + cd php-src/ext/intl; + phpize; + ./configure; + make; fi - cd /home/travis/php-src/ext/intl && make install - cd $TRAVIS_BUILD_DIR From fa94160a04f19b5b98412c9d6ac32693e40f771c Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:25:10 +0100 Subject: [PATCH 28/35] debug travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b0b41f..4492b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ env: cache: directories: - vendor/ - - /home/travis/php-src before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" From c32799d547c6435e3f12edb2e4373f37bc7da28a Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:33:39 +0100 Subject: [PATCH 29/35] debug travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4492b41..eaab6ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,14 @@ env: cache: directories: - vendor/ + - /home/travis/php-src before_script: - export PATH="$PATH:$HOME/.composer/vendor/bin" - if [[ ! $ENABLE_XDEBUG ]]; then phpenv config-rm xdebug.ini || echo "ext-xdebug is not available, cannot remove it."; fi - - if [[ ! -d /home/travis/php-src ]]; then + - if [[ `ls /home/travis/php-src | wc -l` -eq 0 ]]; then curl -Ss "http://ie1.php.net/distributions/php-${PHP_SRC_VERSION}.tar.bz2" -o /home/travis/php-src.tar.bz2; cd /home/travis/; mkdir php-src; From 427d0df481d1a3acb17fdd55874c494dac279a96 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:44:26 +0100 Subject: [PATCH 30/35] debug travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index eaab6ba..e9d786b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,9 @@ before_script: fi - cd /home/travis/php-src/ext/intl && make install - cd $TRAVIS_BUILD_DIR + - echo -e 'LANG=fr_FR.UTF-8' > /etc/default/locale + - dpkg-reconfigure -f noninteractive locales + - locale script: - composer install From 88eac76a15dffd6a1cd0c4d9a84bead06eb83d63 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:49:31 +0100 Subject: [PATCH 31/35] debug travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9d786b..00e672a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,8 +42,6 @@ before_script: fi - cd /home/travis/php-src/ext/intl && make install - cd $TRAVIS_BUILD_DIR - - echo -e 'LANG=fr_FR.UTF-8' > /etc/default/locale - - dpkg-reconfigure -f noninteractive locales - locale script: From c21ec71a13eb4d7d430421cb97c9af603ba2adc8 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 01:58:32 +0100 Subject: [PATCH 32/35] adapt locale test to two format --- Test/Unit/Ustring.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test/Unit/Ustring.php b/Test/Unit/Ustring.php index a49ce6e..c099662 100644 --- a/Test/Unit/Ustring.php +++ b/Test/Unit/Ustring.php @@ -192,8 +192,8 @@ public function case_collator(): void ) ->when($result = $collator->getLocale(\Locale::VALID_LOCALE)) ->then - ->string($result) - ->isEqualTo('fr'); + ->boolean(in_array($result, ['fr', 'fr_FR'])) + ->isTrue(); } public function case_safe_unsafe_pattern(): void From a8903b750525273be1d3b5b8730f73a05ac9f879 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 10:15:39 +0100 Subject: [PATCH 33/35] Travis-CI php ver 7.0 7.2 --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 00e672a..afb2001 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,17 @@ language: php matrix: include: + - php: 7.0 + env: + - PHP_SRC_VERSION=7.0.26 - php: 7.1 env: - ENABLE_XDEBUG=true - PHP_SRC_VERSION=7.1.11 + - php: 7.2 + - PHP_SRC_VERSION=7.2.0 + - php: nightly + - PHP_SRC_VERSION=7.2.0 fast_finish: true os: @@ -47,6 +54,10 @@ before_script: script: - composer install - vendor/bin/hoa test:run + - if [[ $ENABLE_DEVTOOLS ]]; then + composer global require friendsofphp/php-cs-fixer; + vendor/bin/hoa devtools:cs --diff --dry-run .; + fi addons: apt: From e1bddb70a26c862829d2440fa41794976823264e Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 10:40:20 +0100 Subject: [PATCH 34/35] debug travis --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index afb2001..9bcc4c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,13 @@ matrix: - ENABLE_XDEBUG=true - PHP_SRC_VERSION=7.1.11 - php: 7.2 + env: - PHP_SRC_VERSION=7.2.0 - php: nightly + env: - PHP_SRC_VERSION=7.2.0 + allow_failures: + - php: nightly fast_finish: true os: From 2da4699999ac1a3a9d4169c78b6b62c87ccb8947 Mon Sep 17 00:00:00 2001 From: Pierre Tomasina Date: Sun, 3 Dec 2017 10:47:39 +0100 Subject: [PATCH 35/35] php7.2 allow faillure on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9bcc4c2..7377001 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ matrix: - PHP_SRC_VERSION=7.2.0 allow_failures: - php: nightly + - php: 7.2 fast_finish: true os: