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: a003380
Choose a base ref
...
head repository: symfony/symfony
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 17ad6fd
Choose a head ref
  • 8 commits
  • 3 files changed
  • 4 contributors

Commits on Mar 14, 2015

  1. Configuration menu
    Copy the full SHA
    bc066fb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ae52ed View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2015

  1. Configuration menu
    Copy the full SHA
    b8d42b3 View commit details
    Browse the repository at this point in the history
  2. bug #13927 Fixing wrong variable name from #13519 (weaverryan)

    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    Fixing wrong variable name from #13519
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #13519
    | License       | MIT
    | Doc PR        | n/a
    
    Hi guys!
    
    I'm currently seeing an undefined variable in the `PhpDumper` on all branches. I think it was added inadvertently in #13519, so unless I'm totally missing something, this should be an easy merge.
    
    Thanks!
    
    Commits
    -------
    
    3ae52ed Fixing wrong variable name from #13519
    fabpot committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    225dbaf View commit details
    Browse the repository at this point in the history
  3. minor #13930 [DependencyInjection] ResolveParameterPlaceHoldersPass

    … unit tests (xabbuh)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [DependencyInjection] `ResolveParameterPlaceHoldersPass` unit tests
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    When working #13924, I noticed that there were no tests for the `ResolveParameterPlaceHoldersPass` class. So I decided to add them for the `2.3` branch too.
    
    Commits
    -------
    
    b8d42b3 `ResolveParameterPlaceHoldersPass` unit tests
    fabpot committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    d50f0a8 View commit details
    Browse the repository at this point in the history
  4. minor #13925 [translation][initialize cache] Remove dead code. (aitbo…

    …udad)
    
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [translation][initialize cache] Remove dead code.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Fixed tickets  | ~
    | Tests pass?   | yes
    | License       | MIT
    
    I see two issues here:
    1- initialize function doesn't exist in Translator class.
    2- initializeCacheCatalogue is only called when cache is not null
    
    Commits
    -------
    
    bc066fb [translation][initialize cache] Remove dead code.
    fabpot committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    c923613 View commit details
    Browse the repository at this point in the history
  5. Merge branch '2.3' into 2.6

    * 2.3:
      `ResolveParameterPlaceHoldersPass` unit tests
      Fixing wrong variable name from #13519
    fabpot committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    be05344 View commit details
    Browse the repository at this point in the history
  6. Merge branch '2.6' into 2.7

    * 2.6:
      `ResolveParameterPlaceHoldersPass` unit tests
      Fixing wrong variable name from #13519
      [translation][initialize cache] Remove dead code.
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    fabpot committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    17ad6fd View commit details
    Browse the repository at this point in the history
Loading