From 581897bfafb8c3f481ef3a5225f00546b658e595 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 3 Aug 2021 19:08:48 -0400 Subject: [PATCH 1/7] Handle both XDEBUG_SESSION and XDEBUG_PROFILE cookies Signed-off-by: Andrew Welch --- docker-config/nginx/default.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-config/nginx/default.conf b/docker-config/nginx/default.conf index 926a2b1..a483bca 100755 --- a/docker-config/nginx/default.conf +++ b/docker-config/nginx/default.conf @@ -1,9 +1,11 @@ # default Docker DNS server resolver 127.0.0.11; -map $cookie_XDEBUG_SESSION $my_fastcgi_pass { +# If a cookie doesn't exist, it evaluates to an empty string, so if neither cookie exists, it'll match : +# (empty string on either side of the :), but if either or both cookies are set, it won't match, and will hit the default rule +map $cookie_XDEBUG_SESSION:$cookie_XDEBUG_PROFILE $my_fastcgi_pass { default php_xdebug; - '' php; + ':' php; } server { From 58b0cb3b4c36dd104adaa665f6801d01fa1bb616 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 3 Aug 2021 19:10:30 -0400 Subject: [PATCH 2/7] Version 2.4.47 Signed-off-by: Andrew Welch --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26d7953..b9fdad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.4.47 - UNRELEASED +### Added +* Handle both `XDEBUG_SESSION` and `XDEBUG_PROFILE` cookies + ## 2.4.46 - 2021.07.29 ### Added * Added `putyourlightson/craft-autocomplete` for the Twig + Symfony plugin auto-complete, removed FauxTwigExtension.php From c91247734084ffca26f32b6928057f332ed25844 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 7 Aug 2021 14:07:16 -0400 Subject: [PATCH 3/7] Added `compiled_templates` as a bind mount in `docker-compose.yaml` for IDE autocompletion --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4312a71..189ab89 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,6 +34,7 @@ services: # Specific directories that need to be bind-mounted - ./cms/storage/logs:/var/www/project/cms/storage/logs:delegated - ./cms/storage/runtime/compiled_templates:/var/www/project/cms/storage/runtime/compiled_templates:delegated + - ./cms/storage/runtime/compiled_classes:/var/www/project/cms/storage/runtime/compiled_classes:delegated - ./cms/vendor:/var/www/project/cms/vendor:delegated # php - run php-fpm with xdebug php_xdebug: From e51d9bb30c2f1ff409652fa592107f5becb43eb8 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 7 Aug 2021 14:07:24 -0400 Subject: [PATCH 4/7] Version 2.4.47 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9fdad3..a4724b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 2.4.47 - UNRELEASED ### Added * Handle both `XDEBUG_SESSION` and `XDEBUG_PROFILE` cookies +* Added `compiled_templates` as a bind mount in `docker-compose.yaml` for IDE autocompletion ## 2.4.46 - 2021.07.29 ### Added From a386ff30a1d1e757b5ff15bb131dd8edf0902a1a Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 7 Aug 2021 14:13:41 -0400 Subject: [PATCH 5/7] Added `nystudio107/craft-autocomplete` for autocomplete of variables in Twig templates --- cms/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/composer.json b/cms/composer.json index 730b867..58853a1 100644 --- a/cms/composer.json +++ b/cms/composer.json @@ -3,7 +3,7 @@ "craftcms/cms": "^3.6.9", "vlucas/phpdotenv": "^3.4.0", "yiisoft/yii2-redis": "^2.0.6", - "putyourlightson/craft-autocomplete": "^1.0.0", + "nystudio107/craft-autocomplete": "^1.0.0", "nystudio107/craft-imageoptimize": "^1.0.0", "nystudio107/craft-fastcgicachebust": "^1.0.0", "nystudio107/craft-minify": "^1.2.5", From f2b01e49303831b5ab28ea0a53fc267009a6bc9d Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 7 Aug 2021 14:13:49 -0400 Subject: [PATCH 6/7] version 2.4.47 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4724b2..faca67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Added * Handle both `XDEBUG_SESSION` and `XDEBUG_PROFILE` cookies * Added `compiled_templates` as a bind mount in `docker-compose.yaml` for IDE autocompletion +* Added `nystudio107/craft-autocomplete` for autocomplete of variables in Twig templates ## 2.4.46 - 2021.07.29 ### Added From a381489c5b820ccebbc504df96aee91c84bcc4dd Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 7 Aug 2021 23:20:06 -0400 Subject: [PATCH 7/7] Version 2.4.47 Signed-off-by: Andrew Welch --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faca67a..61d95c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # nystudio107/craft Change Log -## 2.4.47 - UNRELEASED +## 2.4.47 - 2021.08.07 ### Added * Handle both `XDEBUG_SESSION` and `XDEBUG_PROFILE` cookies * Added `compiled_templates` as a bind mount in `docker-compose.yaml` for IDE autocompletion