Permalink
Commits on Feb 21, 2017
  1. Merge branch '3.2'

    * 3.2:
      Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
      Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
      Further refactorings to PHPUnit namespaces
      resolve parameters in definition classes
    nicolas-grekas committed Feb 21, 2017
  2. Merge branch '2.8' into 3.2

    * 2.8:
      Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
      Further refactorings to PHPUnit namespaces
      resolve parameters in definition classes
    nicolas-grekas committed Feb 21, 2017
  3. Merge branch '2.7' into 2.8

    * 2.7:
      Further refactorings to PHPUnit namespaces
      resolve parameters in definition classes
    nicolas-grekas committed Feb 21, 2017
Commits on Feb 18, 2017
  1. Merge branch '3.2'

    * 3.2:
      Fix typo in process error message
      Update to PHPUnit namespaces
      Minor typo fix messsagesData -> messagesData
      remove translation data collector when not usable
    nicolas-grekas committed Feb 18, 2017
  2. Merge branch '2.8' into 3.2

    * 2.8:
      Update to PHPUnit namespaces
      Minor typo fix messsagesData -> messagesData
      remove translation data collector when not usable
    nicolas-grekas committed Feb 18, 2017
  3. Merge branch '2.7' into 2.8

    * 2.7:
      Update to PHPUnit namespaces
      remove translation data collector when not usable
    nicolas-grekas committed Feb 18, 2017
  4. Update to PHPUnit namespaces

    peterrehm committed with fabpot Feb 8, 2017
Commits on Jan 2, 2017
  1. Merge branch '3.2'

    * 3.2:
      updated LICENSE year
      updated LICENSE year
      updated LICENSE year
      Fixed `@return self` with `$this`
      [Yaml] add missing indicator character
    fabpot committed Jan 2, 2017
  2. Merge branch '3.1' into 3.2

    * 3.1:
      updated LICENSE year
      updated LICENSE year
      Fixed `@return self` with `$this`
    fabpot committed Jan 2, 2017
  3. Merge branch '2.8' into 3.1

    * 2.8:
      updated LICENSE year
      updated LICENSE year
      Fixed `@return self` with `$this`
    fabpot committed Jan 2, 2017
  4. Merge branch '2.7' into 2.8

    * 2.7:
      updated LICENSE year
      Fixed `@return self` with `$this`
    fabpot committed Jan 2, 2017
  5. updated LICENSE year

    fabpot committed Jan 2, 2017
Commits on Dec 27, 2016
  1. Merge branch '3.2'

    * 3.2:
      [FrameworkBundle] Ignore AnnotationException exceptions in the AnnotationsCacheWarmer
      fixed @return when returning this or static
      override property constraints in child class
      removed unneeded comment
      [Console] improved code coverage of Command class
      [FrameworkBundle] Make TemplateController working without the Templating component
      [FrameworkBundle] Allow multiple transactions with the same name
      Only count on arrays or countables to avoid warnings in PHP 7.2
    fabpot committed Dec 27, 2016
  2. Merge branch '3.1' into 3.2

    * 3.1:
      fixed @return when returning this or static
      override property constraints in child class
      removed unneeded comment
      [Console] improved code coverage of Command class
      [FrameworkBundle] Make TemplateController working without the Templating component
      Only count on arrays or countables to avoid warnings in PHP 7.2
    fabpot committed Dec 27, 2016
  3. Merge branch '2.8' into 3.1

    * 2.8:
      fixed @return when returning this or static
      override property constraints in child class
      removed unneeded comment
      [Console] improved code coverage of Command class
      [FrameworkBundle] Make TemplateController working without the Templating component
      Only count on arrays or countables to avoid warnings in PHP 7.2
    fabpot committed Dec 27, 2016
  4. Merge branch '2.7' into 2.8

    * 2.7:
      fixed @return when returning this or static
      override property constraints in child class
      [Console] improved code coverage of Command class
      Only count on arrays or countables to avoid warnings in PHP 7.2
    fabpot committed Dec 27, 2016
Commits on Dec 19, 2016
  1. Merge branch '3.2'

    * 3.2:
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      [WebProfilerBundle] Display multiple HTTP headers in WDT
      do not remove the Twig ExceptionController service
      removed obsolete condition
      do not try to register incomplete definitions
    fabpot committed Dec 19, 2016
  2. Merge branch '3.1' into 3.2

    * 3.1:
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      [WebProfilerBundle] Display multiple HTTP headers in WDT
      do not remove the Twig ExceptionController service
      removed obsolete condition
      do not try to register incomplete definitions
    fabpot committed Dec 19, 2016
  3. fixed obsolete getMock() usage

    fabpot committed Dec 19, 2016
  4. Merge branch '2.8' into 3.1

    * 2.8:
      fixed obsolete getMock() usage
      fixed obsolete getMock() usage
      [WebProfilerBundle] Display multiple HTTP headers in WDT
      do not remove the Twig ExceptionController service
      removed obsolete condition
      do not try to register incomplete definitions
    fabpot committed Dec 19, 2016
  5. Merge branch '2.7' into 2.8

    * 2.7:
      fixed obsolete getMock() usage
      [WebProfilerBundle] Display multiple HTTP headers in WDT
    fabpot committed Dec 19, 2016
  6. fixed obsolete getMock() usage

    fabpot committed Dec 19, 2016
Commits on Nov 19, 2016
  1. updated version to 3.3

    fabpot committed Nov 19, 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