Skip to content

Commit 11874cd

Browse files
committed
Completely switch to php 7.4
1 parent ac736ef commit 11874cd

File tree

6 files changed

+288
-150
lines changed

6 files changed

+288
-150
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ cache:
1111
- node_modules
1212

1313
php:
14-
- 7.3
1514
- 7.4
1615

1716
services:

Resources/doc/01-installation-dev.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ Sudo for developer account
120120
echo "DEVELOPERS ALL=NOPASSWD: SERVICE_CMDS" | sudo tee -a /etc/sudoers.d/developers > /dev/null
121121

122122

123-
Install MySQL
124-
~~~~~~~~~~~~~
125-
Install mysql 5.5 using command ``sudo apt-get install -y default-mysql-client default-mysql-server``. Set ``root`` as password for ``root`` account. Update ``my.cnf`` and restart mysql
123+
Install MariaDB
124+
~~~~~~~~~~~~~~~
125+
Install MariaDB using command ``sudo apt-get install -y default-mysql-client default-mysql-server``. Set ``root`` as password for ``root`` account. Update ``my.cnf`` and restart mysql
126126

127127
::
128128

bin/deploy-to-prod.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
2-
# We should deploy only build for php 7.3
3-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ $(phpenv version-name) = "7.3" ]; then
2+
# We should deploy only build for php 7.4
3+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ $(phpenv version-name) = "7.4" ]; then
44
eval "$(ssh-agent -s)"
55
chmod 600 .travis/deploy.key
66
ssh-add .travis/deploy.key

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^7.3.0",
21+
"php": "^7.4.0",
2222
"ext-ctype": "*",
2323
"ext-iconv": "*",
2424
"ext-pdo": "*",
@@ -72,9 +72,6 @@
7272
"vimeo/psalm": "3.*"
7373
},
7474
"config": {
75-
"platform": {
76-
"php": "7.3.20"
77-
},
7875
"preferred-install": {
7976
"*": "dist"
8077
},

0 commit comments

Comments
 (0)