From 0091e59adb86f0127ebeb0b58825227ab8a00b44 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 11 Jan 2019 10:52:59 +0100 Subject: [PATCH 1/4] Fixes #467 Add tool: PHP CS Fixer --- README.md | 4 ++++ docker-compose.yml | 2 +- docs/_includes/links/tools.rst | 6 ++++++ docs/readings/available-tools.rst | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a5e7525c..fcbb7c77 100644 --- a/README.md +++ b/README.md @@ -552,6 +552,10 @@ The following tools will assist you on creating new projects easily as well as h :wrench: php code beautifier phpcbf is a command line tool that automatically correct coding standard violations. + + :wrench: php cs fixer + php-cs-fixer is a tool to automatically fix PHP Coding Standards issues. + :wrench: pm2 pm2 is Node.js Production Process Manager with a built-in Load Balancer. diff --git a/docker-compose.yml b/docker-compose.yml index 5669d1da..ee56efbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.67 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.68 hostname: php ## diff --git a/docs/_includes/links/tools.rst b/docs/_includes/links/tools.rst index 971341d9..bc3ef0e1 100644 --- a/docs/_includes/links/tools.rst +++ b/docs/_includes/links/tools.rst @@ -159,6 +159,12 @@ PHP CodeSniffer +.. |ext_lnk_tool_php_cs_fixer| raw:: html + + + PHP-CS-Fixer + + .. |ext_lnk_tool_phpcbf| raw:: html diff --git a/docs/readings/available-tools.rst b/docs/readings/available-tools.rst index 685b3d16..5cc8b301 100644 --- a/docs/readings/available-tools.rst +++ b/docs/readings/available-tools.rst @@ -66,6 +66,8 @@ The PHP container is your workhorse and these are your tools: +----------------------+---------------------------------------+ | ``phalcon`` | |ext_lnk_tool_phalcon| | +----------------------+---------------------------------------+ +| ``php-cs-fixer`` | |ext_lnk_tool_php_cs_fixer| | ++----------------------+---------------------------------------+ | ``phpcs`` | |ext_lnk_tool_phpcs| | +----------------------+---------------------------------------+ | ``phpcbf`` | |ext_lnk_tool_phpcbf| | From 26c90d4bec2d5729c37537c81eb2ac05207fbcc7 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Jan 2019 14:58:10 +0100 Subject: [PATCH 2/4] Use latest PHP-FPM Docker images --- README.md | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fcbb7c77..4fe992b1 100644 --- a/README.md +++ b/README.md @@ -632,6 +632,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | enchant | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | ereg | | ✔ | ✔ | ✔ | ✔ | | | | | | | exif | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | +| FFI | | | | | | | | | | 🗸 | | fileinfo | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | filter | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | ftp | 🗸 | 🗸 | 🗸 | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | diff --git a/docker-compose.yml b/docker-compose.yml index ee56efbe..b4bb9c00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.68 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.70 hostname: php ## From 8c6c95e32dad70f8905b954db510828fe4c5bcd3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Jan 2019 14:58:30 +0100 Subject: [PATCH 3/4] Bump version --- .devilbox/www/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index e829671f..88f1e9b9 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); $DEVILBOX_VERSION = 'v0.15'; -$DEVILBOX_DATE = '2019-01-08'; +$DEVILBOX_DATE = '2019-01-12'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // From 765ffb3232d4fce5aab14f4052bc29f6252c73aa Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Jan 2019 17:41:37 +0100 Subject: [PATCH 4/4] Update to latest PHP-FPM images --- README.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fe992b1..ff5f7013 100644 --- a/README.md +++ b/README.md @@ -643,7 +643,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module | iconv | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | | igbinary | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | imagick | | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | -| imap | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | +| imap | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | | interbase | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | intl | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | 🗸 | | ioncube | d | d | d | d | d | d | d | d | | | diff --git a/docker-compose.yml b/docker-compose.yml index b4bb9c00..bc65ffda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.70 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.71 hostname: php ##