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.0.4
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.0.5
Choose a head ref
  • 7 commits
  • 6 files changed
  • 5 contributors

Commits on Feb 11, 2018

  1. Copy the full SHA
    f44c40e View commit details
  2. Merge branch '3.4' into 4.0

    * 3.4:
      [YAML] Issue #26065: leading spaces in YAML multi-line string literals
      [Bridge\PhpUnit] Exit as late as possible
      [Bridge\PhpUnit] Cleanup BC layer
      [PhpBridge] add PHPUnit 7 support to SymfonyTestsListener
      [Lock] Log already-locked errors as "notice" instead of "warning"
      add context to serialize and deserialize
      Update Repository Symlink Helper
      Document explicitly that dotfiles and vcs files are ignored by default
      [HttpKernel] don't try to wire Request argument with controller.service_arguments
      Make kernel build time optionally deterministic
      Use 0 for unlimited expiry
      [Routing] fix typo
      Bump default PHPUnit version from 6.3 to 6.5
      do not mock the container builder in tests
      [Cache][WebProfiler] fix collecting cache stats with sub-requests + allow clearing calls
    nicolas-grekas committed Feb 11, 2018
    Copy the full SHA
    70c2b7d View commit details

Commits on Feb 16, 2018

  1. Copy the full SHA
    9e642c3 View commit details
  2. bug #25787 Yaml parser regression with comments and non-strings (alex…

    …pott)
    
    This PR was squashed before being merged into the 3.4 branch (closes #25787).
    
    Discussion
    ----------
    
    Yaml parser regression with comments and non-strings
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.3 <!-- see below -->
    | Bug fix?      | yes
    | New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
    | BC breaks?    | no
    | Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
    | Tests pass?   | no
    | Fixed tickets | #25786
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->
    
    <!--
    - Bug fixes must be submitted against the lowest branch where they apply
      (lowest branches are regularly merged to upper ones so they get the fixes too).
    - Features and deprecations must be submitted against the master branch.
    - Replace this comment by a description of what your PR is solving.
    -->
    
    Commits
    -------
    
    a7e2a49 Yaml parser regression with comments and non-strings
    xabbuh committed Feb 16, 2018
    Copy the full SHA
    6af4263 View commit details

Commits on Feb 19, 2018

  1. Copy the full SHA
    d594ee0 View commit details
  2. Merge branch '3.4' into 4.0

    * 3.4:
      [Bridge/Twig] fix composer.json
      bug #26086 [FrameworkBundle] Fix using annotation_reader in compiler pass to inject configured cache provider
      [WebProfilerBundle] Fix anchor CSS
      [HttpKernel] Send new session cookie from AbstractTestSessionListener after session invalidation
      [WebProfilerBundle] Tweak default route name
      updated StopwatchEvent phpdoc due to the additional of optional float precision introduced in 0db8d7fb6a5396f84f2907e5e595c114982772ff
      Retro-fit proxy code to make it deterministic for older proxy manager implementations
      Yaml parser regression with comments and non-strings
      Fix undiscoverablility of SymfonyTestsListenerForV7
      Fixed broken tests
      [TwigBridge] Apply some changes to support Bootstrap4-stable
    nicolas-grekas committed Feb 19, 2018
    Copy the full SHA
    c236211 View commit details
  3. minor #26229 removed version in @Final @internal for version < 4.0 (f…

    …abpot)
    
    This PR was merged into the 4.0 branch.
    
    Discussion
    ----------
    
    removed version in @Final @internal for version < 4.0
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    On 4.0+, I think we can removed the "since version 3.x" from `@final` and `@internal` annotations. I've kept them for things that reference version 4.x.
    
    Commits
    -------
    
    ed27b12d2c removed version in @Final @internal for version < 4.0
    fabpot committed Feb 19, 2018
    Copy the full SHA
    de5f125 View commit details
Loading