Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
89 changes: 0 additions & 89 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ pipeline:
when:
matrix:
TESTS: checkers
syntax-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude build/.phan/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
when:
matrix:
TESTS: syntax-php5.6
syntax-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand Down Expand Up @@ -146,14 +138,6 @@ pipeline:
when:
matrix:
TESTS: sqlite-php7.0-webdav-apache
nodb-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
matrix:
DB: NODB
PHP: 5.6
nodb-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -178,14 +162,6 @@ pipeline:
matrix:
DB: NODB
PHP: 7.2
sqlite-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 5.6
sqlite-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -210,14 +186,6 @@ pipeline:
matrix:
DB: sqlite
PHP: 7.2
mysql-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql
PHP: 5.6
mysql-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -242,14 +210,6 @@ pipeline:
matrix:
DB: mysql
PHP: 7.2
mysql5.6-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.6
PHP: 5.6
mysql5.6-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -266,14 +226,6 @@ pipeline:
matrix:
DB: mysql5.6
PHP: 7.1
mysql5.5-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.5
PHP: 5.6
mysql5.5-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -290,16 +242,6 @@ pipeline:
matrix:
DB: mysql5.5
PHP: 7.1
postgres-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- sleep 10 # gives the database enough time to initialize
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
when:
matrix:
DB: postgres
PHP: 5.6
POSTGRES: 9
postgres-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand All @@ -318,14 +260,6 @@ pipeline:
matrix:
DB: postgres
PHP: 7.1
mysqlmb4-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
matrix:
DB: mysqlmb4
PHP: 5.6
mysqlmb4-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
Expand Down Expand Up @@ -700,9 +634,6 @@ matrix:
ENABLE_REDIS: true
- TESTS: db-codecov
ENABLE_REDIS: true
- DB: NODB
PHP: 5.6
ENABLE_REDIS: true
- DB: NODB
PHP: 7.0
ENABLE_REDIS: true
Expand All @@ -712,9 +643,6 @@ matrix:
- DB: NODB
PHP: 7.2
ENABLE_REDIS: false
- DB: sqlite
PHP: 5.6
ENABLE_REDIS: true
- DB: sqlite
PHP: 7.0
ENABLE_REDIS: true
Expand All @@ -724,9 +652,6 @@ matrix:
- DB: sqlite
PHP: 7.2
ENABLE_REDIS: false
- DB: mysql
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql
PHP: 7.0
ENABLE_REDIS: true
Expand All @@ -736,28 +661,18 @@ matrix:
- DB: mysql
PHP: 7.2
ENABLE_REDIS: false
- DB: mysql5.6
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql5.6
PHP: 7.0
ENABLE_REDIS: true
- DB: mysql5.6
PHP: 7.1
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 7.0
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 7.1
ENABLE_REDIS: true
- DB: postgres
PHP: 5.6
POSTGRES: 9
ENABLE_REDIS: true
- DB: postgres
PHP: 7.0
POSTGRES: 9
Expand All @@ -770,9 +685,6 @@ matrix:
PHP: 7.1
POSTGRES: 10
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 5.6
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 7.0
ENABLE_REDIS: true
Expand Down Expand Up @@ -820,7 +732,6 @@ matrix:
- TESTS: acceptance
TESTS-ACCEPTANCE: login
- TESTS: jsunit
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
- TESTS: syntax-php7.1
- TESTS: phan
Expand Down
2 changes: 1 addition & 1 deletion config/config.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@
* server configuration above, and perform HA on the hostname.
*
* Redis Cluster support requires the php module phpredis in version 3.0.0 or
* higher for PHP 7+ or phpredis in version 2.2.8 for PHP 5.6.
* higher.
*
* Available failover modes:
* - \RedisCluster::FAILOVER_NONE - only send commands to master nodes (default)
Expand Down
8 changes: 4 additions & 4 deletions lib/versioncheck.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

// Show warning if a PHP version below 5.6.0 is used, this has to happen here
// because base.php will already use 5.6 syntax.
if (version_compare(PHP_VERSION, '5.6.0') === -1) {
// Show warning if a PHP version below 7.0 is used, this has to happen here
// because base.php will already use 7.0 syntax.
if (version_compare(PHP_VERSION, '7.0') === -1) {
http_response_code(500);
echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
echo 'This version of Nextcloud requires at least PHP 7.0<br/>';
echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
exit(-1);
}
Expand Down