diff --git a/CHANGELOG.md b/CHANGELOG.md index 26d7953..61d95c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # nystudio107/craft Change Log +## 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 +* Added `nystudio107/craft-autocomplete` for autocomplete of variables in Twig templates + ## 2.4.46 - 2021.07.29 ### Added * Added `putyourlightson/craft-autocomplete` for the Twig + Symfony plugin auto-complete, removed FauxTwigExtension.php 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", 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: 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 {