Skip to content

Commit 7f46fc7

Browse files
committed
Use php 7.3 in build and deployment
1 parent 52ef47c commit 7f46fc7

File tree

7 files changed

+59
-51
lines changed

7 files changed

+59
-51
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ cache:
77
- node_modules
88

99
php:
10-
- 7.1
11-
- 7.2
1210
- 7.3
1311

1412
env:

Resources/doc/01-installation-dev.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ Add nginx repos:
3939
Install nginx via ``sudo apt-get update && sudo apt-get install -y nginx``
4040

4141

42-
Install PHP 7.1
42+
Install PHP 7.3
4343
~~~~~~~~~~~~~~~
44-
Add repository for php 7.1:
44+
Add repository for php 7.3:
4545

4646
::
4747

@@ -50,21 +50,22 @@ Add repository for php 7.1:
5050
sudo sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
5151

5252

53-
Install required php modules ``sudo apt-get update && sudo apt-get install -y php7.1 php7.1-cli php7.1-intl php7.1-xdebug php7.1-mysqlnd php7.1-xml php7.1-mbstring php7.1-zip php7.1-fpm php7.1-curl`` Create and enable ``common.ini``:
53+
Install required php modules ``sudo apt-get update && sudo apt-get install -y php7.3 php7.3-cli php7.3-intl php7.3-xdebug php7.3-mysqlnd php7.3-xml php7.3-mbstring php7.3-zip php7.3-fpm php7.3-curl`` Create and enable ``common.ini``:
5454

5555
::
5656

57-
echo "; priority=99" | sudo tee /etc/php/7.1/mods-available/common.ini > /dev/null
58-
echo "date.timezone=Europe/Minsk" | sudo tee -a /etc/php/7.1/mods-available/common.ini > /dev/null
59-
echo "short_open_tag=0" | sudo tee -a /etc/php/7.1/mods-available/common.ini > /dev/null
60-
echo "xdebug.max_nesting_level=250" | sudo tee -a /etc/php/7.1/mods-available/xdebug.ini > /dev/null
61-
echo "xdebug.var_display_max_depth=5" | sudo tee -a /etc/php/7.1/mods-available/xdebug.ini > /dev/null
57+
echo "; priority=99" | sudo tee /etc/php/7.3/mods-available/common.ini > /dev/null
58+
echo "date.timezone=Europe/Minsk" | sudo tee -a /etc/php/7.3/mods-available/common.ini > /dev/null
59+
echo "short_open_tag=0" | sudo tee -a /etc/php/7.3/mods-available/common.ini > /dev/null
60+
echo "xdebug.max_nesting_level=250" | sudo tee -a /etc/php/7.3/mods-available/xdebug.ini > /dev/null
61+
echo "xdebug.var_display_max_depth=5" | sudo tee -a /etc/php/7.3/mods-available/xdebug.ini > /dev/null
62+
echo "opcache.optimization_level=0x7FFFBBFF ; Remove some optimisations, otherwise php with xdebug will fail" | sudo tee -a /etc/php/7.3/mods-available/xdebug.ini > /dev/null
6263
sudo phpenmod common
6364

6465

65-
Open php fpm config file ``sudo mcedit /etc/php/7.1/fpm/pool.d/www.conf``, find ``listen = /run/php/php7.1-fpm.sock`` and replace with ``listen = 127.0.0.1:9000``.
66+
Open php fpm config file ``sudo mcedit /etc/php/7.3/fpm/pool.d/www.conf``, find ``listen = /run/php/php7.3-fpm.sock`` and replace with ``listen = 127.0.0.1:9000``.
6667

67-
Restart ``php-fpm`` using command ``sudo service php7.1-fpm restart``.
68+
Restart ``php-fpm`` using command ``sudo service php7.3-fpm restart``.
6869

6970

7071
Install node.js and Yarn

Resources/doc/todo.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Things to do
33

44
- Add tasks to build to execute tests, when they are appears
55
- Upgrade ``squizlabs/php_codesniffer`` to version 3 after solving https://github.com/phingofficial/phing/issues/716
6+
- Reremove optimization flags for opcache after fixing segfault with xdebug

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.1
3-
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ $(phpenv version-name) = "7.1" ]; then
2+
# We should deploy only build for php 7.3
3+
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ $(phpenv version-name) = "7.3" ]; then
44
eval "$(ssh-agent -s)"
55
chmod 600 .travis/deploy.key
66
ssh-add .travis/deploy.key

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@
412412
symfony-assets-install-prod,encore-build-assets-prod,dependencies-list-updates,dependencies-security-check" />
413413

414414
<target name="build-ci" description="Runs CI build" depends="copy-configs-ci,dependencies-install,clean,prepare,check-environment,
415-
projectdoc,composer-validate,phplint, psalm, symfony-twig-lint,symfony-yaml-lint,symfony-doctrine-schema-validate,phpmd,php-cs-fixer,
415+
projectdoc,composer-validate,phplint, psalm, symfony-twig-lint,symfony-yaml-lint,symfony-doctrine-schema-validate,phpmd,
416416
phpcs,phpcpd,symfony-regenerate-cache-dev,symfony-regenerate-cache-prod,symfony-assets-install-dev,encore-build-assets-dev,
417417
symfony-assets-install-prod,encore-build-assets-prod,dependencies-list-updates,dependencies-security-check" />
418418

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^7.1.3",
21+
"php": "^7.3.0",
2222
"ext-ctype": "*",
2323
"ext-iconv": "*",
2424
"ext-pdo": "*",
@@ -72,7 +72,7 @@
7272
},
7373
"config": {
7474
"platform": {
75-
"php": "7.1.25"
75+
"php": "7.3.0"
7676
},
7777
"preferred-install": {
7878
"*": "dist"

composer.lock

Lines changed: 42 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)