Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 24, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (55 commits)
      CS: fix some license headers
      CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
      Improve triggering of the deprecation error
      [SecurityBundle] Fix typos in LogoutUrlHelper
      [VarDumper] add caster for MongoCursor objects
      make it possible to dump inlined services to XML
      [VarDumper] Fixed notice when Exchange is mocked
      [Translation] keep old array structure of resourcesFiles to avoid BC.
      removed deprecated notices that make the tests fail
      use visited lookup with reference to gain performance
      [VarDumper] with-er interface for Cloner\Data
      Replace GET parameters when changed
      tweaked phpdocs
      [Process] Fix outdated Process->start() docblock
      prevent inlining service configurators
      Improve entropy of generated salt
      Complete the removal of API versions in the validator component
      [Validator] deprecated API version
      Removed 2.5 bc layer
      [SecurityBundle] UserPasswordEncoderCommand: fix help arguments order.
      ...
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.6.md
    	src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
    	src/Symfony/Component/Form/ResolvedFormType.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
Commits on Mar 22, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Fix small coding style
      [2.3] Static Code Analysis for Components
      [Form] fixed phpdoc
      CS: Convert double quotes to single quotes
      Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
      [Validator] added Japanese translation for unmatched charset (id: 80)
      [WebProfilerBundle] fixed undefined buttons.
      [WebProfilerBundle] Fix javascript toolbar on IE8
      [DependencyInjection] Highest precedence for user parameters
      bumped Symfony version to 2.6.6
      [Translation][MoFileLoader] fixed load empty translation.
      updated VERSION for 2.6.5
      updated CHANGELOG for 2.6.5
      bumped Symfony version to 2.3.27
      updated VERSION for 2.3.26
      update CONTRIBUTORS for 2.3.26
      updated CHANGELOG for 2.3.26
      [HttpKernel] UriSigner::buildUrl - default params for http_build_query
    
    Conflicts:
    	src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
    	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix small coding style
      [2.3] Static Code Analysis for Components
      [Form] fixed phpdoc
      CS: Convert double quotes to single quotes
      Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
      [Validator] added Japanese translation for unmatched charset (id: 80)
      [DependencyInjection] Highest precedence for user parameters
      [Translation][MoFileLoader] fixed load empty translation.
      bumped Symfony version to 2.3.27
      updated VERSION for 2.3.26
      update CONTRIBUTORS for 2.3.26
      updated CHANGELOG for 2.3.26
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
    	src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Translation/PluralizationRules.php
    	src/Symfony/Component/Validator/Constraints/IssnValidator.php
    	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
Commits on Mar 21, 2015
  1. @keradus
