Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: twigphp/Twig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.22.1
Choose a base ref
...
head repository: twigphp/Twig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.22.2
Choose a head ref
  • 15 commits
  • 9 files changed
  • 6 contributors

Commits on Nov 16, 2025

  1. Bump version

    fabpot committed Nov 16, 2025
    Configuration menu
    Copy the full SHA
    34e874e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2025

  1. Configuration menu
    Copy the full SHA
    2e0c874 View commit details
    Browse the repository at this point in the history
  2. minor #4712 Update .gitattributes to exclude phpstan configs (william…

    …des)
    
    This PR was merged into the 3.x branch.
    
    Discussion
    ----------
    
    Update .gitattributes to exclude phpstan configs
    
    They where added in #4458
    
    Versions >= 3.16.0 have the not needed files
    
    Commits
    -------
    
    2e0c874 Update .gitattributes to exclude phpstan configs
    fabpot committed Nov 19, 2025
    Configuration menu
    Copy the full SHA
    2b7cc0b View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2025

  1. Configuration menu
    Copy the full SHA
    473653d View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2025

  1. bug #4713 Fix cycle() with non-countable ArrayAccess+Traversable obje…

    …cts (yoeunes)
    
    This PR was merged into the 3.x branch.
    
    Discussion
    ----------
    
    Fix cycle() with non-countable ArrayAccess+Traversable objects
    
    When using `cycle()` with an object that implements `\ArrayAccess` and `\Traversable` but is not `\Countable`, the function currently returns the object instance immediately after triggering the deprecation notice.
    
    This prevents the value from being converted to an array, causing the cycle logic to fail or return the object itself.
    
    This PR removes the early return to ensure `self::toArray()` is called, allowing these objects to be cycled correctly as expected.
    
    **How to test**
    
    ```php
    $seq = new class implements \ArrayAccess, \IteratorAggregate {
        public function offsetExists($offset): bool { return true; }
        public function offsetGet($offset): mixed { return 'val'; }
        public function offsetSet($offset, $value): void {}
        public function offsetUnset($offset): void {}
        public function getIterator(): \Traversable { yield 'odd'; yield 'even'; }
    };
    
    // Should return 'odd', currently returns the $seq object
    $result = CoreExtension::cycle($seq, 0);
    ```
    
    Related to #4241
    
    Commits
    -------
    
    473653d [Core] Fix cycle() with non-countable ArrayAccess+Traversable objects
    fabpot committed Nov 25, 2025
    Configuration menu
    Copy the full SHA
    ce6698a View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2025

  1. Configuration menu
    Copy the full SHA
    f7daf71 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2025

  1. minor #4714 Add 'invoke' to filters index (webda2l)

    This PR was merged into the 3.x branch.
    
    Discussion
    ----------
    
    Add 'invoke' to filters index
    
    Missing from #4518 I think.
    
    Commits
    -------
    
    f7daf71 Add 'invoke' to filters index
    fabpot committed Nov 27, 2025
    Configuration menu
    Copy the full SHA
    8074ddc View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2025

  1. Configuration menu
    Copy the full SHA
    c4dcd0b View commit details
    Browse the repository at this point in the history
  2. bug #4722 use getShareDir as an indicator of Symfony version (tacman)

    This PR was squashed before being merged into the 3.x branch.
    
    Discussion
    ----------
    
    use getShareDir as an indicator of Symfony version
    
    Proposal to fix #4719 , replaces #4721
    
    Commits
    -------
    
    c4dcd0b use getShareDir as an indicator of Symfony version
    fabpot committed Dec 5, 2025
    Configuration menu
    Copy the full SHA
    8308f7f View commit details
    Browse the repository at this point in the history
  3. Add split.sh config

    fabpot committed Dec 5, 2025
    Configuration menu
    Copy the full SHA
    4f32334 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2025

  1. Avoid ord deprecation in PHP 8.5

    Change the one usage of ord() in Twig where a multibyte character can trigger the new deprecation in PHP 8.5, which is in the `html_attr` escape functionality, previously leading to:
    
    ord(): Providing a string that is not one byte long is deprecated. Use ord($str[0]) instead"
    iquito authored Dec 14, 2025
    Configuration menu
    Copy the full SHA
    4d98cce View commit details
    Browse the repository at this point in the history
  2. Update CHANGELOG

    fabpot committed Dec 14, 2025
    Configuration menu
    Copy the full SHA
    537b4f2 View commit details
    Browse the repository at this point in the history
  3. bug #4724 Avoid ord deprecation notice in PHP 8.5 (iquito)

    This PR was merged into the 3.x branch.
    
    Discussion
    ----------
    
    Avoid ord deprecation notice in PHP 8.5
    
    Change the one usage of `ord()` in Twig where a multibyte character can trigger the new deprecation in PHP 8.5, which is in the `html_attr` escape functionality in EscaperRuntime, currently leading to:
    
    ```
    ord(): Providing a string that is not one byte long is deprecated. Use ord($str[0]) instead"
    ```
    
    This small change fixes it. There are no other usages of `ord()` in Twig which lead to this deprecation notice.
    
    Commits
    -------
    
    4d98cce Avoid ord deprecation in PHP 8.5
    fabpot committed Dec 14, 2025
    Configuration menu
    Copy the full SHA
    cf87925 View commit details
    Browse the repository at this point in the history
  4. Update CHANGELOG

    fabpot committed Dec 14, 2025
    Configuration menu
    Copy the full SHA
    eca0d9c View commit details
    Browse the repository at this point in the history
  5. Prepare the 3.22.2 release

    fabpot committed Dec 14, 2025
    Configuration menu
    Copy the full SHA
    946ddea View commit details
    Browse the repository at this point in the history
Loading