Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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
Commits on Jun 24, 2015
  1. @dosten
Commits on Jun 18, 2015
  1. @nicolas-grekas
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
Commits on Apr 20, 2015
  1. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [2.6][Translation] fix legacy tests.
      [EventDispatcher] make listeners removable from an executed listener
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
Commits on Apr 14, 2015
  1. @xabbuh
Commits on Mar 13, 2015
  1. @nicolas-grekas

    [2.7] add @group legacy

    nicolas-grekas authored
  2. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [2.6] add @group legacy
      [2.3] add @group legacy
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php
    	src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
    	src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php
    	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php
    	src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
  3. @nicolas-grekas

    [2.6] add @group legacy

    nicolas-grekas authored
Commits on Feb 5, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (61 commits)
      fixxed order of usage
      [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
      removed the last deprecation notice
      [Serializer] Silent deprecation notice
      removed deprecation notice
      [PropertyAccess] Show property path in all exception messages
      added deprecation notice for HttpCache::createEsi()
      added missing deprecation notice when using the form_enctype function
      [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
      removed non-sense example
      Fixes small typo.
      [Validator] Remove unnecessary include in tests
      [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
      fixed typo
      [Serializer] Use Serializer's LogicException when applicable
      [Serializer] Use autoloader for annotations in tests
      [Validator] fix DOS-style line endings
      Drop useless execution bit
      bumped Symfony version to 2.6.5
      [Serializer] update changelog
      ...
    
    Conflicts:
    	CHANGELOG-2.3.md
    	CHANGELOG-2.5.md
    	CHANGELOG-2.6.md
    	src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
    	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
    	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (46 commits)
      fixxed order of usage
      [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
      [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
      removed non-sense example
      Fixes small typo.
      [Validator] Remove unnecessary include in tests
      [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
      fixed typo
      [Validator] fix DOS-style line endings
      Drop useless execution bit
      bumped Symfony version to 2.6.5
      [Serializer] update changelog
      updated VERSION for 2.6.4
      updated CHANGELOG for 2.6.4
      bumped Symfony version to 2.5.11
      [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver
      updated VERSION for 2.5.10
      updated CHANGELOG for 2.5.10
      [Validator] Add a Russian translation for invalid charset message
      [2.3] [Validator] spanish translation for invalid charset message
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
    	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
    	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
    	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
Commits on Feb 1, 2015
  1. @nicolas-grekas

    Merge branch '2.5' into 2.6

    nicolas-grekas authored
    * 2.5:
      [Validator] use 2.5 API in LengthValidator
      fixed id for translations
      bumped Symfony version to 2.3.26
      Dutch translation for invalid charset message
      German translation for invalid charset message
      Add a Slovenian translation for invalid charset message
      Add a Polish translation.
      Test lowest deps with latest 5.3
      updated VERSION for 2.3.25
      update CONTRIBUTORS for 2.3.25
      updated CHANGELOG for 2.3.25
      Fix docblocks to comments
      Inject the correct EventDispatcher instance
      [Validator] reject ill-formed strings
      [Validator] drop grapheme_strlen in LengthValidator
      Unique Entity Validator Invalid Value
      [FrameworkBundle][config] allow multiple fallback locales.
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
    	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
    	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
Commits on Jan 29, 2015
  1. @dosten @fabpot

    Inject the correct EventDispatcher instance

    dosten authored fabpot committed
Commits on Jan 16, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      fixed tests
      [EventDispatcher] Add missing checks to RegisterListenersPass
      Inline private 'is quoting required' methods in Escaper
      [HttpKernel] Add request uri to Logger context
      removed notices for some constants as it does not work well
      [Debug] fix loading order for legacy classes
      Add comment as requested
      Remove duplicate 'require'
      [Yaml] Improve YAML boolean escaping
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      fixed tests
      [EventDispatcher] Add missing checks to RegisterListenersPass
      Inline private 'is quoting required' methods in Escaper
      [Debug] fix loading order for legacy classes
      Add comment as requested
      Remove duplicate 'require'
      [Yaml] Improve YAML boolean escaping
  3. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      fixed tests
      [EventDispatcher] Add missing checks to RegisterListenersPass
      Inline private 'is quoting required' methods in Escaper
      [Debug] fix loading order for legacy classes
      Add comment as requested
      Remove duplicate 'require'
      [Yaml] Improve YAML boolean escaping
    
    Conflicts:
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
  4. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      fixed tests
      [EventDispatcher] Add missing checks to RegisterListenersPass
      Inline private 'is quoting required' methods in Escaper
      [Debug] fix loading order for legacy classes
      Add comment as requested
      Remove duplicate 'require'
      [Yaml] Improve YAML boolean escaping
    
    Conflicts:
    	src/Symfony/Component/Debug/Exception/FatalErrorException.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
  5. @aitboudad
  6. @aitboudad
Commits on Jan 8, 2015
  1. @fabpot
Commits on Jan 5, 2015
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [2.5] cleanup deprecated uses
  2. @nicolas-grekas
Commits on Jan 3, 2015
  1. @nicolas-grekas
Commits on Dec 22, 2014
  1. @fabpot

    Merge branch '2.5' into 2.6

    fabpot authored
    * 2.5:
      [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
    	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
    	src/Symfony/Component/Form/Form.php
    	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
    	src/Symfony/Component/OptionsResolver/Options.php
    	src/Symfony/Component/OptionsResolver/OptionsResolver.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/Stopwatch/Stopwatch.php
    	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
    	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [2.3] CS And DocBlock Fixes
      [2.3] CS Fixes
    
    Conflicts:
    	src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
    	src/Symfony/Component/Config/Definition/ReferenceDumper.php
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
    	src/Symfony/Component/Form/FormError.php
    	src/Symfony/Component/HttpFoundation/Request.php
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/Process/ProcessUtils.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
    	src/Symfony/Component/Validator/Constraints/GroupSequence.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
    	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
    	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
  3. @GrahamCampbell @fabpot

    [2.3] CS And DocBlock Fixes

    GrahamCampbell authored fabpot committed
Commits on Dec 7, 2014
  1. @GrahamCampbell @fabpot

    [2.6] CS Fixes And Removed An Unused Import

    GrahamCampbell authored fabpot committed
Commits on Nov 20, 2014
  1. @znerol @fabpot

    Extract an AbstractEventDispatcherTest from EventDispatcherTest and a…

    znerol authored fabpot committed
    …lso use it in ContainerAwareEventDispatcherTest
Commits on Oct 26, 2014
  1. @fabpot

    bug #12285 Various fixes (nicolas-grekas)

    fabpot authored
    This PR was merged into the 2.6-dev branch.
    
    Discussion
    ----------
    
    Various fixes
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #12278
    | License       | MIT
    | Doc PR        | -
    
    A 3 in one PR (diff is best viewed [with whitespaces ignored](https://github.com/symfony/symfony/pull/12285/files?w=1)):
    - changed the way the DebugHandlerListeners desactivates itself
    - reduced a N×N iteration to a N one in ContainerAwareEventListener::removeListener
    - fixed an issue in VarDumper
    
    Commits
    -------
    
    ac8efd9 [HttpKernel] fix DebugHandlersListener
    5af0f89 [EventDispatcher] perf optim
    c7cf6cf [VarDumper] fix control chars styling
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      Remove aligned '=>' and '='
      Break infinite loop while resolving aliases
      [Security][listener] change priority of switchuser
      Improved the phpdoc for security token classes
      bumped Symfony version to 2.3.22
      updated VERSION for 2.3.21
      update CONTRIBUTORS for 2.3.21
      updated CHANGELOG for 2.3.21
    
    Conflicts:
    	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
    	src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
    	src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
    	src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
    	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
    	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
    	src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
    	src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
    	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Container.php
    	src/Symfony/Component/Finder/Shell/Command.php
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
    	src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
    	src/Symfony/Component/Form/Extension/Core/Type/FormType.php
    	src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
    	src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
    	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
    	src/Symfony/Component/HttpFoundation/File/UploadedFile.php
    	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
    	src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
    	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
    	src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
    	src/Symfony/Component/Routing/Route.php
    	src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
    	src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
    	src/Symfony/Component/Templating/PhpEngine.php
    	src/Symfony/Component/Validator/Constraints/ImageValidator.php
    	src/Symfony/Component/Validator/Constraints/TypeValidator.php
  3. @polc @fabpot

    Remove aligned '=>' and '='

    polc authored fabpot committed
Commits on Oct 22, 2014
  1. @nicolas-grekas
Commits on Oct 1, 2014
  1. @xabbuh

    fix RegisterListenersPass test

    xabbuh authored
    With #12088 being merged, the test needs to be adapted to reflect the
    2.5 specific changes.
  2. @fabpot

    Merge branch '2.3' into 2.5

    fabpot authored
    * 2.3:
      [Doc] Use Markdown syntax highlighting
      [Finder] tweaked docs
      [Finder] Add info about possibilities offered by SplFileInfo
      fix components tests
      [Intl] FIxed failing test
      [Intl] Generated the data for ICU version 54-rc
      [EventDispatcher] fix doc bloc on EventDispatcherInterface
      [Validator] Update validators.zh_CN.xlf, fix translation error
      bumped Symfony version to 2.3.21
      updated VERSION for 2.3.20
      update CONTRIBUTORS for 2.3.20
      updated CHANGELOG for 2.3.20
      [Intl] Integrated ICU data into Intl component
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
Commits on Sep 22, 2014
  1. @fabpot

    Merge branch '2.4' into 2.5

    fabpot authored
    * 2.4:
      fixed CS
      [Process] fixed some volatile tests
      [HttpKernel] fixed a volatile test
      [HttpFoundation] fixed some volatile tests
      [Tests] PHPUnit Optimizations
      Use getPathname() instead of string casting to get BinaryFileReponse file path
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
    	src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
    	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
    	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
    	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
    	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
    	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
    	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
    	src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
    	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
    	src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
    	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
    	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
    	src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
    	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
    	src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
    	src/Symfony/Component/Yaml/Parser.php
Something went wrong with that request. Please try again.