Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (21 commits)
      Fix merge
      Fix typo
      Various fixes esp. on Windows
      Fix the validation of form resources to register the default theme
      Fix the retrieval of the value with property path when using a loader
      [appveyor] minor enhancements
      [Process] Disable failing tests on Windows
      [Translation] Fix the string casting in the XliffFileLoader
      Windows and Intl fixes
      Add appveyor.yml for C.I. on Windows
      [VarDumper] fixed HtmlDumper to target specific the head tag
      [travis] merge php: nightly and deps=high test-matrix lines
      consistently use str_replace to unify directory separators
      Support omitting the <target> node in an .xlf file.
      Fix the handling of values for multiple choice types
      moved PHP nightly to PHP 7.0
      fixed tests using deprecation features
      [Form] made deprecation notice more precise
      fixed CS
      Fix BC break after split of ACL from core
      ...
    
    Conflicts:
    	.travis.yml
    	composer.json
    	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
    	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
    	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
    	src/Symfony/Component/Locale/Tests/LocaleTest.php
  2. @nicolas-grekas
Commits on Aug 26, 2015
  1. @Tobion

    Merge branch '2.3' into 2.7

    Tobion authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
Commits on Aug 25, 2015
  1. @Tobion
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. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [2.6] Towards 100% HHVM compat
      [Security/Http] Fix test
      [Stopwatch] Fix test
      Minor fixes
      Towards 100% HHVM compat
      unify default AccessDeniedExeption message
      trigger event with right user (add test)
      [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
      [Form] Fixed: Data mappers always receive forms indexed by their names
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
    	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
Commits on Jun 30, 2015
  1. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Minor fixes
      Towards 100% HHVM compat
      trigger event with right user (add test)
      [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
      [Form] Fixed: Data mappers always receive forms indexed by their names
    
    Conflicts:
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
  2. @nicolas-grekas
Commits on Jun 8, 2015
  1. @reecefowell
Commits on May 16, 2015
  1. @fabpot

    feature #14145 Removed deprecations in Filesystem component (dosten)

    fabpot authored
    This PR was squashed before being merged into the 3.0-dev branch (closes #14145).
    
    Discussion
    ----------
    
    Removed deprecations in Filesystem component
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | -
    | License       | MIT
    | Doc PR        | -
    
    Commits
    -------
    
    5d1e558 Removed deprecations in Filesystem component
  2. @dosten @fabpot

    Removed deprecations in Filesystem component

    dosten authored fabpot committed
Commits on May 15, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [DebugBundle] Allow alternative destination for dumps
      [DebugBundle] Use output mechanism of dumpers instead of echoing
      [DebugBundle] Always collect dumps
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	src/Symfony/Component/Finder/Expression/Glob.php
  2. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
    	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
    	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
    	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
  3. @fabpot

    minor #14121 CS: Pre incrementation/decrementation should be used if …

    fabpot authored
    …possible (gharlan)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    CS: Pre incrementation/decrementation should be used if possible
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | n/a
    
    Fixes provided by new fixer: FriendsOfPHP/PHP-CS-Fixer#1113
    
    If this pr is merged I would change the level of the fixer to `symfony`.
    
    Commits
    -------
    
    c5123d6 CS: Pre incrementation/decrementation should be used if possible
Commits on May 11, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6: (21 commits)
      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
      [Translation] simplify getMessages.
      [Framework][Translation] added test for debug command.
      Run tests on hhvm instead of hhvm-nightly
      Use HTTPS in README and some other fixes
      add more entropy to generated classnames
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on May 8, 2015
  1. @Tobion

    Merge branch '2.3' into 2.6

    Tobion authored
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
Commits on May 6, 2015
  1. @kix @fabpot

    [Filesystem] Simplified an if statement

    kix authored fabpot committed
Commits on Apr 23, 2015
  1. @xabbuh

    [Filesystem] deprecate chmod support in dumpFile()

    xabbuh authored
    The ability to support a custom permission mask in the `dumpFile()`
    method is deprecated since Symfony Symfony 2.3.12. This commit adds the
    `trigger_error()` call if a custom permission mask is passed.
Commits on Apr 7, 2015
  1. @gharlan
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. @kalessil @fabpot

    [2.3] Static Code Analysis for Components

    kalessil authored fabpot committed
Commits on Feb 16, 2015
  1. @King2500 @fabpot

    [Filesystem] Improve exception message for copy method

    King2500 authored fabpot committed
Commits on Jan 4, 2015
  1. @nicolas-grekas
Commits on Jan 3, 2015
  1. @fabpot

    feature #12653 [Filesystem] Keep executable permission when a file is…

    fabpot authored
    … copied (joelwurtz)
    
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Filesystem] Keep executable permission when a file is copied
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | /
    | License       | MIT
    | Doc PR        | /
    
    I made this PR in order to have the same behavior as the default `cp` unix command: permissions are not keep when copying a file at the exception of the execution flag (unless `-p` is passed to the command).
    
    Commits
    -------
    
    b8f8234 [Filesystem] Keep executable permission when a file is copied
Commits on Dec 31, 2014
  1. @xabbuh

    use value of DIRECTORY_SEPARATOR to detect Windows

    xabbuh authored
    This commit unifies the detection of Windows builds across the Symfony
    codebase.
Commits on Dec 30, 2014
  1. @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
  2. @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
  3. @xabbuh

    use value of DIRECTORY_SEPARATOR to detect Windows

    xabbuh authored
    This commit unifies the detection of Windows builds across the Symfony
    codebase.
Commits on Dec 25, 2014
  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 12, 2014
  1. @nicolas-grekas

    Merge branch '2.5' into 2.6

    nicolas-grekas authored
    * 2.5:
      [Form] fixed a maxlength overring on a guessing
      [Debug] Show only unique class candidates
      [SecurityBundle] Firewall providers building - code cleaning
      [Filesystem] symlink use RealPath instead LinkTarget
      [DependencyInjection] Remove duplicate  declaration in PhpDumper
      terminals are not interactive on Travis
      Revert "[DependencyInjection] backport perf optim"
      [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
      fix phpdoc's alignment
      Fixed the AuthenticationProviderInterface alignment
      Fixed the proxy-manager version constraint
      [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
      [DependencyInjection] perf optim: call dirname() at most 5x
      [DependencyInjection] backport perf optim
      Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
      [2.5] Remove possible call_user_func()
      [2.3] Remove possible call_user_func()
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
  2. @nicolas-grekas

    Merge branch '2.3' into 2.5

    nicolas-grekas authored
    * 2.3:
      [SecurityBundle] Firewall providers building - code cleaning
      [Filesystem] symlink use RealPath instead LinkTarget
      Fixed the AuthenticationProviderInterface alignment
      Fixed the proxy-manager version constraint
    
    Conflicts:
    	composer.json
    	src/Symfony/Bridge/ProxyManager/composer.json
Something went wrong with that request. Please try again.