diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /travis | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'travis')
| -rw-r--r-- | travis/phpunit-mysql-travis.xml | 2 | ||||
| -rw-r--r-- | travis/phpunit-postgres-travis.xml | 2 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 715e66c223..5fa6c06e46 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -32,7 +32,7 @@ </groups> <php> - <server name="PHPBB_TEST_DBMS" value="phpbb_db_driver_mysqli" /> + <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli" /> <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" /> <server name="PHPBB_TEST_DBPORT" value="3306" /> <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" /> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index c397882d3c..88d9e0f46a 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -31,7 +31,7 @@ <php> <!-- "Real" test database --> <!-- uncomment, otherwise sqlite memory runs --> - <server name="PHPBB_TEST_DBMS" value="phpbb_db_driver_postgres"/> + <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\postgres"/> <server name="PHPBB_TEST_DBHOST" value="localhost" /> <server name="PHPBB_TEST_DBPORT" value="5432" /> <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" /> diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index beb04b0fef..95fc4ec1f8 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -42,7 +42,7 @@ server { root $PHPBB_ROOT_PATH/; index index.php index.html; - location ~ \.php$ { + location ~ \.php { fastcgi_pass unix:$PHP_FPM_SOCK; include fastcgi_params; } |