Raise PHP version number to PHP 7.0
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
33a6e265b2
commit
6d95f90361
89
.drone.yml
89
.drone.yml
|
@ -21,14 +21,6 @@ pipeline:
|
||||||
when:
|
when:
|
||||||
matrix:
|
matrix:
|
||||||
TESTS: checkers
|
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:
|
syntax-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -146,14 +138,6 @@ pipeline:
|
||||||
when:
|
when:
|
||||||
matrix:
|
matrix:
|
||||||
TESTS: sqlite-php7.0-webdav-apache
|
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:
|
nodb-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -178,14 +162,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: NODB
|
DB: NODB
|
||||||
PHP: 7.2
|
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:
|
sqlite-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -210,14 +186,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: sqlite
|
DB: sqlite
|
||||||
PHP: 7.2
|
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:
|
mysql-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -242,14 +210,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: mysql
|
DB: mysql
|
||||||
PHP: 7.2
|
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:
|
mysql5.6-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -266,14 +226,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: mysql5.6
|
DB: mysql5.6
|
||||||
PHP: 7.1
|
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:
|
mysql5.5-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -290,16 +242,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: mysql5.5
|
DB: mysql5.5
|
||||||
PHP: 7.1
|
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:
|
postgres-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -318,14 +260,6 @@ pipeline:
|
||||||
matrix:
|
matrix:
|
||||||
DB: postgres
|
DB: postgres
|
||||||
PHP: 7.1
|
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:
|
mysqlmb4-php7.0:
|
||||||
image: nextcloudci/php7.0:php7.0-16
|
image: nextcloudci/php7.0:php7.0-16
|
||||||
commands:
|
commands:
|
||||||
|
@ -700,9 +634,6 @@ matrix:
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- TESTS: db-codecov
|
- TESTS: db-codecov
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: NODB
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: NODB
|
- DB: NODB
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
|
@ -712,9 +643,6 @@ matrix:
|
||||||
- DB: NODB
|
- DB: NODB
|
||||||
PHP: 7.2
|
PHP: 7.2
|
||||||
ENABLE_REDIS: false
|
ENABLE_REDIS: false
|
||||||
- DB: sqlite
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: sqlite
|
- DB: sqlite
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
|
@ -724,9 +652,6 @@ matrix:
|
||||||
- DB: sqlite
|
- DB: sqlite
|
||||||
PHP: 7.2
|
PHP: 7.2
|
||||||
ENABLE_REDIS: false
|
ENABLE_REDIS: false
|
||||||
- DB: mysql
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: mysql
|
- DB: mysql
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
|
@ -736,28 +661,18 @@ matrix:
|
||||||
- DB: mysql
|
- DB: mysql
|
||||||
PHP: 7.2
|
PHP: 7.2
|
||||||
ENABLE_REDIS: false
|
ENABLE_REDIS: false
|
||||||
- DB: mysql5.6
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: mysql5.6
|
- DB: mysql5.6
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: mysql5.6
|
- DB: mysql5.6
|
||||||
PHP: 7.1
|
PHP: 7.1
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: mysql5.5
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: mysql5.5
|
- DB: mysql5.5
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: mysql5.5
|
- DB: mysql5.5
|
||||||
PHP: 7.1
|
PHP: 7.1
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: postgres
|
|
||||||
PHP: 5.6
|
|
||||||
POSTGRES: 9
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: postgres
|
- DB: postgres
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
POSTGRES: 9
|
POSTGRES: 9
|
||||||
|
@ -770,9 +685,6 @@ matrix:
|
||||||
PHP: 7.1
|
PHP: 7.1
|
||||||
POSTGRES: 10
|
POSTGRES: 10
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
- DB: mysqlmb4
|
|
||||||
PHP: 5.6
|
|
||||||
ENABLE_REDIS: true
|
|
||||||
- DB: mysqlmb4
|
- DB: mysqlmb4
|
||||||
PHP: 7.0
|
PHP: 7.0
|
||||||
ENABLE_REDIS: true
|
ENABLE_REDIS: true
|
||||||
|
@ -820,7 +732,6 @@ matrix:
|
||||||
- TESTS: acceptance
|
- TESTS: acceptance
|
||||||
TESTS-ACCEPTANCE: login
|
TESTS-ACCEPTANCE: login
|
||||||
- TESTS: jsunit
|
- TESTS: jsunit
|
||||||
- TESTS: syntax-php5.6
|
|
||||||
- TESTS: syntax-php7.0
|
- TESTS: syntax-php7.0
|
||||||
- TESTS: syntax-php7.1
|
- TESTS: syntax-php7.1
|
||||||
- TESTS: phan
|
- TESTS: phan
|
||||||
|
|
|
@ -1083,7 +1083,7 @@ $CONFIG = array(
|
||||||
* server configuration above, and perform HA on the hostname.
|
* server configuration above, and perform HA on the hostname.
|
||||||
*
|
*
|
||||||
* Redis Cluster support requires the php module phpredis in version 3.0.0 or
|
* 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:
|
* Available failover modes:
|
||||||
* - \RedisCluster::FAILOVER_NONE - only send commands to master nodes (default)
|
* - \RedisCluster::FAILOVER_NONE - only send commands to master nodes (default)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// Show warning if a PHP version below 5.6.0 is used, this has to happen here
|
// Show warning if a PHP version below 7.0 is used, this has to happen here
|
||||||
// because base.php will already use 5.6 syntax.
|
// because base.php will already use 7.0 syntax.
|
||||||
if (version_compare(PHP_VERSION, '5.6.0') === -1) {
|
if (version_compare(PHP_VERSION, '7.0') === -1) {
|
||||||
http_response_code(500);
|
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.';
|
echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue