Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 29, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      bumped Symfony version to 2.6.10
      updated VERSION for 2.6.9
      updated CHANGELOG for 2.6.9
      fixed tests
      Avoid using the app global variable in the profiler templates
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
  2. @fabpot
  3. @fabpot

    updated VERSION for 2.6.9

    fabpot authored
  4. @fabpot

    updated CHANGELOG for 2.6.9

    fabpot authored
  5. @fabpot

    fixed tests

    fabpot authored
  6. @fabpot

    minor #14782 Adding UPGRADE-2.7 about small BC break in InputDefiniti…

    fabpot authored
    …on (weaverryan)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Adding UPGRADE-2.7 about small BC break in InputDefinition
    
    Hi guys!
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #13220
    | License       | MIT
    | Doc PR        | n/a
    
    In #13220, a small BC break was introduced when `InputDefinition::getSynopsis()` was given an optional argument. This, for example, breaks Behat 2.5, which overrides this method. I don't think this was noticed before, and it may be too late (or not worth it) to reverse the BC break.
    
    So, I've at least doc'ed it.
    
    Thanks!
    
    Commits
    -------
    
    a7985d2 Fixing phpdoc typo
    c35f2c8 Talking about getSynopsis()
  7. @fabpot

    bug #14777 Avoid using the app global variable in the profiler templa…

    fabpot authored
    …tes (stof)
    
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    Avoid using the app global variable in the profiler templates
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | small one for people overwriting the WebDebugToolbarListener methods
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | silexphp/Silex-WebProfiler#64
    | License       | MIT
    | Doc PR        | n/a
    
    #14217 introduced a usage of the ``app`` global variables in profiler templates, while we previously removed all such usages to avoid the dependency on TwigBundle in these templates.
    This keeps them usable outside the fullstack framework (for instance in Silex).
    
    I had to do a small BC break to be able to pass the request in the place where we were not yet injecting the Request in the template.
    
    Commits
    -------
    
    415c79e Avoid using the app global variable in the profiler templates
  8. @weaverryan

    Fixing phpdoc typo

    weaverryan authored
  9. @weaverryan

    Talking about getSynopsis()

    weaverryan authored
  10. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (21 commits)
      Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
      InvalidResourceException file name
      [Validators] Remove forgotten space in a translation key [nl]
      [Validators] Correct translation key and content [nl]
      bumped Symfony version to 2.6.9
      updated VERSION for 2.6.8
      updated CHANGELOG for 2.6.8
      added missing CVE number
      bumped Symfony version to 2.3.30
      updated VERSION for 2.3.29
      update CONTRIBUTORS for 2.3.29
      updated CHANGELOG for 2.3.29
      [Validators] Missing translations for arabic language.
      Code style
      fixed C
      [HttpKernel][Bundle] Check extension implements ExtensionInterface
      [DebugBundle] Fix config XSD
      [CS] [Console] StreamOuput : fix loose comparison
      [Framework][router commands] fixed failing test.
      [HttpKernel] Do not call the FragmentListener if _controller is already defined
      ...
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
  11. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
      InvalidResourceException file name
      [Validators] Remove forgotten space in a translation key [nl]
      [Validators] Correct translation key and content [nl]
      added missing CVE number
      bumped Symfony version to 2.3.30
      updated VERSION for 2.3.29
      update CONTRIBUTORS for 2.3.29
      updated CHANGELOG for 2.3.29
      [CS] [Console] StreamOuput : fix loose comparison
      [DependencyInjection] Avoid unnecessary calls to strtolower()
    
    Conflicts:
    	src/Symfony/Component/Console/Output/StreamOutput.php
    	src/Symfony/Component/HttpKernel/Kernel.php
  12. @fabpot

    Revert "bug #14262 [TwigBundle] Refresh twig paths when resources cha…

    fabpot authored
    …nge. (aitboudad)"
    
    This reverts commit 4d40852, reversing
    changes made to dd2fb85.
  13. @stof

    Avoid using the app global variable in the profiler templates

    stof authored
    This keeps them usable outside the fullstack framework (for instance in
    Silex).
  14. @fabpot

    minor #14776 Adding notes about deprecated warnings in 2.7 (weaverryan)

    fabpot authored
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    Adding notes about deprecated warnings in 2.7
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Hi guys!
    
    When I upgraded, my project exploded with deprecated warnings. I'm certain we'll get a lot of questions about these, so I think we should try to get ahead of these questions as much as possible. I'm adding this - if I'm mistaken in anything, please let me know. I also think we should mention this in the release blog post so that people are aware.
    
    I'm about to propose a short docs entry to explain things there too (so that hopefully if someone googles for the issue, they'll find our explanation).
    
    Thanks!
    
    Commits
    -------
    
    e374274 Adding notes about deprecated warnings in 2.7
  15. @weaverryan
