Skip to content
  • Fabien Potencier's avatar
    40c09727
    Merge branch '2.2' into 2.3 · 40c09727
    Fabien Potencier authored
    * 2.2:
      updated VERSION for 2.2.11
      update CONTRIBUTORS for 2.2.11
      updated CHANGELOG for 2.2.11
      [HttpKernel] made a small optimization to Bundle initialization
      minor optimalization at bundle initialization
      [EventDispatcher] tweaked README
      removed observer pattern, in favour of mediator
      [DoctrineBridge] normalized class names in the ORM type guesser
      Fix `extract` method to avoid recalculating count() for each iteration.
      use the correct class name to retrieve mapped class' metadata and repository
      [WebProfilerBundle] Fixed js escaping in time.html.twig
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
    	src/Symfony/Component/HttpKernel/Kernel.php
    40c09727
    Merge branch '2.2' into 2.3
    Fabien Potencier authored
    * 2.2:
      updated VERSION for 2.2.11
      update CONTRIBUTORS for 2.2.11
      updated CHANGELOG for 2.2.11
      [HttpKernel] made a small optimization to Bundle initialization
      minor optimalization at bundle initialization
      [EventDispatcher] tweaked README
      removed observer pattern, in favour of mediator
      [DoctrineBridge] normalized class names in the ORM type guesser
      Fix `extract` method to avoid recalculating count() for each iteration.
      use the correct class name to retrieve mapped class' metadata and repository
      [WebProfilerBundle] Fixed js escaping in time.html.twig
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
    	src/Symfony/Component/HttpKernel/Kernel.php
To find the state of this project's repository at the time of any of these versions, check out the tags.
Loading