From 773d246a7e9ed2e8e0144278395aefffff795be4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 24 Jul 2016 17:17:41 +0200 Subject: [ticket/14670] Do not backup static attributes This seems to cause issues with the UI tests as the backed up static web driver does not seem to be properly initialized. PHPBB3-14670 --- travis/phpunit-mariadb-travis.xml | 2 +- travis/phpunit-mysql-travis.xml | 2 +- travis/phpunit-mysqli-travis.xml | 2 +- travis/phpunit-postgres-travis.xml | 2 +- travis/phpunit-sqlite3-travis.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'travis') diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml index 53a206b9b0..4b85124783 100644 --- a/travis/phpunit-mariadb-travis.xml +++ b/travis/phpunit-mariadb-travis.xml @@ -1,6 +1,6 @@ Date: Thu, 1 Sep 2016 20:35:35 -0700 Subject: [ticket/14761] myisam should be setup on PHP 5.5 (5.4 removed) PHPBB3-14761 --- travis/setup-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-database.sh b/travis/setup-database.sh index 3771f19073..cf196e401f 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -26,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi -- cgit v1.2.1 From e36da012645a6c376b0ecb306ee6b99e5437a410 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 26 Jul 2017 12:24:57 -0700 Subject: [ticket/15295] Restore tests on mysql and myisam PHPBB3-15295 --- travis/setup-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-database.sh b/travis/setup-database.sh index cf196e401f..cbd5e93e83 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -26,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi -- cgit v1.2.1 From 33f9333f13e1f61817f88ce6960e13e461a07020 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Dec 2018 21:18:39 +0100 Subject: [ticket/14948] Remove no longer needed or supported phpunit configs PHPBB3-14948 --- travis/phpunit-mariadb-travis.xml | 6 ++--- travis/phpunit-mysql-travis.xml | 46 -------------------------------------- travis/phpunit-mysqli-travis.xml | 6 ++--- travis/phpunit-postgres-travis.xml | 6 ++--- travis/phpunit-sqlite3-travis.xml | 6 ++--- 5 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 travis/phpunit-mysql-travis.xml (limited to 'travis') diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml index 4b85124783..35ade72d4e 100644 --- a/travis/phpunit-mariadb-travis.xml +++ b/travis/phpunit-mariadb-travis.xml @@ -7,8 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> @@ -19,10 +17,10 @@ ../tests/ui - ../tests/functional + ../tests/functional - ../tests/ui + ../tests/ui diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml deleted file mode 100644 index cccfc0aee8..0000000000 --- a/travis/phpunit-mysql-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - ../tests/ui - - - ../tests/functional - - - ../tests/ui - - - - - - slow - - - - - - - - - - - - - - - diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml index 4d649681b0..d2284086b9 100644 --- a/travis/phpunit-mysqli-travis.xml +++ b/travis/phpunit-mysqli-travis.xml @@ -7,8 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> @@ -19,10 +17,10 @@ ../tests/ui - ../tests/functional + ../tests/functional - ../tests/ui + ../tests/ui diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index ae56da37f5..6faab4d61a 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -7,8 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> @@ -19,10 +17,10 @@ ../tests/ui - ../tests/functional + ../tests/functional - ../tests/ui + ../tests/ui diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml index 8eabcc7243..633963c9fb 100644 --- a/travis/phpunit-sqlite3-travis.xml +++ b/travis/phpunit-sqlite3-travis.xml @@ -7,8 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> @@ -19,10 +17,10 @@ ../tests/ui - ../tests/functional + ../tests/functional - ../tests/ui + ../tests/ui -- cgit v1.2.1 From 978d883abb4f62f1b644bdab760fedbabdb61690 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 2 Jan 2019 20:34:45 +0100 Subject: [ticket/14948] Remove checks for unsupported PHP versions PHPBB3-14948 --- travis/setup-php-extensions.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'travis') diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index de27965e39..7d1400c3b3 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -42,16 +42,9 @@ function install_php_extension php_ini_file=$(find_php_ini) -# apc -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ] -then - echo 'Enabling APC PHP extension' - printf "\n" | pecl install apc - echo 'apc.enable_cli=1' >> "$php_ini_file" -else - echo 'Disabling Opcache' - echo 'opcache.enable=0' >> "$php_ini_file" -fi +# Disable opcache for testing +echo 'Disabling Opcache' +echo 'opcache.enable=0' >> "$php_ini_file" # APCu if [ `php -r "echo (int) (version_compare(PHP_VERSION, '7.0.0-dev', '>=') && version_compare(PHP_VERSION, '7.3.0-dev', '<'));"` == "1" ] -- cgit v1.2.1 From bd02c5bd085e957aa4341e7fc2df2199081ab069 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Oct 2019 12:07:35 +0200 Subject: [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0 PHPBB3-16051 --- travis/setup-database.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-database.sh b/travis/setup-database.sh index cbd5e93e83..b581ddfccb 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -31,7 +31,7 @@ then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi -if [ "$DB" == "mysql" -o "$DB" == "mysqli" -o "$DB" == "mariadb" ] +if [ "$DB" == "mysqli" -o "$DB" == "mariadb" ] then mysql -e 'create database IF NOT EXISTS phpbb_tests;' fi -- cgit v1.2.1 From 5ff519c7b23edd6821d2e4e084b8adbc504d0661 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 19 Oct 2019 11:33:55 +0200 Subject: [ticket/16185] Use /mode for -perm when checking executables The +mode notation is no longer supported and has been deprecated since 2005. PHPBB3-16185 --- travis/check-executable-files.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'travis') diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 1aa8dca073..6899373c1e 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -48,13 +48,13 @@ then '(' \ ${executable_files} \ ')' -a \ - -not -perm +100 \ + -not -perm /100 \ ')' -o \ '(' \ -not '(' \ ${executable_files} \ ')' -a \ - -perm +111 \ + -perm /111 \ ')' \ ')' \ ')' \ -- cgit v1.2.1 From bea1df7759a06428690dad00f1fa035c98b72f14 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 19 Oct 2019 11:49:43 +0200 Subject: [ticket/16185] Add mysql, postgresql to services and use mariadb 10.1 Updated GPG key signature according to mariadb documentation. PHPBB3-16185 --- travis/setup-mariadb.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'travis') diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 95445dcc55..2efe99cc2d 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -12,13 +12,14 @@ set -e set -x # MariaDB Series -VERSION='10.0' +VERSION='10.1' # Operating system codename, e.g. "precise" OS_CODENAME=$(lsb_release --codename --short) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) sudo apt-get purge -y mysql-common +sudo rm -rf /etc/mysql && sudo rm -rf /var/log/mysql && sudo rm -rf /var/lib/mysql && sudo rm -rf /var/lib/mysql-files && sudo rm -rf /var/lib/mysql-keyring if ! which add-apt-repository > /dev/null then @@ -27,7 +28,7 @@ then fi MIRROR_DOMAIN='ftp.osuosl.org' -sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db +sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update -- cgit v1.2.1 From 51bb05f2860ed086ea8ef502eb4120c952e110dd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Oct 2019 18:08:17 +0100 Subject: [ticket/12574] Introduce files for LDAP testing on travis PHPBB3-12574 --- travis/ldap/base.ldif | 5 +++++ travis/ldap/slapd.conf | 17 +++++++++++++++++ travis/setup-ldap.sh | 24 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 travis/ldap/base.ldif create mode 100644 travis/ldap/slapd.conf create mode 100755 travis/setup-ldap.sh (limited to 'travis') diff --git a/travis/ldap/base.ldif b/travis/ldap/base.ldif new file mode 100644 index 0000000000..26535b9e72 --- /dev/null +++ b/travis/ldap/base.ldif @@ -0,0 +1,5 @@ +dn:dc=example,dc=com +objectClass:dcObject +objectClass:organizationalUnit +dc:example +ou:foo diff --git a/travis/ldap/slapd.conf b/travis/ldap/slapd.conf new file mode 100644 index 0000000000..5fce95cee2 --- /dev/null +++ b/travis/ldap/slapd.conf @@ -0,0 +1,17 @@ +# See slapd.conf(5) for details on configuration options. +include /etc/ldap/schema/core.schema +include /etc/ldap/schema/cosine.schema +include /etc/ldap/schema/inetorgperson.schema +include /etc/ldap/schema/nis.schema + +pidfile /tmp/slapd/slapd.pid +argsfile /tmp/slapd/slapd.args + +modulepath /usr/lib/openldap + +database ldif +directory /tmp/slapd + +suffix "dc=example,dc=com" +rootdn "cn=admin,dc=example,dc=com" +rootpw adminadmin diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh new file mode 100755 index 0000000000..a8f4fddc49 --- /dev/null +++ b/travis/setup-ldap.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# This file is part of the phpBB Forum Software package. +# +# @copyright (c) phpBB Limited +# @license GNU General Public License, version 2 (GPL-2.0) +# +# For full copyright and license information, please see +# the docs/CREDITS.txt file. +# +set -e +set -x + +SLOWTESTS=$1 + +if [ "$SLOWTESTS" == '1' ] +then + sudo apt-get -y install ldap-utils slapd + echo "extension = ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + mkdir /tmp/slapd + slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & + sleep 3 + ldapadd -h localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f travis/ldap/base.ldif +fi -- cgit v1.2.1 From 2c3a24b678fa5070ffacd4a6bb3cfc26f648c07e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Nov 2019 11:52:44 +0100 Subject: [ticket/12574] Remove passwords manager dependency from ldap Also started to implement tests for ldap provider. PHPBB3-12574 --- travis/ldap/base.ldif | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'travis') diff --git a/travis/ldap/base.ldif b/travis/ldap/base.ldif index 26535b9e72..09fe7cecc6 100644 --- a/travis/ldap/base.ldif +++ b/travis/ldap/base.ldif @@ -1,5 +1,41 @@ -dn:dc=example,dc=com -objectClass:dcObject -objectClass:organizationalUnit -dc:example -ou:foo +dn: dc=example,dc=com +objectClass: top +objectClass: dcObject +objectClass: organization +o: example +dc: example + +dn: ou=foo,dc=example,dc=com +objectClass: organizationalUnit +ou: foo + +dn: cn=admin,dc=example,dc=com +objectClass: simpleSecurityObject +objectClass: organizationalRole +cn: admin +description: LDAP administrator +userPassword:: e1NTSEF9NytMR2gveUxTMzdsc3RRd1V1dENZSVA0TWdYdm9SdDY= + +dn: ou=group,dc=example,dc=com +objectClass: organizationalUnit +ou: group + +dn: cn=admin,ou=foo,dc=example,dc=com +objectClass: posixAccount +objectClass: inetOrgPerson +objectClass: organizationalPerson +objectClass: person +loginShell: /bin/bash +homeDirectory: /home/admin +uid: admin +cn: admin +uidNumber: 10000 +gidNumber: 10000 +sn: admin +mail: admin@example.com +userPassword:: e1NTSEF9WHpueGZURHZZc21JSkl6czdMVXBjdCtWYTA1dlMzVlQ= + +dn: cn=admin,ou=group,dc=example,dc=com +objectClass: posixGroup +gidNumber: 10000 +cn: admin -- cgit v1.2.1 From 0cd7033baad12acc2abcee38b023031322623dc4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Nov 2019 12:03:45 +0100 Subject: [ticket/12574] Run LDAP test as slow test and install ldap extension PHPBB3-12574 --- travis/setup-ldap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh index a8f4fddc49..699bb9eae8 100755 --- a/travis/setup-ldap.sh +++ b/travis/setup-ldap.sh @@ -15,7 +15,7 @@ SLOWTESTS=$1 if [ "$SLOWTESTS" == '1' ] then - sudo apt-get -y install ldap-utils slapd + sudo apt-get -y install ldap-utils slapd php5-ldap echo "extension = ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini mkdir /tmp/slapd slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & -- cgit v1.2.1 From 9aee50968e0ecb8b88000815b273d0395418e1ff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Nov 2019 12:16:56 +0100 Subject: [ticket/12574] Don't add extension to php config & set default username PHPBB3-12574 --- travis/setup-ldap.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh index 699bb9eae8..14b32d4048 100755 --- a/travis/setup-ldap.sh +++ b/travis/setup-ldap.sh @@ -16,7 +16,6 @@ SLOWTESTS=$1 if [ "$SLOWTESTS" == '1' ] then sudo apt-get -y install ldap-utils slapd php5-ldap - echo "extension = ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini mkdir /tmp/slapd slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & sleep 3 -- cgit v1.2.1 From 0d668fee3686d1df8a0415572cebb01025419cd6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Nov 2019 13:38:09 +0100 Subject: [ticket/12574] Fix incorrect setup() method declaration & ldap extension PHPBB3-12574 --- travis/setup-ldap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh index 14b32d4048..9be816d77d 100755 --- a/travis/setup-ldap.sh +++ b/travis/setup-ldap.sh @@ -15,7 +15,7 @@ SLOWTESTS=$1 if [ "$SLOWTESTS" == '1' ] then - sudo apt-get -y install ldap-utils slapd php5-ldap + sudo apt-get -y install ldap-utils slapd php-ldap mkdir /tmp/slapd slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & sleep 3 -- cgit v1.2.1 From 679f3b0c763d4546eb4959150f3908449f794331 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Nov 2019 19:03:23 +0100 Subject: [ticket/16216] Ignore not being able to disable xdebug PHPBB3-16216 --- travis/setup-php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index 67b87c0da7..dac88e2f94 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -59,7 +59,7 @@ then fi # Disable xdebug on travis -phpenv config-rm xdebug.ini +phpenv config-rm xdebug.ini || true # redis # Disabled redis for now as it causes travis to fail -- cgit v1.2.1 From c37e696c1cd13452a802d605f649852b055493ae Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Nov 2019 21:33:42 +0100 Subject: [ticket/16223] Add memcached config and PHP extension PHPBB3-16223 --- travis/phpunit-mysqli-travis.xml | 1 + travis/phpunit-postgres-travis.xml | 1 + travis/phpunit-sqlite3-travis.xml | 1 + travis/setup-php-extensions.sh | 3 +++ 4 files changed, 6 insertions(+) (limited to 'travis') diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml index d2284086b9..0f064ab996 100644 --- a/travis/phpunit-mysqli-travis.xml +++ b/travis/phpunit-mysqli-travis.xml @@ -38,6 +38,7 @@ + diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 6faab4d61a..f9b8a6f595 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -38,6 +38,7 @@ + diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml index 633963c9fb..1b1fa24e7d 100644 --- a/travis/phpunit-sqlite3-travis.xml +++ b/travis/phpunit-sqlite3-travis.xml @@ -38,6 +38,7 @@ + diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index 851704213e..e122be0597 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -57,6 +57,9 @@ fi # Disable xdebug on travis phpenv config-rm xdebug.ini || true +# memcached +echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + # redis # Disabled redis for now as it causes travis to fail # git clone git://github.com/nicolasff/phpredis.git redis -- cgit v1.2.1 From bc045fd19bc859e124db0046a5d0cfdbd764f43d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Nov 2019 22:04:24 +0100 Subject: [ticket/16223] Use install_php_extensions for installing memcached PHPBB3-16223 --- travis/setup-php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index e122be0597..2b0bbb5baf 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -58,7 +58,7 @@ fi phpenv config-rm xdebug.ini || true # memcached -echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini +install_php_extension 'memcached' "$php_ini_file" # redis # Disabled redis for now as it causes travis to fail -- cgit v1.2.1 From dac910d27ab7c8a95841f3bb28a3dfa6391fda84 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Nov 2019 22:19:03 +0100 Subject: [ticket/16223] Do not use install_php_extension for memcached PHPBB3-16223 --- travis/setup-php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index 2b0bbb5baf..142d3cc242 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -58,7 +58,7 @@ fi phpenv config-rm xdebug.ini || true # memcached -install_php_extension 'memcached' "$php_ini_file" +echo "extension = memcached.so" >> "$php_ini_file" # redis # Disabled redis for now as it causes travis to fail -- cgit v1.2.1 From 5ed02c21493ccbde7d5072cd74c0b118153f508c Mon Sep 17 00:00:00 2001 From: rubencm Date: Tue, 26 Nov 2019 08:36:32 +0100 Subject: [ticket/16223] Use register_php_extension instead of echo PHPBB3-16223 --- travis/setup-php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index 142d3cc242..0fcddb044f 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -58,7 +58,7 @@ fi phpenv config-rm xdebug.ini || true # memcached -echo "extension = memcached.so" >> "$php_ini_file" +register_php_extension memcached "$php_ini_file" # redis # Disabled redis for now as it causes travis to fail -- cgit v1.2.1 From 3089770fece7a4b6106ec91169d9e02465e778bc Mon Sep 17 00:00:00 2001 From: Alfredo Ramos Date: Thu, 28 Nov 2019 21:19:33 -0600 Subject: [ticket/16235] Fix PHP CodeSniffer ignore patterns PHPBB3-16235 --- travis/ext-sniff.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'travis') diff --git a/travis/ext-sniff.sh b/travis/ext-sniff.sh index ca4d2115ba..f346ba6c25 100755 --- a/travis/ext-sniff.sh +++ b/travis/ext-sniff.sh @@ -22,7 +22,6 @@ then -s \ --extensions=php \ --standard=build/code_sniffer/ruleset-php-extensions.xml \ - "--ignore=phpBB/ext/$EXTNAME/tests/*" \ - "--ignore=phpBB/ext/$EXTNAME/vendor/*" \ - "phpBB/ext/$EXTNAME" + --ignore=*/"$EXTNAME"/tests/*,*/"$EXTNAME"/vendor/* \ + phpBB/ext/"$EXTNAME" fi -- cgit v1.2.1