diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2d88c25b34..2f31eb74db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,6 @@ script: - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION $NOTESTS ./ - sh -c "if [ '$SLOWTESTS' != '1' -a '$DB' = 'mysqli' ]; then phpBB/vendor/bin/phpunit tests/lint_test.php; fi" - - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$NOTESTS' != '1' -a '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --verbose --stop-on-error; fi" - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - sh -c "set -x;if [ '$NOTESTS' = '1' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php index eea44e168c..a6a321dbde 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php @@ -27,7 +27,7 @@ class user_notifications_table_temp_index extends \phpbb\db\migration\migration return array( 'add_index' => array( $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), ), ), ); diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index 51cf90c8a0..d279af7fec 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -32,7 +32,7 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio ), 'add_unique_index' => array( $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), ), ), ); |