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/symfony
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.0-RC1
Choose a base ref
...
head repository: symfony/symfony
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e62f832
Choose a head ref
  • 20 commits
  • 13 files changed
  • 5 contributors

Commits on Apr 25, 2016

  1. [Routing] Fix the annotation loader taking a class constant as a begi…

    …nning of a class name
    jakzal committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    43c7f9b View commit details
    Browse the repository at this point in the history

Commits on May 26, 2016

  1. Configuration menu
    Copy the full SHA
    91a4de3 View commit details
    Browse the repository at this point in the history
  2. [Yaml] search for colons in strings only

    Since the parser is able to return `\DateTime` instances when the
    `Yaml::PARSE_DATETIME` flag is passed, we need to ensure that the parsed
    value actually is a string before passing the parsed value to string
    functions.
    xabbuh committed May 26, 2016
    Configuration menu
    Copy the full SHA
    0ea2228 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2016

  1. bug #18899 [Yaml] search for colons in strings only (xabbuh)

    This PR was merged into the 3.1 branch.
    
    Discussion
    ----------
    
    [Yaml] search for colons in strings only
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 3.1
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #18897
    | License       | MIT
    | Doc PR        |
    
    Since the parser is able to return `\DateTime` instances when the
    `Yaml::PARSE_DATETIME` flag is passed, we need to ensure that the parsed
    value actually is a string before passing the parsed value to string
    functions.
    
    Commits
    -------
    
    0ea2228 [Yaml] search for colons in strings only
    xabbuh committed May 28, 2016
    Configuration menu
    Copy the full SHA
    922f1b0 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2016

  1. Configuration menu
    Copy the full SHA
    a125af7 View commit details
    Browse the repository at this point in the history
  2. minor #18906 [PropertyAccess] Fix for PHP 7.0.7 (nicolas-grekas)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [PropertyAccess] Fix for PHP 7.0.7
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.3
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    This is what break travis currently.
    See https://3v4l.org/r37rY
    
    Commits
    -------
    
    a125af7 [PropertyAccess] Fix for PHP 7.0.7
    nicolas-grekas committed May 29, 2016
    Configuration menu
    Copy the full SHA
    b576fe1 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.3' into 2.7

    * 2.3:
      [PropertyAccess] Fix for PHP 7.0.7
    
    Conflicts:
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    nicolas-grekas committed May 29, 2016
    Configuration menu
    Copy the full SHA
    a350459 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.7' into 2.8

    * 2.7:
      [PropertyAccess] Fix for PHP 7.0.7
    nicolas-grekas committed May 29, 2016
    Configuration menu
    Copy the full SHA
    56b5f41 View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.8' into 3.0

    * 2.8:
      [PropertyAccess] Fix for PHP 7.0.7
    nicolas-grekas committed May 29, 2016
    Configuration menu
    Copy the full SHA
    0929c7b View commit details
    Browse the repository at this point in the history
  6. Merge branch '3.0' into 3.1

    * 3.0:
      [PropertyAccess] Fix for PHP 7.0.7
    nicolas-grekas committed May 29, 2016
    Configuration menu
    Copy the full SHA
    8c65c0e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8d4f35d View commit details
    Browse the repository at this point in the history
  8. bug #18907 [Routing] Fix the annotation loader taking a class constan…

    …t as a beginning of a class name (jakzal, nicolas-grekas)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.3
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #18633
    | License       | MIT
    | Doc PR        | -
    
    Code copy/pasted from ClassMapGenerator.php
    
    Commits
    -------
    
    8d4f35d [Routing] Finish annotation loader taking a class constant as a beginning of a class name
    43c7f9b [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    fabpot committed May 29, 2016
    Configuration menu
    Copy the full SHA
    ab621ee View commit details
    Browse the repository at this point in the history
  9. [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments

    CS Fixes
    
    Add tests
    
    Add docblock
    
    Fix side effect on FrameworkBundle tests
    
    Remove useless '\n' from TextDescriptor since comments are block
    chalasr committed May 29, 2016
    Configuration menu
    Copy the full SHA
    1c94fea View commit details
    Browse the repository at this point in the history

Commits on May 30, 2016

  1. bug #18889 [Console] SymfonyStyle: Fix alignment/prefixing of multi-l…

    …ine comments (chalasr)
    
    This PR was merged into the 2.8 branch.
    
    Discussion
    ----------
    
    [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.8
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Pointed in #18564 (comment).
    
    Very-long-line comment:
    ```php
    SymfonyStyle::comment('Lorem ipsum ...');
    ```
    
    Before:
    ![](http://image.prntscr.com/image/9190081d7fd740a89d17a7247dbbb244.png)
    
    After:
    ![](http://image.prntscr.com/image/109c8c19c1574172bc22199ac90b6dd6.png)
    
    Multi-line comment:
    ```php
    SymfonyStyle::comment(['Lorem ipsum...', 'Lorem ipsum...']);
    ```
    
    Before:
    ![](http://image.prntscr.com/image/24228f7e89e647b3a5d66fd83c7216cd.png)
    
    After:
    ![](http://image.prntscr.com/image/fe9320369fad45acab92564f0e5de344.png)
    
    Commits
    -------
    
    1c94fea [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    dfc0c81 View commit details
    Browse the repository at this point in the history
  2. Merge branch '2.3' into 2.7

    * 2.3:
      [Routing] Finish annotation loader taking a class constant as a beginning of a class name
      [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    00763f6 View commit details
    Browse the repository at this point in the history
  3. Merge branch '2.7' into 2.8

    * 2.7:
      [Routing] Finish annotation loader taking a class constant as a beginning of a class name
      [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    e617502 View commit details
    Browse the repository at this point in the history
  4. Merge branch '2.8' into 3.0

    * 2.8:
      [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
      [Routing] Finish annotation loader taking a class constant as a beginning of a class name
      [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    7b7c9b8 View commit details
    Browse the repository at this point in the history
  5. Merge branch '3.0' into 3.1

    * 3.0:
      [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
      [Routing] Finish annotation loader taking a class constant as a beginning of a class name
      [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    73ca90d View commit details
    Browse the repository at this point in the history
  6. updated CHANGELOG for 3.1.0

    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    3dce1d4 View commit details
    Browse the repository at this point in the history
  7. updated VERSION for 3.1.0

    fabpot committed May 30, 2016
    Configuration menu
    Copy the full SHA
    e62f832 View commit details
    Browse the repository at this point in the history
Loading