Permalink
Commits on Aug 19, 2016
  1. @nicolas-grekas

    Merge branch '3.1'

    * 3.1:
      Disable CLI color for Windows 10 greater than 10.0.10586
      Exception details break the layout
      [HttpKernel] Remove wrong docblock
      [HttpKernel] Fix HttpCache validation HTTP method
      [FrameworkBundle] Fix default lifetime of cache pools
      Move space from the before 'if' to the after 'if'
      [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')
    nicolas-grekas committed Aug 19, 2016
  2. @nicolas-grekas

    Merge branch '2.8' into 3.1

    * 2.8:
      Disable CLI color for Windows 10 greater than 10.0.10586
      Exception details break the layout
      [HttpKernel] Remove wrong docblock
      [HttpKernel] Fix HttpCache validation HTTP method
      Move space from the before 'if' to the after 'if'
      [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')
    nicolas-grekas committed Aug 19, 2016
  3. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      Disable CLI color for Windows 10 greater than 10.0.10586
      Exception details break the layout
      [HttpKernel] Remove wrong docblock
      [HttpKernel] Fix HttpCache validation HTTP method
      Move space from the before 'if' to the after 'if'
      [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')
    nicolas-grekas committed Aug 19, 2016
  4. @mlocati @nicolas-grekas
Commits on Aug 10, 2016
  1. @nicolas-grekas

    Merge branch '3.1'

    * 3.1:
      [travis] fix after box updates
      Console: Fix indentation of Help: section of txt usage help
      [Intl] Update ICU data to 57.1
      [Config] Improved test
      Added class existence check if is_subclass_of() fails in compiler passes
    nicolas-grekas committed Aug 10, 2016
  2. @nicolas-grekas

    Merge branch '2.8' into 3.1

    * 2.8:
      [travis] fix after box updates
      Console: Fix indentation of Help: section of txt usage help
      [Intl] Update ICU data to 57.1
      [Config] Improved test
      Added class existence check if is_subclass_of() fails in compiler passes
    nicolas-grekas committed Aug 10, 2016
  3. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [travis] fix after box updates
      Console: Fix indentation of Help: section of txt usage help
      [Intl] Update ICU data to 57.1
      [Config] Improved test
      Added class existence check if is_subclass_of() fails in compiler passes
    nicolas-grekas committed Aug 10, 2016
Commits on Aug 9, 2016
  1. @okdana @fabpot
Commits on Aug 5, 2016
  1. @nicolas-grekas

    Merge branch '2.8' into 3.1

    * 2.8:
      Relax 1 test failing with latest PHP versions
      bumped Symfony version to 2.8.10
      Remove usage of __CLASS__ outside of a class
      [HttpKernel] Fix variable conflicting name
      [Process] Fix double-fread() when reading unix pipes
      [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least)
      [Validator] Fix dockblock typehint in XmlFileLoader
      bumped Symfony version to 2.8.10
      updated VERSION for 2.8.9
      updated CHANGELOG for 2.8.9
      bumped Symfony version to 2.7.17
      updated VERSION for 2.7.16
      update CONTRIBUTORS for 2.7.16
      updated CHANGELOG for 2.7.16
      Minor fixes
      [Console] Overcomplete argument exception message tweak.
      fixed bad auto merge
      Console table cleanup
      undefined offset fix (#19406)
      [EventDispatcher] Removed unused variable
    
    Conflicts:
    	CHANGELOG-2.7.md
    	CHANGELOG-3.0.md
    	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/TableTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
    	src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    nicolas-grekas committed Aug 5, 2016
Commits on Jul 30, 2016
  1. @fabpot

    Merge branch '3.1'

    * 3.1:
      Minor fixes
      [Cache] Fix abstract AdapterTestCase cache property
      [Console] Overcomplete argument exception message tweak.
      fixed bad auto merge
      Console table cleanup
      undefined offset fix (#19406)
      [EventDispatcher] Removed unused variable
    fabpot committed Jul 30, 2016
  2. @fabpot

    Merge branch '3.0' into 3.1

    * 3.0:
      Minor fixes
      [Console] Overcomplete argument exception message tweak.
      fixed bad auto merge
      Console table cleanup
      undefined offset fix (#19406)
      [EventDispatcher] Removed unused variable
    fabpot committed Jul 30, 2016
  3. @fabpot

    Merge branch '2.8' into 3.0

    * 2.8:
      Minor fixes
      [Console] Overcomplete argument exception message tweak.
      fixed bad auto merge
      Console table cleanup
      undefined offset fix (#19406)
      [EventDispatcher] Removed unused variable
    fabpot committed Jul 30, 2016
  4. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      Minor fixes
      [Console] Overcomplete argument exception message tweak.
    fabpot committed Jul 30, 2016
  5. @zomberg @fabpot

    Minor fixes

    zomberg committed with fabpot Jul 28, 2016
Commits on Jul 29, 2016
  1. @ro0NL @fabpot
Commits on Jul 28, 2016
  1. @fabpot

    minor #19446 [Console] Overcomplete argument exception message tweak.…

    … (SpacePossum)
    
    This PR was squashed before being merged into the 2.7 branch (closes #19446).
    
    Discussion
    ----------
    
    [Console] Overcomplete argument exception message tweak.
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | License       | MIT
    
    Updates the exception message when to many arguments are passed.
    From;
    ```php
    'Too many arguments.'
    ```
    To:
    ```php
    'No argument expected, got "foo".'
    // or
    'Too many arguments, expected arguments "foo".'
    // or
    'Too many arguments, expected arguments "foo, bar".'
    // ... turtles all the way down
    ```
    
    Commits
    -------
    
    7af59cd [Console] Overcomplete argument exception message tweak.
    fabpot committed Jul 28, 2016
  2. @SpacePossum @fabpot
  3. @fabpot

    fixed bad auto merge

    fabpot committed Jul 28, 2016
  4. @ReenExe @fabpot

    Console table cleanup

    ReenExe committed with fabpot Jul 22, 2016
  5. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      undefined offset fix (#19406)
      [EventDispatcher] Removed unused variable
    fabpot committed Jul 28, 2016
  6. @fabpot

    bug #19470 undefined offset fix (#19406) (ReenExe)

    This PR was squashed before being merged into the 2.7 branch (closes #19470).
    
    Discussion
    ----------
    
    undefined offset fix (#19406)
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    9813888 undefined offset fix (#19406)
    fabpot committed Jul 28, 2016
  7. @ReenExe @fabpot

    undefined offset fix (#19406)

    ReenExe committed with fabpot Jul 28, 2016
Commits on Jul 26, 2016
  1. @nicolas-grekas

    Merge branch '3.1'

    * 3.1:
      [Console] Application update PHPDoc of add and register methods
      [Config] Extra tests for Config component
      Fixed bugs in names of classes and methods.
      [DoctrineBridge] Fixed php doc
      [FrameworkBundle] Fixed parameters number mismatch declaration
      [BrowserKit] Added test for followRedirect method (POST method)
      Fix the money form type render with Bootstrap3
      [BrowserKit] Uppercase the "GET" method in redirects
      [DomCrawler] Inherit the namespace cache in subcrawlers
      [WebProfilerBundle] Fixed  JSDoc parameter definition
      [HttpFoundation] HttpCache refresh stale responses containing an ETag
    
    Conflicts:
    	src/Symfony/Component/Console/Application.php
    nicolas-grekas committed Jul 26, 2016
  2. @nicolas-grekas

    Merge branch '3.0' into 3.1

    * 3.0:
      [Console] Application update PHPDoc of add and register methods
      [Config] Extra tests for Config component
      Fixed bugs in names of classes and methods.
      [DoctrineBridge] Fixed php doc
      [FrameworkBundle] Fixed parameters number mismatch declaration
      [BrowserKit] Added test for followRedirect method (POST method)
      Fix the money form type render with Bootstrap3
      [BrowserKit] Uppercase the "GET" method in redirects
      [DomCrawler] Inherit the namespace cache in subcrawlers
      [WebProfilerBundle] Fixed  JSDoc parameter definition
      [HttpFoundation] HttpCache refresh stale responses containing an ETag
    nicolas-grekas committed Jul 26, 2016
  3. @nicolas-grekas

    Merge branch '2.8' into 3.0

    * 2.8:
      [Console] Application update PHPDoc of add and register methods
      [Config] Extra tests for Config component
      Fixed bugs in names of classes and methods.
      [DoctrineBridge] Fixed php doc
      [FrameworkBundle] Fixed parameters number mismatch declaration
      [BrowserKit] Added test for followRedirect method (POST method)
      Fix the money form type render with Bootstrap3
      [BrowserKit] Uppercase the "GET" method in redirects
      [DomCrawler] Inherit the namespace cache in subcrawlers
      [WebProfilerBundle] Fixed  JSDoc parameter definition
      [HttpFoundation] HttpCache refresh stale responses containing an ETag
    
    Conflicts:
    	src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
    nicolas-grekas committed Jul 26, 2016
  4. @nicolas-grekas

    Merge branch '2.7' into 2.8

    * 2.7:
      [Console] Application update PHPDoc of add and register methods
      [Config] Extra tests for Config component
      Fixed bugs in names of classes and methods.
      [DoctrineBridge] Fixed php doc
      [FrameworkBundle] Fixed parameters number mismatch declaration
      [BrowserKit] Added test for followRedirect method (POST method)
      Fix the money form type render with Bootstrap3
      [BrowserKit] Uppercase the "GET" method in redirects
      [WebProfilerBundle] Fixed  JSDoc parameter definition
      [HttpFoundation] HttpCache refresh stale responses containing an ETag
    
    Conflicts:
    	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
    	src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php
    nicolas-grekas committed Jul 26, 2016
  5. @nicolas-grekas

    minor #19389 [Console] Application update PHPDoc of add and register …

    …methods (SpacePossum)
    
    This PR was squashed before being merged into the 2.7 branch (closes #19389).
    
    Discussion
    ----------
    
    [Console] Application update PHPDoc of add and register methods
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | License       | MIT
    
    The [PHPDoc](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Console/Application.php#L354) states the method will always return a command, but it doesn't. Since [Application::register](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Console/Application.php#L328) returns the result of `add` directly is also doesn't always return the command (as its PHPDoc states).
    
    Commits
    -------
    
    6f0474f [Console] Application update PHPDoc of add and register methods
    nicolas-grekas committed Jul 26, 2016
  6. @SpacePossum @nicolas-grekas
  7. @zomberg @nicolas-grekas
Commits on Jul 19, 2016
  1. @fabpot

    Merge branch '3.1'

    * 3.1:
      fixed bad merge
      Fix PHP 7.1 related failures
      [VarDumper] Fix for 7.1
      fixed CS
      Added class existence check if is_subclass_of() fails in compiler passes
      Fix the DBAL session handler version check for Postgresql
    fabpot committed Jul 19, 2016
  2. @fabpot

    Merge branch '3.0' into 3.1

    * 3.0:
      Fix PHP 7.1 related failures
      [VarDumper] Fix for 7.1
      fixed CS
      Added class existence check if is_subclass_of() fails in compiler passes
      Fix the DBAL session handler version check for Postgresql
    fabpot committed Jul 19, 2016
  3. @fabpot

    Merge branch '2.8' into 3.0

    * 2.8:
      Fix PHP 7.1 related failures
      [VarDumper] Fix for 7.1
      fixed CS
      Added class existence check if is_subclass_of() fails in compiler passes
      Fix the DBAL session handler version check for Postgresql
    fabpot committed Jul 19, 2016
  4. @fabpot

    Merge branch '2.7' into 2.8

    * 2.7:
      Fix PHP 7.1 related failures
      [VarDumper] Fix for 7.1
    fabpot committed Jul 19, 2016
  5. @nicolas-grekas
Commits on Jul 1, 2016
  1. @nicolas-grekas

    Fix merge

    nicolas-grekas committed Jul 1, 2016