Commits on May 28, 2015
  1. @fabpot

    minor #14762 InvalidResourceException file name (DancZer)

    fabpot authored
    This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14762).
    
    Discussion
    ----------
    
    InvalidResourceException file name
    
    Added filen ame to the InvalidResourceException,
    
    Commits
    -------
    
    2e04e23 InvalidResourceException file name
  2. @DancZer @fabpot

    InvalidResourceException file name

    DancZer authored fabpot committed
  3. @fabpot

    minor #14643 [DependencyInjection] Avoid unnecessary calls to strtolo…

    fabpot authored
    …wer() (nicolas-grekas)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [DependencyInjection] Avoid unnecessary calls to strtolower()
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14558
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    c27f564 [DependencyInjection] Avoid unnecessary calls to strtolower()
  4. @fabpot

    minor #14765 [Validators] Correct translation key and content [nl] (a…

    fabpot authored
    …mouhzi)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Validators] Correct translation key and content [nl]
    
    The nl file is not up to date. Correct changed translation key.
    
    Commits
    -------
    
    5bc4085 [Validators] Correct translation key and content [nl]
  5. @fabpot

    minor #14766 [Validators] Remove forgotten space in a translation key…

    fabpot authored
    … [nl] (amouhzi)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Validators] Remove forgotten space in a translation key [nl]
    
    The nl file is not up to date. Correct changed translation key.
    
    Commits
    -------
    
    51e3c22 [Validators] Remove forgotten space in a translation key [nl]
Commits on May 27, 2015
  1. @amouhzi
  2. @amouhzi
  3. @fabpot

    minor #14742 [CS] [Console] StreamOuput : fix loose comparison (ogiza…

    fabpot authored
    …nagi)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [CS] [Console] StreamOuput : fix loose comparison
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    cd70ca8 [CS] [Console] StreamOuput : fix loose comparison
  4. @fabpot

    minor #14758 [Serializer] [2.6] Code style (derrabus)

    fabpot authored
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [Serializer] [2.6] Code style
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | none
    | License       | MIT
    | Doc PR        | none
    
    This PR fixes some minor code style issues fabbot discovered while I was working on PR #14756.
    
    Commits
    -------
    
    864136a Code style
  5. @fabpot

    bumped Symfony version to 2.6.9

    fabpot authored
  6. @fabpot

    updated VERSION for 2.6.8

    fabpot authored
  7. @fabpot

    updated CHANGELOG for 2.6.8

    fabpot authored
Commits on May 26, 2015
  1. @fabpot

    added missing CVE number

    fabpot authored
  2. @fabpot
  3. @fabpot

    updated VERSION for 2.3.29

    fabpot authored
  4. @fabpot

    update CONTRIBUTORS for 2.3.29

    fabpot authored
  5. @fabpot

    updated CHANGELOG for 2.3.29

    fabpot authored
  6. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      [Validators] Missing translations for arabic language.
      fixed C
      [HttpKernel][Bundle] Check extension implements ExtensionInterface
      [HttpKernel] Do not call the FragmentListener if _controller is already defined
  7. @fabpot

    security #14759 n/a (jakzal)

    fabpot authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    n/a
    
    n/a
    
    Commits
    -------
    
    d320d27 [HttpKernel] Do not call the FragmentListener if _controller is already defined
  8. @fabpot

    minor #14757 [Validators] Missing translations for arabic language. (…

    fabpot authored
    …amouhzi)
    
    This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14757).
    
    Discussion
    ----------
    
    [Validators] Missing translations for arabic language.
    
    | Q | A
    | ---| ---------
    | Bug fix? | no
    | New feature? | no
    | BC breaks? | 	no
    | Deprecations? | no
    | Tests pass? | ?
    | Fixed tickets | none
    | License | MIT
    | Doc PR | none
    
    This pull request is for adding missing translations in validators.ar.xlf.
    
    Commits
    -------
    
    9a26e4b [Validators] Missing translations for arabic language.
Something went wrong with that request. Please try again.