Skip to content

Commit 94f0764

Browse files
authored
Merge pull request moodlehq#149 from paulholden/php-73
Increase default PHP version to 7.3.
2 parents f45146f + 0efb150 commit 94f0764

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ env:
66
# PostgreSQL highest, lowest php supported
77
# We have set the "phpunit-full" to run against master
88
- "PHP=7.4 DB=pgsql GIT=master SUITE=phpunit-full"
9-
- "PHP=7.2 DB=pgsql GIT=master SUITE=phpunit-full"
9+
- "PHP=7.3 DB=pgsql GIT=master SUITE=phpunit-full"
1010
# Other dev branches, also "phpunit-full"
1111
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full"
12-
- "PHP=7.2 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full"
12+
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full"
1313
# Simpler "phpunit" for stables
1414
- "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=phpunit"
1515
- "PHP=7.2 DB=pgsql GIT=v3.10.0 SUITE=phpunit"
@@ -41,12 +41,12 @@ env:
4141
# PostgreSQL highest, lowest (2 browsers)
4242
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
4343
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
44-
- "PHP=7.2 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
45-
- "PHP=7.2 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
44+
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
45+
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
4646
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
4747
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
48-
- "PHP=7.2 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
49-
- "PHP=7.2 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
48+
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
49+
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
5050
- "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=behat BROWSER=chrome"
5151
- "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=behat BROWSER=firefox"
5252
- "PHP=7.2 DB=pgsql GIT=v3.10.0 SUITE=behat BROWSER=chrome"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ You can change the configuration of the docker images by setting various environ
172172
|-------------------------------------------|-----------|---------------------------------------|---------------|------------------------------------------------------------------------------|
173173
| `MOODLE_DOCKER_DB` | yes | pgsql, mariadb, mysql, mssql, oracle | none | The database server to run against |
174174
| `MOODLE_DOCKER_WWWROOT` | yes | path on your file system | none | The path to the Moodle codebase you intend to test |
175-
| `MOODLE_DOCKER_PHP_VERSION` | no | 7.4, 7.3, 7.2, 7.1, 7.0, 5.6 | 7.2 | The php version to use |
175+
| `MOODLE_DOCKER_PHP_VERSION` | no | 7.4, 7.3, 7.2, 7.1, 7.0, 5.6 | 7.3 | The php version to use |
176176
| `MOODLE_DOCKER_BROWSER` | no | firefox, chrome | firefox | The browser to run Behat against |
177177
| `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no | any value | not set | If set, dependencies for memcached, redis, solr, and openldap are added |
178178
| `MOODLE_DOCKER_WEB_HOST` | no | any valid hostname | localhost | The hostname for web |

bin/moodle-docker-compose

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dockercompose="docker-compose -f ${basedir}/base.yml"
2929
dockercompose="${dockercompose} -f ${basedir}/service.mail.yml"
3030

3131
# PHP Version.
32-
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-7.2}
32+
export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-7.3}
3333

3434
# Database flavour
3535
if [ "$MOODLE_DOCKER_DB" != 'pgsql' ];

bin/moodle-docker-compose.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SET DOCKERCOMPOSE=docker-compose -f "%BASEDIR%\base.yml"
2222
SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\service.mail.yml"
2323

2424
IF "%MOODLE_DOCKER_PHP_VERSION%"=="" (
25-
SET MOODLE_DOCKER_PHP_VERSION=7.2
25+
SET MOODLE_DOCKER_PHP_VERSION=7.3
2626
)
2727

2828
IF NOT "%MOODLE_DOCKER_DB%"=="pgsql" (

0 commit comments

Comments
 (0)