Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 12, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (77 commits)
      [travis] Use container-based infrastructure
      [HttpKernel] use ConfigCache::getPath() method when it exists
      [PropertyAccess] Fix setting public property on a class having a magic getter
      [Routing] Display file which contain deprecated option
      ContainerInterface: unused exception dropped
      bumped Symfony version to 2.6.8
      updated VERSION for 2.6.7
      updated CHANGELOG for 2.6.7
      bumped Symfony version to 2.3.29
      updated VERSION for 2.3.28
      update CONTRIBUTORS for 2.3.28
      updated CHANGELOG for 2.3.28
      [Debug] Fixed ClassNotFoundFatalErrorHandlerTest
      [SecurityBundle] use access decision constants in config
      [SecurityBundle] use session auth constants in config
      PhpDoc fix in AbstractRememberMeServices
      [FrameworkBundle][DX] Add option to specify additional translation loading paths
      [Filesystem] Simplified an if statement
      fixed CS
      [SecurityBundle] Use Enum Nodes Instead Of Scalar
      ...
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.6.md
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
    	src/Symfony/Component/Debug/DebugClassLoader.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Locale/composer.json
    	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
    	src/Symfony/Component/Routing/Loader/YamlFileLoader.php
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
    	src/Symfony/Component/Yaml/Yaml.php
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7: (70 commits)
      [travis] Use container-based infrastructure
      [HttpKernel] use ConfigCache::getPath() method when it exists
      [PropertyAccess] Fix setting public property on a class having a magic getter
      [Routing] Display file which contain deprecated option
      ContainerInterface: unused exception dropped
      bumped Symfony version to 2.6.8
      updated VERSION for 2.6.7
      updated CHANGELOG for 2.6.7
      bumped Symfony version to 2.3.29
      updated VERSION for 2.3.28
      update CONTRIBUTORS for 2.3.28
      updated CHANGELOG for 2.3.28
      [Debug] Fixed ClassNotFoundFatalErrorHandlerTest
      [SecurityBundle] use access decision constants in config
      [SecurityBundle] use session auth constants in config
      PhpDoc fix in AbstractRememberMeServices
      [Filesystem] Simplified an if statement
      [SecurityBundle] Use Enum Nodes Instead Of Scalar
      [Debug 2.3] Fix test for PHP7
      [HttpKernel] Check if "symfony/proxy-manager-bridge" package is installed
      ...
    
    Conflicts:
    	src/Symfony/Bundle/DebugBundle/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/Loader/CsvFileLoader.php
    	src/Symfony/Component/Translation/Loader/IniFileLoader.php
    	src/Symfony/Component/Translation/Loader/MoFileLoader.php
    	src/Symfony/Component/Translation/Loader/PhpFileLoader.php
    	src/Symfony/Component/Translation/Loader/PoFileLoader.php
    	src/Symfony/Component/Translation/Loader/YamlFileLoader.php
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Translation/Translator.php
    	src/Symfony/Component/Validator/README.md
Commits on May 4, 2015
  1. @dunglas
Commits on May 2, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (25 commits)
      [2.6] link to https://symfony.com where possible
      Do not override PHP constants, only use when available
      link to https://symfony.com where possible
      [FrameworkBundle] Added missing log in server:run command
      [Finder] Only use GLOB_BRACE when available
      [HttpFoundation] Allow curly braces in trusted host patterns
      Fix merge
      Fix typo in variable name
      [profiler][security] check authenticated user by tokenClass instead of username.
      [WebProfiler] fix html syntax for input types
      [TwigBundle] Fix deprecated use of FlattenException
      [DependencyInjection] Removed extra strtolower calls
      Use https://symfony.com/search for searching
      [Debug] PHP7 compatibility with BaseException
      [Validator] Fixed Choice when an empty array is used in the "choices" option
      Fixed tests
      [StringUtil] Fixed singularification of 'selfies'
      Fix Portuguese (Portugal) translation for Security
      improved exception when missing required component
      [DependencyInjection] resolve circular reference
      ...
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      link to https://symfony.com where possible
      [FrameworkBundle] Added missing log in server:run command
      [HttpFoundation] Allow curly braces in trusted host patterns
      [profiler][security] check authenticated user by tokenClass instead of username.
      Use https://symfony.com/search for searching
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
    	src/Symfony/Component/Form/README.md
    	src/Symfony/Component/Intl/README.md
    	src/Symfony/Component/Routing/composer.json
    	src/Symfony/Component/Security/README.md
    	src/Symfony/Component/Translation/README.md
    	src/Symfony/Component/Validator/README.md
