Merge pull request #152 from getherbie/2.x-develop

2.x develop

Author: tbreuss

.github/workflows/cicd.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         # operating-systems: ubuntu-latest, windows-latest, macos-latest
-        operating-system: [ubuntu-latest]
+        operating-system: [ubuntu-latest, macos-latest]
         php-versions: ['8.0', '8.1', '8.2', '8.3']
     runs-on: ${{ matrix.operating-system }}
     steps:

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.2.0] - 2025-05-23
+
+### Added
+- New `twigify` Twig filter to render a string with Twig
+- New `twigify` Twig function to render a string with Twig
+
 ## [2.1.0] - 2025-04-13
 
 ### Added
@@ -44,7 +50,8 @@ See https://github.com/getherbie/herbie/issues/82.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-[Unreleased]: https://github.com/getherbie/herbie/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/getherbie/herbie/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/getherbie/herbie/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/getherbie/herbie/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/getherbie/herbie/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/getherbie/herbie/compare/v1.0.1...v1.1.0

plugins/twig/TwigExtension.php

@@ -74,6 +74,7 @@ public function getFilters(): array
         return [
             new TwigFilter('format_size', [$this, 'filterFilesize']),
             new TwigFilter('slugify', [$this, 'filterSlugify']),
+            new TwigFilter('twigify', [$this, 'twigify'], ['is_safe' => ['html']]),
             new TwigFilter('visible', [$this, 'filterVisible'], ['deprecated' => true]) // doesn't work properly
         ];
     }
@@ -104,6 +105,7 @@ public function getFunctions(): array
             new TwigFunction('query', [$this, 'query']),
             new TwigFunction('snippet', [$this, 'snippet'], ['is_safe' => ['all']]),
             new TwigFunction('translate', [$this, 'translate']),
+            new TwigFunction('twigify', [$this, 'twigify'], ['is_safe' => ['html']]),
             new TwigFunction('url_rel', [$this, 'urlRelative']),
             new TwigFunction('url_abs', [$this, 'urlAbsolute']),
         ];
@@ -659,4 +661,9 @@ public function testIsWritable(string $alias): bool
         $filename = $this->alias->get($alias);
         return is_writable($filename);
     }
+
+    public function twigify(string $content): string
+    {
+        return $this->environment->render($content);
+    }
 }

tests/acceptance/HerbieInfoCest.php

@@ -380,6 +380,7 @@ public function testNumberAndSortingOfTwigFilters(AcceptanceTester $I)
             'raw',
             'format_size',
             'slugify',
+            'twigify',
             'visible',
             'markdown',
             'rest',
@@ -430,6 +431,7 @@ public function testNumberAndSortingOfTwigFunctions(AcceptanceTester $I)
             'query',
             'snippet',
             'translate',
+            'twigify',
             'url_rel',
             'url_abs',
             'herbie_debug',