Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8:
      [travis] start hhvm first
      [DX] [Security] Renamed Token#getKey() to getSecret()
      [Validator] always evaluate binary format when changed
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Security/Http/composer.json
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [travis] start hhvm first
      [Validator] always evaluate binary format when changed
  3. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [travis] start hhvm first
      [Validator] always evaluate binary format when changed
    
    Conflicts:
    	.travis.yml
Commits on Jul 1, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (65 commits)
      [VarDumper] Fix tests for HHVM
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
      Fix merge
      [2.6] Towards 100% HHVM compat
      [Security/Http] Fix test
      [Stopwatch] Fix test
      Minor fixes
      [Validator] Added missing error codes and turned codes into UUIDs
      Towards 100% HHVM compat
      Warmup twig templates in non-standard paths (closes #12507)
      [Bridge/PhpUnit] Enforce a consistent locale
      Fix param order of assertEquals (expected, actual) in test for Finder\Glob
      Fix choice translation domain for expanded choice widget
      unify default AccessDeniedExeption message
      trigger event with right user (add test)
      [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
      fixed CS
      ...
    
    Conflicts:
    	UPGRADE-2.8.md
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
    	src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
    	src/Symfony/Component/DependencyInjection/Definition.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/legacy-services9.dot
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml
    	src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
    	src/Symfony/Component/Form/ResolvedFormType.php
    	src/Symfony/Component/Form/Tests/CompoundFormTest.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
    	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
  2. @fabpot

    bug #15115 [Validator] always evaluate binary format when changed (xa…

    fabpot authored
    …bbuh)
    
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [Validator] always evaluate binary format when changed
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #13891
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    2ad7e67 [Validator] always evaluate binary format when changed
  3. @xabbuh
  4. @aitboudad

    Merge remote-tracking branch 'origin/2.7' into 2.8

    aitboudad authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
Commits on Jun 30, 2015
  1. @webmozart
Commits on Jun 28, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [2.6][Validator] Fix BC for Validator's validate method
      Very small typo fix
      Fix quoting style consistency.
      [DependencyInjection] Fail when dumping a Definition with no class nor factory
      Normalizing recursively - see #9096
      No change - the normalizeParams is a copy-and-paste of the earlier logic
      fixes issue with logging array of non-utf8 data
      fix validation for Maestro UK card numbers
    
    Conflicts:
    	src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
    	src/Symfony/Component/Validator/Validator/LegacyValidator.php
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix quoting style consistency.
      [DependencyInjection] Fail when dumping a Definition with no class nor factory
      Normalizing recursively - see #9096
      No change - the normalizeParams is a copy-and-paste of the earlier logic
      fixes issue with logging array of non-utf8 data
      fix validation for Maestro UK card numbers
  3. @fabpot

    bug #15126 [2.6][Validator] Fix BC for Validator's validate method (m…

    fabpot authored
    …ichalmarcinkowski)
    
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [2.6][Validator] Fix BC for Validator's validate method
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets |
    | License       | MIT
    | Doc PR        |
    
    This fix makes method call ``` $validator->validate($value, array()); ``` backward compatible and does not throw
    
    ```
    [Symfony\Component\Validator\Exception\NoSuchMetadataException]
    
    The class or interface "XXX" does not exist.
    ```
    
    when the ``` $value ``` is a scalar type.
    
    Commits
    -------
    
    ffe25dc [2.6][Validator] Fix BC for Validator's validate method
  4. @michalmarcinkowski
Commits on Jun 27, 2015
  1. @xabbuh
  2. @Tobion

    Merge branch '2.6' into 2.7

    Tobion authored
  3. @Tobion

    Merge branch '2.3' into 2.6

    Tobion authored
    Conflicts:
    	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
    	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
  4. @aitboudad @fabpot

    [Validator][callback constraint] include class name in ConstraintDefi…

    aitboudad authored fabpot committed
    …nitionException.
Commits on Jun 26, 2015
  1. @xabbuh
  2. @garak @fabpot

    Fix typo in Italian translation

    garak authored fabpot committed
Commits on Jun 25, 2015
  1. @aitboudad

    Merge remote-tracking branch 'origin/2.6' into 2.7

    aitboudad authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
    	src/Symfony/Component/Validator/Constraints/EmailValidator.php
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Fixed the regexp for the validator of Maestro-based credit/debit cards
      [Console] Fix STDERR output text on IBM iSeries OS400
      [HttpFoundation] Use convention to allow throwing from __toString()
      [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern)
      [bugfix][MonologBridge] WebProcessor: passing  to BaseWebProcessor
      [2.3] Static Code Analysis for Components
      [Translation][update cmd] taken account into bundle overrides path.
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
Commits on Jun 24, 2015
  1. @javiereguiluz @fabpot
