diff --git a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf index ce49124..100d142 100644 --- a/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf +++ b/Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf @@ -51,7 +51,7 @@ Additional php.ini defines, specific to this pool of workers. - E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED + E_ALL Off On Off diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index b37cf14..500dd54 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -184,9 +184,6 @@ RUN set -x \ && gem install sass \ # webpack && npm install -g webpack webpack-cli \ -# wpcli - && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ - && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ && pip install yamllint \ @@ -262,7 +259,6 @@ RUN set -x \ && phpcbf --version | grep -E 'version [.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ - && wp --allow-root --version | grep -E '[.0-9]+' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ && true diff --git a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf index 9521473..a4c282a 100644 --- a/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf +++ b/Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf @@ -51,7 +51,7 @@ Additional php.ini defines, specific to this pool of workers. - E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED + E_ALL Off On On diff --git a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 index 19c3436..ffab174 100644 --- a/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 +++ b/build/ansible/CONFIGURATIONS/php-fpm.conf.j2 @@ -57,7 +57,7 @@ include = /usr/local/etc/php-fpm.d/*.conf Additional php.ini defines, specific to this pool of workers. - {{ item.cfg[item.key].error_reporting | default(item.cfg[item.alt].error_reporting) }} + E_ALL {{ item.cfg[item.key].xmlrpc_errors | default(item.cfg[item.alt].xmlrpc_errors) }} {{ item.cfg[item.key].report_memleaks | default(item.cfg[item.alt].report_memleaks) }} {{ item.cfg[item.key].display_errors | default(item.cfg[item.alt].display_errors) }} diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index affb425..3e73eb7 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -621,6 +621,7 @@ software_available: command: curl https://symfony.com/installer -L -o /usr/local/bin/symfony post: chmod +x /usr/local/bin/symfony wpcli: + disabled: [5.2] check: wp --allow-root --version | grep -E '[.0-9]+' all: command: curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp