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: symfony/yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.4.13
Choose a base ref
...
head repository: symfony/yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.4.14
Choose a head ref
  • 13 commits
  • 6 files changed
  • 7 contributors

Commits on Sep 2, 2020

  1. Copy the full SHA
    c2162b5 View commit details
  2. Merge branch '3.4' into 4.4

    * 3.4:
      Enable "native_constant_invocation" CS rule
      Make AbstractPhpFileCacheWarmer public
    nicolas-grekas committed Sep 2, 2020
    Copy the full SHA
    4b9c6dc View commit details

Commits on Sep 6, 2020

  1. Copy the full SHA
    96800ef View commit details

Commits on Sep 7, 2020

  1. Copy the full SHA
    b7d9b4a View commit details

Commits on Sep 8, 2020

  1. Merge branch '3.4' into 4.4

    * 3.4:
      Prevent parsing invalid octal digits as octal numbers
      [DI] fix ContainerBuilder on PHP8
      [Console] Make sure $maxAttempts is an int or null.
      [VarDumper] Fix caster for invalid SplFileInfo objects on php 8.
      [Intl] Skip test cases that produce a TypeError on php 8.
      [PhpUnitBridge] Adjust output parsing for PHPUnit 9.3.
      [PhpUnitBridge] CoverageListenerTrait update for PHPUnit 8.5/9.x
      add bosnian (bs) translation
      [Debug] Parse "x not found" errors correctly on php 8.
    xabbuh committed Sep 8, 2020
    Copy the full SHA
    defb343 View commit details

Commits on Sep 16, 2020

  1. remove superfluous cast

    in YAML component.
    
    minor.
    ktomk committed Sep 16, 2020
    Copy the full SHA
    e6f16d8 View commit details

Commits on Sep 17, 2020

  1. Merge branch '3.4' into 4.4

    * 3.4:
      remove superfluous cast
      Change 'cache_key' to AbstractRendererEngine::CACHE_KEY_VAR
      Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
    fabpot committed Sep 17, 2020
    Copy the full SHA
    e53b8b6 View commit details

Commits on Sep 18, 2020

  1. Copy the full SHA
    50f080d View commit details
  2. Copy the full SHA
    c6d162b View commit details
  3. bug #38228 [Yaml Parser] Fix edge cases when parsing multiple documen…

    …ts (digilist)
    
    This PR was merged into the 3.4 branch.
    
    Discussion
    ----------
    
    [Yaml Parser] Fix edge cases when parsing multiple documents
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 4.4
    | Bug fix?      | yes
    | New feature?  | no
    | Deprecations? | no
    | Tickets       |
    | License       | MIT
    | Doc PR        |
    
    I identified some edge cases when parsing multiple YAML documents with the same parser instance, because the totalNumberOfLines was not reset and so any subsequent parsing considered the number of lines of the first document.
    
    Consider this document:
    ```yaml
    a:
        b: |
            row
            row2
    c: d
    ```
    
    Normally, `a.b` would be parsed as `row\nrow2\n`. But if the parser parsed a shorter document before, the `\n` after row2 was missing, as the parser considered it as the end of the file (that's why the `c: d` at the end is important).
    
    So this fix resets the `totalNumberOfLines` in the YAML parser to `null` so that any subsequent parsing will initialize the value for the new document and does not use the file length of the first parsed document.
    
    I stumbled upon this because of a flickering unit test that was using the translation component. Sometimes the translated string contained a trailing `\n` and sometimes not. In the end it was based on this bug, as the translation files were not loaded in the same order every time (not really sure why. It's somehow related to the cache state, but even with a warm cache it was not totally deterministic).
    
    Commits
    -------
    
    012ee4fa59 [Yaml Parser] Fix edge cases when parsing multiple documents
    fabpot committed Sep 18, 2020
    Copy the full SHA
    a2b5a78 View commit details
  4. Merge branch '3.4' into 4.4

    * 3.4:
      drop logger mock in favor of using the BufferingLogger
      [Yaml Parser] Fix edge cases when parsing multiple documents
      fix parsing comments not prefixed by a space
    xabbuh committed Sep 18, 2020
    Copy the full SHA
    55f2c00 View commit details
  5. [Yaml] simplify the test

    xabbuh committed Sep 18, 2020
    Copy the full SHA
    ec3c2ac View commit details

Commits on Sep 27, 2020

  1. Merge branch '3.4' into 4.4

    * 3.4:
      update missing translations arabic
      [Yaml] simplify the test
      fix test by letting mock throw the actual expected exception
    fabpot committed Sep 27, 2020
    Copy the full SHA
    c788596 View commit details
Loading