Commits on Mar 13, 2015
  1. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7:
      Changed visibility of setUp() and tearDown to protected
      Changed visibility of setUp() and tearDown to protected
      [2.7] Fix travis file
      [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
      [Debug] reintroduce charset param to ExceptionHandler
      Changed visibility of setUp() and tearDown to protected
      [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
      [Debug] deprecate ExceptionHandler::utf8Htmlize
      Added default button class
      used HTML5 meta charset tag and removed hardcoded ones
      Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      [FrameworkBundle] Read config/validation/*.(xml|yml) files
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/Extension/LegacyAssetsExtensionTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
    	src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
    	src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
Commits on Mar 12, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
      Changed visibility of setUp() and tearDown to protected
      [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
      Added default button class
      used HTML5 meta charset tag and removed hardcoded ones
      Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	.travis.yml
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Changed visibility of setUp() and tearDown to protected
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Component/Config/Util/XmlUtils.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/OptionsResolver/Options.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
    	src/Symfony/Component/Yaml/Inline.php
Commits on Mar 7, 2015
  1. @kalessil

    Php Inspections (EA Extended) - static code analysis includes:

    kalessil authored
    Reduce couple count calls in [Yaml]
    Modernize type casting, fix several strict comparisons
    Unsets merged
    Elvis operator usage
    Short syntax for applied operations
Commits on Feb 24, 2015
  1. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Minor hot fix
      [PROCESS] make sure /dev/tty is readable
      [2.3] require-dev PHPUnit bridge
      [FrameworkBundle] Fixed Shell logo
      [2.3] Update CONTRIBUTING.md
      [2.3][Process] Fixed PhpProcess::getCommandLine() result
      [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
      Enforce UTF-8 charset for core controllers
    
    Conflicts:
    	CONTRIBUTING.md
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
    	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/DomCrawler/composer.json
    	src/Symfony/Component/EventDispatcher/composer.json
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Templating/composer.json
  2. @nicolas-grekas
Commits on Feb 21, 2015
  1. @Tobion

    Merge branch '2.7'

    Tobion authored
  2. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7:
      [PhpUnitBridge] new bridge for testing with PHPUnit
      [FrameworkBundle] Check if templating is enabled.
      [Filesystem] Improve exception message for copy method
      [FrameworkBundle] Made ServerParams a service
      [2.7] [FrameworkBundle] bugfix in configuration for assets
      [FrameworkBundle] Enable assets by default.
      [Form] OptionsResolver 3.0 is not BC anymore
      [TwigBundle] add missing asset dependency
      Add an auto_alias compiler pass
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Bundle/WebProfilerBundle/composer.json
    	src/Symfony/Component/BrowserKit/composer.json
    	src/Symfony/Component/ClassLoader/composer.json
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/DependencyInjection/composer.json
    	src/Symfony/Component/DomCrawler/composer.json
    	src/Symfony/Component/EventDispatcher/composer.json
    	src/Symfony/Component/Form/composer.json
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Intl/composer.json
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/Core/composer.json
    	src/Symfony/Component/Security/Csrf/composer.json
    	src/Symfony/Component/Security/Http/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Serializer/composer.json
    	src/Symfony/Component/Translation/composer.json
    	src/Symfony/Component/Validator/composer.json
  3. @Tobion

    Merge branch '2.6' into 2.7

    Tobion authored
    Conflicts:
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
  4. @Tobion

    Merge branch '2.3' into 2.6

    Tobion authored
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
    	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
Commits on Feb 18, 2015
  1. @nicolas-grekas
Commits on Feb 15, 2015
  1. @King2500
Commits on Feb 12, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (26 commits)
      removed Propel bridge from Symfony Core
      [2.7] Added deprecation warning for get request service in controller
      [Serializer] Normalizers can serialize collections and scalars
      [FrameworkBundle] Fix title and placeholder rendering in php form templates.
      [Process] added a deprecation notice
      [TwigBridge] Removed duplicated code from TwigRenderer
      [Translator][Logging] implement TranslatorBagInterface.
      RequestDataCollector - small fix
      renamed composer.phar to composer to be consistent with the Symfony docs
      [FrameworkBundle] bumped min version of Routing to 2.3
      removed composer --dev option everywhere
      fixed a test
      [Console] Fixed output bug, if escaped string in a formatted string.
      “console help” ignores --raw option
      Fix form icon position in web profiler
      [Security] Remove ContextListener's onKernelResponse listener as it is used
      Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
      Revert "fixed assertion"
      fixed assertion
      [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
      ...
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Propel1/composer.json
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
Commits on Feb 11, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (21 commits)
      [FrameworkBundle] Fix title and placeholder rendering in php form templates.
      [TwigBridge] Removed duplicated code from TwigRenderer
      [Translator][Logging] implement TranslatorBagInterface.
      RequestDataCollector - small fix
      renamed composer.phar to composer to be consistent with the Symfony docs
      [FrameworkBundle] bumped min version of Routing to 2.3
      removed composer --dev option everywhere
      fixed a test
      [Console] Fixed output bug, if escaped string in a formatted string.
      “console help” ignores --raw option
      Fix form icon position in web profiler
      [Security] Remove ContextListener's onKernelResponse listener as it is used
      Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
      Revert "fixed assertion"
      fixed assertion
      [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
      fixed URL
      Add reference to documentation in FormEvents phpdocs
      [YAML] Fix one-liners to work with multiple new lines
      Keep "pre" meaning for var_dump quick-and-dirty debug
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Security/Http/Firewall/ContextListener.php
    	src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      [FrameworkBundle] Fix title and placeholder rendering in php form templates.
      RequestDataCollector - small fix
      renamed composer.phar to composer to be consistent with the Symfony docs
      [FrameworkBundle] bumped min version of Routing to 2.3
      removed composer --dev option everywhere
      fixed a test
      [Console] Fixed output bug, if escaped string in a formatted string.
      [Security] Remove ContextListener's onKernelResponse listener as it is used
      Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
      Revert "fixed assertion"
      fixed assertion
      [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
      fixed URL
      Add reference to documentation in FormEvents phpdocs
      [YAML] Fix one-liners to work with multiple new lines
      Keep "pre" meaning for var_dump quick-and-dirty debug
      [Console][Table] Fix cell padding with multi-byte
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Console/Helper/TableHelper.php
Commits on Feb 8, 2015
  1. @fabpot
Commits on Jan 9, 2015
  1. @fabpot
Commits on Jan 3, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      Use PHPUnit ini_set wrapper in tests
      [Process] Added a test skip check for Windows
      [Process] Removed unused variable assignment
      Fixes various phpdoc and coding standards.
      Fixes Issue #13184 - incremental output getters now return empty strings
      Updated copyright to 2015
      Updated copyright to 2015
      Updated copyright to 2015
      [VarDumper] increase debug.max_items to 2500
      [Debug] Update exception messages.
      use value of DIRECTORY_SEPARATOR to detect Windows
      force ExpressionLanguage version >= 2.6
      [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.
      Clarify a comment.
      use PHP_WINDOWS_VERSION_BUILD to detect Windows
      Check if a field type_class is defined before using it.
      Currently if you want to use inline bootstrap form rendering, this is usually enough:
      Add deprecation warning to LegacyPdoSessionHandler
    
    Conflicts:
    	src/Symfony/Bridge/Monolog/Logger.php
    	src/Symfony/Bridge/Swiftmailer/LICENSE
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Use PHPUnit ini_set wrapper in tests
      [Process] Added a test skip check for Windows
      [Process] Removed unused variable assignment
      Fixes various phpdoc and coding standards.
      Fixes Issue #13184 - incremental output getters now return empty strings
      Updated copyright to 2015
      Updated copyright to 2015
      Updated copyright to 2015
      [VarDumper] increase debug.max_items to 2500
      [Debug] Update exception messages.
      use value of DIRECTORY_SEPARATOR to detect Windows
      force ExpressionLanguage version >= 2.6
      [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders.
      Clarify a comment.
      use PHP_WINDOWS_VERSION_BUILD to detect Windows
      Check if a field type_class is defined before using it.
      Currently if you want to use inline bootstrap form rendering, this is usually enough:
    
    Conflicts:
    	src/Symfony/Component/Debug/composer.json
  3. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      Use PHPUnit ini_set wrapper in tests
      [Process] Added a test skip check for Windows
      [Process] Removed unused variable assignment
      Fixes various phpdoc and coding standards.
      Fixes Issue #13184 - incremental output getters now return empty strings
      Updated copyright to 2015
      Updated copyright to 2015
      Clarify a comment.
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
  4. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Use PHPUnit ini_set wrapper in tests
      [Process] Added a test skip check for Windows
      [Process] Removed unused variable assignment
      Fixes various phpdoc and coding standards.
      Fixes Issue #13184 - incremental output getters now return empty strings
      Updated copyright to 2015
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
    	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Commits on Jan 2, 2015
  1. @hhamon
Commits on Jan 1, 2015
  1. @saro0h

    Updated copyright to 2015

    saro0h authored
Commits on Dec 30, 2014
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      [Debug] track and report deprecated classes and interfaces
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php
    	src/Symfony/Component/Security/Core/Util/SecureRandom.php
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
  3. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
    
    Conflicts:
    	src/Symfony/Component/Process/Process.php
  4. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [Form] Remove a redundant test.
      use value of DIRECTORY_SEPARATOR to detect Windows
    
    Conflicts:
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
    	src/Symfony/Component/Process/Process.php
  5. @xabbuh

    use value of DIRECTORY_SEPARATOR to detect Windows

    xabbuh authored
    This commit unifies the detection of Windows builds across the Symfony
    codebase.
  6. @nicolas-grekas
Commits on Dec 22, 2014
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      [2.3] CS And DocBlock Fixes
      [Serializer] Serialization groups support
      [2.3] CS Fixes
      Fixed the issue 11116
      [Security] Fixed tests
      [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
      [FrameworkBundle] Fixed Translation loader and update translation command.
      [Console] remove « use » statement for PHP built-in exception classes.
      [SecurityBundle] replaced deprecated SecurityContextInterface dependency by new TokenStorageInterface instance in SecurityDataCollector. Also added unit tests suite for SecurityDataCollector class.
      [SecurityBundle] use TokenStorageInterface instead of deprecated SecurityContextInterface in SecurityDataCollector and added unit tests suite.
      [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
      [Serializer] Add xml_format_output context option. Close #12517.
      [WebProfilerBundle] Fixed IE8 support
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [2.3] CS And DocBlock Fixes
      [2.3] CS Fixes
      [FrameworkBundle] Fixed Translation loader and update translation command.
      [Console] remove « use » statement for PHP built-in exception classes.
      [SecurityBundle] adds unit tests suite for SecurityDataCollector class.
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
Something went wrong with that request. Please try again.