Commits on Jun 23, 2015
  1. @fabpot

    bug #14853 [Validator] more strict e-mail validation regex (xabbuh)

    fabpot authored
    This PR was merged into the 2.6 branch.
    
    Discussion
    ----------
    
    [Validator] more strict e-mail validation regex
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14848
    | License       | MIT
    | Doc PR        |
    
    Commits
    -------
    
    6491033 [Validator] more strict e-mail validation regex
Commits on Jun 19, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8:
      [2.8] Silence newest deprecations
      [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
      [VarDumper] Fix dump output for better readability
      [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.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/Tests/ApplicationTest.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/Console/Tests/Input/InputDefinitionTest.php
    	src/Symfony/Component/Console/Tests/Input/StringInputTest.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
    	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
    	src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
    	src/Symfony/Component/DependencyInjection/Tests/LegacyContainerBuilderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/LegacyDefinitionTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
    	src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
    	src/Symfony/Component/EventDispatcher/Tests/EventTest.php
    	src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
    	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
    	src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
    	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
    	src/Symfony/Component/Locale/Tests/LocaleTest.php
    	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
    	src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsResolverTest.php
    	src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.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/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyCoreAssetsHelperTest.php
    	src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
    	src/Symfony/Component/Yaml/Tests/YamlTest.php
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
      [VarDumper] Fix dump output for better readability
      [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy
Commits on Jun 18, 2015
  1. @nicolas-grekas
  2. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (42 commits)
      [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
      [Serializer] Fixed typo in comment
      [Form] Fixed: Filter non-integers when selecting entities by int ID
      [Form] [EventListener] fixed sending non array data on submit to ResizeListener
      Fix merge
      Fix merge
      Add test for HHVM FatalErrors
      [2.6][Debug] Fix fatal-errors handling on HHVM
      [Debug] Fix log level of stacked errors
      [Form] Deprecated "cascade_validation"
      [Form] Add "prototype_data" option to collection type
      [VarDumper] Fix uninitialized id in HtmlDumper
      [Form] Added the 'range' FormType
      Fixed fluent interface
      [Console] Fix tests on Windows
      [2.7] Fix unsilenced deprecation notices
      [2.3][Debug] Fix fatal-errors handling on HHVM
      [Debug] fix debug class loader case test on windows
      Standardize the name of the exception variables
      [Debug+VarDumper] Fix handling of PHP7 exception/error model
      ...
    
    Conflicts:
    	CHANGELOG-2.7.md
    	UPGRADE-2.7.md
    	UPGRADE-2.8.md
    	src/Symfony/Bridge/Twig/AppVariable.php
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
    	src/Symfony/Component/Form/AbstractType.php
    	src/Symfony/Component/Form/AbstractTypeExtension.php
    	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
    	src/Symfony/Component/HttpKernel/Tests/Logger.php
    	src/Symfony/Component/PropertyAccess/Exception/UnexpectedTypeException.php
    	src/Symfony/Component/Routing/Route.php
Commits on Jun 17, 2015
  1. @webmozart
Commits on Jun 11, 2015
  1. @fabpot

    Merge branch '2.8'

    fabpot authored
    * 2.8: (36 commits)
      Fix test name
      fixed CS
      Allow new lines in Messages translated with transchoice() (replacement for #14867)
      [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one
      [2.3] Fix tests on Windows
      [Yaml] remove partial deprecation annotation
      [HttpFoundation] Postpone setting the date header on a Response
      [Console] SymfonyStyle : Fix blocks wordwrapping
      [Console] SymfonyStyle : Fix blocks output is broken on windows cmd
      [toolbar] Merged colored icons in toolbar
      [Validator] remove partial deprecation annotation
      Updated UPGRADE-2.4.md
      added missing "
      Silence invasive deprecation warnings, opt-in for warnings
      [Form] Support DateTimeImmutable in transform()
      Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions
      Removed route name from the debugbar.
      [FrameworkBundle] Document form.csrf_provider service deprecation
      [Form] add test to avoid regression of #14891
      without this change allways the legacy code get called
      ...
    
    Conflicts:
    	UPGRADE-2.4.md
    	UPGRADE-2.7.md
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Monolog/Logger.php
    	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
    	src/Symfony/Bridge/Twig/AppVariable.php
    	src/Symfony/Bridge/Twig/Extension/AssetExtension.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
    	src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/Debug/TimedTwigEngine.php
    	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
    	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
    	src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php
    	src/Symfony/Bundle/TwigBundle/TwigEngine.php
    	src/Symfony/Bundle/TwigBundle/composer.json
    	src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
    	src/Symfony/Component/ClassLoader/DebugClassLoader.php
    	src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
    	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Console/Command/Command.php
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/Console/Helper/HelperSet.php
    	src/Symfony/Component/Console/Helper/ProgressBar.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Console/Input/InputDefinition.php
    	src/Symfony/Component/Console/Input/StringInput.php
    	src/Symfony/Component/Debug/DebugClassLoader.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/Debug/Exception/DummyException.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/DependencyInjection/Definition.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
    	src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
    	src/Symfony/Component/EventDispatcher/Event.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/Form/Deprecated/FormEvents.php
    	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
    	src/Symfony/Component/Form/ResolvedFormType.php
    	src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
    	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
    	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
    	src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
    	src/Symfony/Component/HttpKernel/EventListener/EsiListener.php
    	src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
    	src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
    	src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
    	src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
    	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
    	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
    	src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
    	src/Symfony/Component/HttpKernel/HttpCache/Esi.php
    	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
    	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
    	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Log/NullLogger.php
    	src/Symfony/Component/HttpKernel/composer.json
    	src/Symfony/Component/Locale/Exception/MethodArgumentNotImplementedException.php
    	src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php
    	src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php
    	src/Symfony/Component/Locale/Exception/NotImplementedException.php
    	src/Symfony/Component/Locale/Locale.php
    	src/Symfony/Component/Locale/Stub/DateFormat/AmPmTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/DayOfWeekTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/DayOfYearTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/Hour2400Transformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/HourTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/QuarterTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/Transformer.php
    	src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php
    	src/Symfony/Component/Locale/Stub/StubCollator.php
    	src/Symfony/Component/Locale/Stub/StubIntl.php
    	src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
    	src/Symfony/Component/Locale/Stub/StubLocale.php
    	src/Symfony/Component/Locale/Stub/StubNumberFormatter.php
    	src/Symfony/Component/OptionsResolver/OptionsResolver.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Process/ProcessUtils.php
    	src/Symfony/Component/PropertyAccess/PropertyAccess.php
    	src/Symfony/Component/Routing/Annotation/Route.php
    	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
    	src/Symfony/Component/Routing/Loader/YamlFileLoader.php
    	src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/Routing/Route.php
    	src/Symfony/Component/Serializer/Encoder/JsonDecode.php
    	src/Symfony/Component/Serializer/Encoder/JsonEncode.php
    	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
    	src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
    	src/Symfony/Component/Templating/Asset/Package.php
    	src/Symfony/Component/Templating/Asset/PackageInterface.php
    	src/Symfony/Component/Templating/Asset/PathPackage.php
    	src/Symfony/Component/Templating/Asset/UrlPackage.php
    	src/Symfony/Component/Templating/Helper/AssetsHelper.php
    	src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
    	src/Symfony/Component/Templating/Loader/Loader.php
    	src/Symfony/Component/Translation/Translator.php
    	src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
    	src/Symfony/Component/VarDumper/Cloner/Data.php
    	src/Symfony/Component/Yaml/Yaml.php
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      Fix test name
      fixed CS
      Allow new lines in Messages translated with transchoice() (replacement for #14867)
      [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one
      [2.3] Fix tests on Windows
      [Yaml] remove partial deprecation annotation
      Silence invasive deprecation warnings, opt-in for warnings
      Documenting how to keep option value BC - see #14377
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/composer.json
    	src/Symfony/Bridge/Twig/composer.json
Commits on Jun 9, 2015
  1. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      [Console] SymfonyStyle : Fix blocks wordwrapping
      [Console] SymfonyStyle : Fix blocks output is broken on windows cmd
      [Validator] remove partial deprecation annotation
      Updated UPGRADE-2.4.md
      [Form] Support DateTimeImmutable in transform()
      Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions
      [FrameworkBundle] Document form.csrf_provider service deprecation
      [Form] add test to avoid regression of #14891
      without this change allways the legacy code get called
      [Form] Fix call to removed method (BC broken in 2.3)
      Fix ask and askHidden methods
      [HttpFoundation] Get response content as resource several times for PHP >= 5.6
      Change error message to reflect SecurityContext deprecation.
      fixed merge
      Issue #14815
      [Console] SymfonyStyle : fix & automate block gaps.
      [Console] SymfonyStyle : Improve EOL consistency by relying on output instance
      Improved duplicated code in FileLocator
Commits on Jun 8, 2015
  1. @xabbuh
  2. @reecefowell
Commits on Jun 5, 2015
  1. @fabpot

    fixed merge

    fabpot authored
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Issue #14815
  3. @gerritdrost @fabpot

    Issue #14815

    gerritdrost authored fabpot committed
    Removed @deprecated tags and moved their descriptions to the method description as a note.
Something went wrong with that request. Please try again.