Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] drop php 7.0 and add phpunit7 [DO NOT MERGE YET] #35804

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
063c31d
Add mariadb 10.3 to Drone
Oct 22, 2018
07232b8
Detect MariaDB > 10.3.1 and assume mb4 support
Nov 7, 2018
f2fbc6d
Remove obsolete MariaDB 10.2 workaround
Nov 7, 2018
be62085
Add MySQL 8 which defaults to mb4 mode
Nov 8, 2018
70e13ba
Unit tests for mysql mb4 detection
Nov 15, 2018
c695ed5
Set min PHP version to 7.1
Feb 7, 2018
11c6a35
PHP 7.1+ is required
DeepDiver1975 Feb 7, 2018
c35a49e
[Workaround] .... until https://github.com/sebastianbergmann/phpunit-…
DeepDiver1975 Feb 12, 2018
99c7f2d
Remove our own sqlite autoincrement hack
DeepDiver1975 Jul 24, 2018
c6d14bc
Adjust drone for PHP7.1 like master
phil-davis Mar 30, 2019
a0555e9
Use is_iterable for PHP7.1
phil-davis Jul 11, 2019
4b8211c
Update to PHP 7.1 in travis - in case we use it
phil-davis Jul 11, 2019
01176fc
Put back empty line in db_structure.xml that was removed by PR 34783
phil-davis Jul 11, 2019
d62aa1d
Remove special PHP7.0 checks from Makefile
phil-davis Jul 11, 2019
56863a4
Make sure to have at least doctrine/dbal 2.8
phil-davis Jul 11, 2019
95718c7
Dismiss OCPostgreSqlPlatform as issues it addresses were fixed in doc…
VicDeo Apr 18, 2018
6228bf6
Updating phpunit/phpunit (6.5.14 => 7.5.13)
phil-davis Mar 22, 2019
72e365d
Adjust startsessionlistener.php for PHPUnit7 method signatures
phil-davis Mar 22, 2019
f2cd698
cleaner-ignore phpunit/phpunit phpunit.xsd
phil-davis Mar 23, 2019
82bfccf
ApiTest testUpdateShare ensure message is a string before passing
phil-davis Mar 23, 2019
46834e0
Do not try to mock private method themeExist
phil-davis Mar 23, 2019
b1ac9ef
Adjust LegacyDBTest testDecimal to pass on sqlite
phil-davis Mar 23, 2019
7b59cc4
Update method signatures for EncryptionTrait markTestSkipped and asse…
phil-davis Jul 9, 2019
0827e08
Updating phpunit/phpunit (7.5.13 => 7.5.14)
phil-davis Jul 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 37 additions & 63 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,6 @@ pipeline:
matrix:
TEST_SUITE: owncloud-coding-standard

php-phan-70:
image: owncloudci/php:7.0
pull: true
commands:
- make test-php-phan
when:
matrix:
TEST_SUITE: phan-70

php-phan-71:
image: owncloudci/php:7.1
pull: true
Expand Down Expand Up @@ -488,7 +479,7 @@ pipeline:
services:

mariadb:
image: mariadb:10.2
image: ${MARIADB_IMAGE=mariadb:10.2}
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
Expand All @@ -499,7 +490,7 @@ services:
DB_TYPE: mariadb

mysql:
image: mysql:5.5
image: ${MYSQL_IMAGE=mysql:5.5}
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
Expand All @@ -509,19 +500,21 @@ services:
matrix:
DB_TYPE: mysql

mysqlmb4:
image: mysql:5.7
mysql8:
image: ${MYSQL_IMAGE=mysql:8.0}
# see http://php.net/manual/en/mysqli.requirements.php
command: --default-authentication-plugin=mysql_native_password
environment:
- MYSQL_USER=owncloud
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=owncloud
- MYSQL_ROOT_PASSWORD=owncloud
when:
matrix:
DB_TYPE: mysqlmb4
DB_TYPE: mysql8

postgres:
image: postgres:9.4
image: ${POSTGRES_IMAGE=postgres:9.4}
environment:
- POSTGRES_USER=owncloud
- POSTGRES_PASSWORD=owncloud
Expand Down Expand Up @@ -672,11 +665,7 @@ matrix:
- PHP_VERSION: 7.3
TEST_SUITE: owncloud-coding-standard

# phan (runs on just PHP 7.0 because that has different dependencies for phan)
- TEST_SUITE: phan-70
PHP_VERSION: 7.0

# phan (runs multiple PHP v7.1+ to provide syntax checks of each PHP version)
# phan (runs multiple PHP v7.* to provide syntax checks of each PHP version)
- TEST_SUITE: phan
PHP_VERSION: 7.1

Expand All @@ -702,58 +691,66 @@ matrix:
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.1
DB_TYPE: mysqlmb4
DB_TYPE: mysql
# mb4 support, with innodb_file_format=Barracuda
MYSQL_IMAGE: mysql:5.7
TEST_SUITE: phpunit
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.1
DB_TYPE: postgres
# mb4 support by default
DB_TYPE: mysql8
TEST_SUITE: phpunit
COVERAGE: true
COVERAGE: false
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

# - PHP_VERSION: 7.1
# DB_TYPE: mariadb
# TEST_SUITE: phpunit
# INSTALL_SERVER: true

- PHP_VERSION: 7.1
DB_TYPE: oracle
DB_TYPE: postgres
POSTGRES_IMAGE: postgres:9.4
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.1
DB_TYPE: sqlite
DB_TYPE: postgres
POSTGRES_IMAGE: postgres:10.3
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

# PHP 7.0
- PHP_VERSION: 7.0
DB_TYPE: mysql
TEST_SUITE: phpunit
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.0
DB_TYPE: mysqlmb4
- PHP_VERSION: 7.1
DB_TYPE: mariadb
# mb4 support by default
MARIADB_IMAGE: mariadb:10.3
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.0
DB_TYPE: postgres
- PHP_VERSION: 7.1
DB_TYPE: oracle
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.0
DB_TYPE: oracle
- PHP_VERSION: 7.1
DB_TYPE: sqlite
TEST_SUITE: phpunit
COVERAGE: true
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

# PHP 7.2
# PHP 7.2
- PHP_VERSION: 7.2
DB_TYPE: sqlite
TEST_SUITE: phpunit
Expand All @@ -766,7 +763,7 @@ matrix:
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

# PHP 7.3
# PHP 7.3
- PHP_VERSION: 7.3
DB_TYPE: sqlite
TEST_SUITE: phpunit
Expand Down Expand Up @@ -813,15 +810,6 @@ matrix:
INSTALL_TESTING_APP: true

# Primary Objectstorage
- PHP_VERSION: 7.0
TEST_SUITE: phpunit
DB_TYPE: sqlite
OBJECTSTORE: swift
PRIMARY_OBJECTSTORE: swift
FILES_EXTERNAL_TYPE: swift
INSTALL_SERVER: true
INSTALL_TESTING_APP: true

- PHP_VERSION: 7.1
TEST_SUITE: phpunit
COVERAGE: true
Expand Down Expand Up @@ -1646,20 +1634,6 @@ matrix:
OWNCLOUD_LOG: true
CALDAV_CARDDAV_JOB: true

# This suite is part of the encryption app in later core versions
- PHP_VERSION: 7.0
TEST_SUITE: cli
BEHAT_SUITE: cliEncryption
DB_TYPE: mariadb
USE_SERVER: true
SERVER_PROTOCOL: https
INSTALL_SERVER: true
CHOWN_SERVER: true
OWNCLOUD_LOG: true
CONFIGURE_ENCRYPTION: true
ENCRYPTION_TYPE: masterkey
INSTALL_TESTING_APP: true

# This suite is part of the encryption app in later core versions
- PHP_VERSION: 7.1
TEST_SUITE: cli
Expand Down
Loading