Skip to content

Commit

Permalink
Merge branch 'release/1.3.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
titouanmathis committed Apr 18, 2024
2 parents aadc698 + b978381 commit a358507
Show file tree
Hide file tree
Showing 5 changed files with 555 additions and 823 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -64,7 +64,11 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
twig-versions: ['^2.10', '^3']
env:
PHP_VERSION: ${{ matrix.php-versions }}
TWIG_VERSION: ${{ matrix.twig-versions }}
steps:
- uses: actions/checkout@v2

Expand All @@ -88,15 +92,18 @@ jobs:
- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Install Twig specific version
run: composer require twig/twig:${{ matrix.twig-versions }}

- name: Pest
run: php -v && XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --coverage-clover='coverage.xml'

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: PHP_VERSION,TWIG_VERSION
file: ./coverage.xml
flags: unittests
fail_ci_if_error: true
path_to_write_report: ./codecov_report.txt
fail_ci_if_error: false
verbose: true
26 changes: 16 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## v1.3.6 (2024-04-18)

### Fixed

- Fix the `html_element` tag with Twig 3.9.0 ([#23](https://github.com/studiometa/twig-toolkit/pull/23))

## v1.3.5 (2023-07-13)

### Fixed
Expand Down Expand Up @@ -40,23 +46,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Added

- Add a `twig_toolkit_url` function to wrap a string in a `Spatie\Url\Url` instance from the [`spatie/url` package](https://github.com/spatie/url) (#15)
- Add a `twig_toolkit_url` function to wrap a string in a `Spatie\Url\Url` instance from the [`spatie/url` package](https://github.com/spatie/url) ([#15](https://github.com/studiometa/twig-toolkit/pull/15))

## v1.2.2

## Fixed

- Fix `renderAttributes` to be compliant with PHP 8.1 (#14)
- Fix `renderAttributes` to be compliant with PHP 8.1 ([#14](https://github.com/studiometa/twig-toolkit/pull/14))

## v1.2.1

## Fixed

- Do not render empty attributes (#12)
- Do not render empty attributes ([#12](https://github.com/studiometa/twig-toolkit/pull/12))

## Changed

- Improve readability of rendered HTML (#12)
- Improve readability of rendered HTML ([#12](https://github.com/studiometa/twig-toolkit/pull/12))

## v1.2.0

Expand All @@ -67,14 +73,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Fixed

- Fix warnings when using `html_classes` with an empty array (#9)
- Fix warnings when using `html_classes` with an empty array ([#9](https://github.com/studiometa/twig-toolkit/pull/9))

## v1.1.0

## Added

- Add a `merge_html_attributes(default, required)` filter (#7)
- Add a `html_styles()` function (#3)
- Add a `merge_html_attributes(default, required)` filter ([#7](https://github.com/studiometa/twig-toolkit/pull/7))
- Add a `html_styles()` function ([#3](https://github.com/studiometa/twig-toolkit/pull/3))
- Add test coverage

## v1.0.1
Expand All @@ -91,6 +97,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Added

- Add a `{% html_element 'div'%}` tag (#1)
- Add a `{{ class() }}` function (#1)
- Add a `{{ attributes() }}` function (#1)
- Add a `{% html_element 'div'%}` tag ([#1](https://github.com/studiometa/twig-toolkit/pull/1))
- Add a `{{ class() }}` function ([#1](https://github.com/studiometa/twig-toolkit/pull/1))
- Add a `{{ attributes() }}` function ([#1](https://github.com/studiometa/twig-toolkit/pull/1))
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "studiometa/twig-toolkit",
"version": "1.3.5",
"description": "A set of useful extension and components for Twig.",
"license": "MIT",
"require": {
Expand Down
Loading

0 comments on commit a358507

Please sign in to comment.