Commits on May 1, 2015
  1. @xabbuh
Commits on Apr 27, 2015
  1. @dunglas @fabpot
  2. @dunglas

    feature #14187 [Serializer] Supports hassers and setters for groups a…

    dunglas authored
    …nnotations (dunglas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Serializer] Supports hassers and setters for groups annotations
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    For more coherence with the new `ObjectNormalizer` (#13257), this PR allows to add `@Groups` annotations on hasser and setter methods too.
    
    Commits
    -------
    
    9c87ecc [Serializer] Supports hassers and setters for groups annotations
  3. @dunglas

    minor #14151 Removed deprecations in Serializer component (dosten)

    dunglas authored
    This PR was squashed before being merged into the master branch (closes #14151).
    
    Discussion
    ----------
    
    Removed deprecations in Serializer component
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    e90e9b2 Removed deprecations in Serializer component
  4. @dosten @dunglas

    Removed deprecations in Serializer component

    dosten authored dunglas committed
Commits on Apr 24, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (61 commits)
      [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
      [2.6][Translator] Extend, refactor and simplify Translator tests.
      [VarDumper] Allow preserving a subset of cut arrays
      [Console] Bind the closure (code) to the Command if possible
      [VarDumper] Added support for SplFileObject
      [VarDumper] Added support for SplFileInfo
      Update DebugClassLoader.php
      inject asset packages in assets helper service
      [travis] Do not exclude legacy tests on 2.7
      [HttpFoundation] remove getExtension method
      [2.6][Translation] fix legacy tests.
      [Form] Removed remaining deprecation notices in the test suite
      [Form] Moved deprecation notice triggers to file level
      [Debug] Map PHP errors to LogLevel::CRITICAL
      [FrameworkBundle][Server Command] add address port number option.
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Initialize translator with the default locale.
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [2.7][Translation] remove duplicate code for loading catalogue.
      ...
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/Swiftmailer/composer.json
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
    	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
    	src/Symfony/Component/Locale/composer.json
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7: (40 commits)
      [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
      [2.6][Translator] Extend, refactor and simplify Translator tests.
      Update DebugClassLoader.php
      inject asset packages in assets helper service
      [travis] Do not exclude legacy tests on 2.7
      [HttpFoundation] remove getExtension method
      [2.6][Translation] fix legacy tests.
      [Form] Removed remaining deprecation notices in the test suite
      [Form] Moved deprecation notice triggers to file level
      [Debug] Map PHP errors to LogLevel::CRITICAL
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Initialize translator with the default locale.
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [2.7][Translation] remove duplicate code for loading catalogue.
      [2.6][Translation] remove duplicate code for loading catalogue.
      [HttpKernel] Cleanup ExceptionListener
      CS fixes
      [DependencyInjection] Show better error when the Yaml component is not installed
      [2.3] SCA for Components - reference mismatches
      ...
Commits on Apr 11, 2015
  1. @Tobion
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      [HttpKernel] fixed a regression when no exception listeners are registered
      renamed some confusing tests
      propel/propel1 is now useless
      bumped Symfony version to 2.7.0
      updated VERSION for 2.7.0-BETA1
      updated CHANGELOG for 2.7.0-BETA1
      [2.3] Fix @link annotations
      [2.7] For @link annotations
      [2.6] Fix @link annotations
      [2.7][Console] Count the  array instead of
      [Config][cache factory] check type of callback argument.
      Fix javascript
      [2.3][Translation] test refresh cache when resources File change.
      Added deprecation message and original color back
      [Translator] Cache does not take fallback locales into consideration
Commits on Apr 10, 2015
  1. @nicolas-grekas

    [2.7] For @link annotations

    nicolas-grekas authored
  2. @fabpot

    updated version to 2.8

    fabpot authored
  3. @fabpot

    Revert "removed 3.0 constraints from 2.7 composer files"

    fabpot authored
    This reverts commit 5503804cf91f4ede81b94b34609653c013139038.
  4. @fabpot
  5. @fabpot
Commits on Apr 2, 2015
  1. @dunglas
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 17, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      Marked the ResolveParameterPlaceHoldersPassTest as legacy
      [ExpressionLanguage] fixed issues when parsing postfix expressions
      remove unused code
      do not inline service factories
      resolve class parameters in service factories
      [Serializer] Fix object normalization exceptions
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Marked the ResolveParameterPlaceHoldersPassTest as legacy
      [ExpressionLanguage] fixed issues when parsing postfix expressions
      remove unused code
      do not inline service factories
      resolve class parameters in service factories
      [Serializer] Fix object normalization exceptions
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
    	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
    	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
Commits on Mar 15, 2015
  1. @dunglas
Commits on Mar 13, 2015
  1. @nicolas-grekas

    Merge branch 'legacy27' into legacy-master

    nicolas-grekas authored
    * legacy27:
      [2.7] add @group legacy
      [2.6] add @group legacy
      [2.3] add @group legacy
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
    	src/Symfony/Bridge/Twig/Tests/Extension/AssetExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelper.php
    	src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
    	src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
    	src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
    	src/Symfony/Component/Console/Tests/Command/CommandTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
    	src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
    	src/Symfony/Component/EventDispatcher/Tests/EventTest.php
    	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
    	src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
    	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
    	src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
    	src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
    	src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
    	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
    	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
    	src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
    	src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
    	src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
    	src/Symfony/Component/Routing/Tests/RouteTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyCoreAssetsHelperTest.php
    	src/Symfony/Component/Yaml/Tests/YamlTest.php
  2. @nicolas-grekas

    [2.7] add @group legacy

    nicolas-grekas authored
  3. @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
  4. @saro0h
Commits on Mar 7, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (22 commits)
      Php Inspections (EA Extended): squash all PR-13813 commits
      replaced the last remaining is_integer() call
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
      [FrameworkBundle] simplify dep declaration
      [VarDumper] Fix "next element is already occupied"
      [Serializer] Introduce ObjectNormalizer
      [Serializer] Refactoring of metadata
      [Validator] Added missing galician (gl) translations
      [WebProfilerBundle] Update ajax calls in toolbar to add the css error class
      [PropertyAccess] stop overwriting once a reference is reached (3rd)
      [OptionsResolver] Remove Unused Variable from Foreach Cycles
      [travis] Tests Security sub-components
      [Serializer] Test that normalizers ignore non-existing attributes.
      [Twig] bootstrap_3_layout.html.twig is usable as a trait
      [travis] Tests Security sub-components
      [Serializer] Fix ClassMetadataFactory PHPDoc
      CS fixes
      [Serializer] rename exception interface
      [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
      [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
      ...
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Serializer/composer.json
Commits on Mar 6, 2015
  1. @dunglas
  2. @dunglas
  3. @dunglas

    minor #13796 [Serializer] Replace BadMethodCallException by MappingEx…

    dunglas authored
    …ception (dunglas)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Serializer] Replace BadMethodCallException by MappingException
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no (`AnnotationLoader` will be introduced in 2.7)
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Commits
    -------
    
    469b8e7 [Serializer] Replace BadMethodCallException by UnexpectedValueException
Something went wrong with that request. Please try again.