From 7af0b2c98b825dca1ae49f22639a6bf32ac94af3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 18 Mar 2018 15:59:40 +0100 Subject: [PATCH] REL-0.5 Adding PHPCS/PHPCBF --- Dockerfiles/work/Dockerfile-5.4 | 10 ++++++++++ Dockerfiles/work/Dockerfile-5.5 | 10 ++++++++++ Dockerfiles/work/Dockerfile-5.6 | 10 ++++++++++ Dockerfiles/work/Dockerfile-7.0 | 10 ++++++++++ Dockerfiles/work/Dockerfile-7.1 | 10 ++++++++++ Dockerfiles/work/Dockerfile-7.2 | 10 ++++++++++ build/ansible/group_vars/all.yml | 14 ++++++++++++++ 7 files changed, 74 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8f4778c..b7b465e 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -187,6 +187,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -264,6 +272,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 5d16270..9bc6129 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -190,6 +190,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -268,6 +276,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 6e3b420..e480db7 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -190,6 +190,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -268,6 +276,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index f23dc6b..ed58447 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -190,6 +190,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -268,6 +276,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index a6675a7..8d8649a 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -190,6 +190,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -268,6 +276,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index f699f32..c3b6345 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -190,6 +190,14 @@ RUN set -x \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ \ +# phpcs + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ +&& chmod +x /usr/local/bin/phpcs \ + \ +# phpcbf + && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ +&& chmod +x /usr/local/bin/phpcbf \ + \ # symfony && curl https://symfony.com/installer -L -o /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ @@ -268,6 +276,8 @@ RUN set -x \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ + && phpcs --version | grep -E 'version [.0-9]+' \ + && phpcbf --version | grep -E 'version [.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 8536cff..eac4d8c 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -61,6 +61,8 @@ software_enabled: - linuxbrew - mysqldumpsecure - phalcon + - phpcs + - phpcbf - symfony - webpack - wpcli @@ -289,6 +291,18 @@ software_available: && ln -s /usr/local/src/phalcon-devtools/phalcon.php /usr/local/bin/phalcon \ && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ + phpcs: + check: phpcs --version | grep -E 'version [.0-9]+' + all: + command: | + curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar 2>/dev/null /usr/local/bin/phpcs \ + && chmod +x /usr/local/bin/phpcs \ + phpcbf: + check: phpcbf --version | grep -E 'version [.0-9]+' + all: + command: | + curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar 2>/dev/null /usr/local/bin/phpcbf \ + && chmod +x /usr/local/bin/phpcbf \ symfony: check: symfony --version | grep -E 'version\s*[.0-9]+' all: