Permalink
Commits on Sep 21, 2016
Commits on Sep 14, 2016
  1. feature #19795 Replace %count% with a given number out of the box (bo…

    …charsky-bw)
    
    This PR was squashed before being merged into the 3.2-dev branch (closes #19795).
    
    Discussion
    ----------
    
    Replace %count% with a given number out of the box
    
    | Q             | A
    | ------------- | ---
    | Branch?       | master
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | no
    | License       | MIT
    | Doc PR        | no
    
    We already have this feature for [transchoice](https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php#L98) Twig filter, but why only for it? It will be consistent to have this for translator in general. We already have a `$number` parameter in `transChoice()` which we could easily use for that.
    
    Before
    ```php
    $this->get('translator')
        ->transChoice('1 apple|%count% apples', 7, [
            '%count%' => 7,
        ]);
    ```
    
    After:
    ```php
    $this->get('translator')
        ->transChoice('1 apple|%count% apples', 7);
    ```
    
    Commits
    -------
    
    4c1a65d Replace %count% with a given number out of the box
    fabpot committed Sep 14, 2016
Commits on Sep 6, 2016
  1. Merge branch '3.1'

    * 3.1:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [Form] Fix transformer tests after the ICU update
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      bumped Symfony version to 3.1.5
      updated VERSION for 3.1.4
      updated CHANGELOG for 3.1.4
      bumped Symfony version to 2.8.11
      updated VERSION for 2.8.10
      updated CHANGELOG for 2.8.10
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
  2. Merge branch '2.8' into 3.1

    * 2.8:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [Form] Fix transformer tests after the ICU update
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      bumped Symfony version to 2.8.11
      updated VERSION for 2.8.10
      updated CHANGELOG for 2.8.10
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
  3. Merge branch '2.7' into 2.8

    * 2.7:
      [FrameworkBundle] Check for class existence before is_subclass_of
      Update GroupSequence.php
      Code enhancement and cleanup
      [DI] Add anti-regression test
      Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
      [BrowserKit] Fix cookie expiration on 32 bit systems
      bumped Symfony version to 2.7.18
      updated VERSION for 2.7.17
      update CONTRIBUTORS for 2.7.17
      updated CHANGELOG for 2.7.17
      Update misleading comment about RFC4627
    nicolas-grekas committed Sep 6, 2016
Commits on Aug 5, 2016
  1. 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. 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. 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. 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. Merge branch '2.7' into 2.8

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

    zomberg committed with fabpot Jul 28, 2016
Commits on Jul 26, 2016
  1. 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. 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. 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. 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
Commits on Jun 29, 2016
  1. Merge branch '3.1'

    * 3.1:
      fixed CS
      fixed CS
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      [Security] Allow LDAP loadUser override
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  2. Merge branch '3.0' into 3.1

    * 3.0:
      fixed CS
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  3. Merge branch '2.8' into 3.0

    * 2.8:
      fixed CS
      fixed form tests
      [Console] Fix formatting of SymfonyStyle::comment()
      [Form] fix post max size translation type extension for >= 2.8
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
  4. Merge branch '2.7' into 2.8

    * 2.7:
      removed dots at the end of @param and @return
      fixed typo
    fabpot committed Jun 29, 2016
Commits on Jun 28, 2016
Commits on Jun 21, 2016
  1. Merge branch '3.1'

    * 3.1:
      fixed CS
      fixed CS
      fixed CS
      fixed CS
      tweaked default CS fixer config
      [HttpKernel] Dont close the output stream in debug
      move HttpKernel component to require section
      Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
      [Session] fix PDO transaction aborted under PostgreSQL
      [Console] Use InputInterface inherited doc as possible
      Mention generating absolute urls in UPGRADE files and CHANGELOG
      parse embedded mappings only if value is a string
      add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
      FormBuilderInterface: fix getForm() return type.
      [YAML] Fixed parsing problem with nested DateTime lists
      Fixed typo in PHPDoc
    fabpot committed Jun 21, 2016
  2. Merge branch '3.0' into 3.1

    * 3.0:
      fixed CS
      fixed CS
      fixed CS
      tweaked default CS fixer config
      [HttpKernel] Dont close the output stream in debug
      move HttpKernel component to require section
      Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
      [Session] fix PDO transaction aborted under PostgreSQL
      [Console] Use InputInterface inherited doc as possible
      Mention generating absolute urls in UPGRADE files and CHANGELOG
      add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
      FormBuilderInterface: fix getForm() return type.
      Fixed typo in PHPDoc
    fabpot committed Jun 21, 2016
  3. Merge branch '2.8' into 3.0

    * 2.8:
      fixed CS
      fixed CS
      tweaked default CS fixer config
      [HttpKernel] Dont close the output stream in debug
      move HttpKernel component to require section
      Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
      [Session] fix PDO transaction aborted under PostgreSQL
      [Console] Use InputInterface inherited doc as possible
      Mention generating absolute urls in UPGRADE files and CHANGELOG
      add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
      FormBuilderInterface: fix getForm() return type.
      Fixed typo in PHPDoc
    fabpot committed Jun 21, 2016
  4. Merge branch '2.7' into 2.8

    * 2.7:
      fixed CS
      tweaked default CS fixer config
      [HttpKernel] Dont close the output stream in debug
      move HttpKernel component to require section
      Fixed oci and sqlsrv merge queries when emulation is disabled - fixes #17284
      [Session] fix PDO transaction aborted under PostgreSQL
      [Console] Use InputInterface inherited doc as possible
      add docblock type elements to support newly added IteratorAggregate::getIterator PhpStorm support
      FormBuilderInterface: fix getForm() return type.
      Fixed typo in PHPDoc
    fabpot committed Jun 21, 2016
Commits on Jun 20, 2016
  1. fixed CS

    fabpot committed Jun 20, 2016
Commits on Jun 14, 2016
  1. feature #17662 [Translation][transChoice] allows escaping the pipe ch…

    …aracter. (aitboudad)
    
    This PR was merged into the 3.2-dev branch.
    
    Discussion
    ----------
    
    [Translation][transChoice] allows escaping the pipe character.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Fixed tickets  | #15195
    | Tests pass?   | yes
    | License       | MIT
    
    Commits
    -------
    
    a35a93b [Translation][transChoice] allows escaping the pipe character.
    fabpot committed Jun 14, 2016
  2. Merge branch '3.1'

    * 3.1: (30 commits)
      Fix merge
      [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
      [Console] fixed PHPDoc
      [Cache] Fix double fetch in ProxyAdapter
      [travis] HHVM 3.12 LTS
      Fix feature detection for IE
      [Form] Fixed collapsed choice attributes
      [Console] added explanation of messages usage in a progress bar
      force enabling the external XML entity loaders
      [Yaml] properly count skipped comment lines
      [WebProfilerBundle] Fix invalid CSS style
      Added progressive jpeg to mime types guesser
      [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
      Fixed singular of committee
      Fixed singular of committee
      Do not inject web debug toolbar on attachments
      Fixed issue with legacy client initialization
      [FrameworkBundle] Remove unused variable
      bumped Symfony version to 3.0.8
      updated VERSION for 3.0.7
      ...
    nicolas-grekas committed Jun 14, 2016
  3. Merge branch '3.0' into 3.1

    * 3.0: (25 commits)
      Fix merge
      [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
      [Console] fixed PHPDoc
      [travis] HHVM 3.12 LTS
      Fix feature detection for IE
      [Form] Fixed collapsed choice attributes
      [Console] added explanation of messages usage in a progress bar
      force enabling the external XML entity loaders
      [Yaml] properly count skipped comment lines
      [WebProfilerBundle] Fix invalid CSS style
      Added progressive jpeg to mime types guesser
      [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
      Fixed singular of committee
      Do not inject web debug toolbar on attachments
      bumped Symfony version to 3.0.8
      updated VERSION for 3.0.7
      updated CHANGELOG for 3.0.7
      bumped Symfony version to 2.8.8
      updated VERSION for 2.8.7
      updated CHANGELOG for 2.8.7
      ...
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/PropertyAccess/StringUtil.php
    	src/Symfony/Component/PropertyAccess/Tests/StringUtilTest.php
    	src/Symfony/Component/Yaml/Parser.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
    nicolas-grekas committed Jun 14, 2016
  4. Merge branch '2.8' into 3.0

    * 2.8: (22 commits)
      Fix merge
      [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
      [Console] fixed PHPDoc
      [travis] HHVM 3.12 LTS
      Fix feature detection for IE
      [Form] Fixed collapsed choice attributes
      [Console] added explanation of messages usage in a progress bar
      force enabling the external XML entity loaders
      [Yaml] properly count skipped comment lines
      [WebProfilerBundle] Fix invalid CSS style
      Added progressive jpeg to mime types guesser
      [Yaml] Fix wrong line number when comments are inserted in the middle of a block.
      Fixed singular of committee
      Do not inject web debug toolbar on attachments
      bumped Symfony version to 2.8.8
      updated VERSION for 2.8.7
      updated CHANGELOG for 2.8.7
      bumped Symfony version to 2.7.15
      updated VERSION for 2.7.14
      update CONTRIBUTORS for 2.7.14
      ...
    
    Conflicts:
    	CHANGELOG-2.7.md
    	CHANGELOG-3.0.md
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    nicolas-grekas committed Jun 14, 2016
  5. Merge branch '2.7' into 2.8

    * 2.7:
      [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5
      [Console] fixed PHPDoc
      [travis] HHVM 3.12 LTS
      Fix feature detection for IE
      [Form] Fixed collapsed choice attributes
      [Console] added explanation of messages usage in a progress bar
      force enabling the external XML entity loaders
      [Yaml] properly count skipped comment lines
    
    Conflicts:
    	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
    nicolas-grekas committed Jun 14, 2016
Commits on Jun 13, 2016
  1. bug #18915 [DependencyInjection] force enabling the external XML enti…

    …ty loaders (xabbuh)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [DependencyInjection] force enabling the external XML entity loaders
    
    | Q             | A
    | ------------- | ---
    | Branch?       | 2.7
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #18876, #18908
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    12b5509 force enabling the external XML entity loaders
    fabpot committed Jun 13, 2016