Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8:
      fixed CS
      fixed CS
      fixed CS
      Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
      [Validator] Deprecated PHP7-incompatible constraints and related validators
      [DebugBundle] Allow alternative destination for dumps
      [DebugBundle] Use output mechanism of dumpers instead of echoing
      [DebugBundle] Always collect dumps
      [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	UPGRADE-2.7.md
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/AssetsHelperTest.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Console/Helper/DialogHelper.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      fixed CS
      fixed CS
      fixed CS
      Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
      [Validator] Deprecated PHP7-incompatible constraints and related validators
      [DebugBundle] Allow alternative destination for dumps
      [DebugBundle] Use output mechanism of dumpers instead of echoing
      [DebugBundle] Always collect dumps
      [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
      Fix tests in HHVM
      CS: Pre incrementation/decrementation should be used if possible
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/composer.json
  3. @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
  4. @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
  5. @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 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 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. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      [DependencyInjection] Removed extra strtolower calls
      [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
      CS: unalign =
      Show a better error when the port is in use
      CS: unalign =>
      [FrameworkBundle] Check for 'xlf' instead of 'xliff'
      Add better phpdoc message for getListeners method of the EventDispatcher
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
    	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
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 22, 2015
  1. @keradus

    CS: unalign =

    keradus authored
Commits on Apr 11, 2015
  1. @Tobion
Commits on Apr 10, 2015
  1. @fabpot

    updated version to 2.8

    fabpot authored
  2. @fabpot

    Revert "removed 3.0 constraints from 2.7 composer files"

    fabpot authored
    This reverts commit 5503804cf91f4ede81b94b34609653c013139038.
  3. @fabpot
  4. @fabpot

    Merge branch '2.8'

    fabpot authored
    * 2.8:
      [Translation] avoid freshness check based on content *inside* the cache.
      [Translator] Cache does not take fallback locales into consideration
      [Translator] Cache does not take fallback locales into consideration
      [VarDumper] Fix call site detection
      [Form] Cleanup deprecation notices
      [Console] Made output docopt compatible
      [Process] Fix volatile test
      Remove some useless @group annotations
      Removed useless strtolower call
      [Validator] Use strict comparisons in loaders
      CS: Use "self" keyword instead of class name if possible
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
    	src/Symfony/Component/Form/FormTypeExtensionInterface.php
    	src/Symfony/Component/Form/FormTypeInterface.php
  5. @fabpot
  6. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Translator] Cache does not take fallback locales into consideration
      [VarDumper] Fix call site detection
      [Process] Fix volatile test
      Remove some useless @group annotations
      Removed useless strtolower call
      [Validator] Use strict comparisons in loaders
      CS: Use "self" keyword instead of class name if possible
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Translation/Translator.php
Commits on Apr 8, 2015
  1. @nicolas-grekas
Commits on Apr 7, 2015
  1. @gharlan
Commits on Apr 2, 2015
  1. @dosten @fabpot

    Removed deprecations in Process component

    dosten authored fabpot committed
Commits on Mar 30, 2015
  1. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7:
      [RFC][Console] Added console style guide helpers (v2)
      [Validator] Add missing pt_BR translations
      [Translation][Profiler] Added a Translation profiler.
      Add parsing of hexadecimal strings for PHP 7
      [VarDumper] Add filters to casters
      Trim final stop from deprecation message
      [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
      [Validator] Added missing Hungarian translation
      [Validator] Fixed grammar in Hungarian translation
      CS: Unary operators should be placed adjacent to their operands
      CS: Binary operators should be arounded by at least one space
      remove useless tests that fail in php 7
      [Translator] fix test for php 7 compatibility
      [VarDumper] Add VarDumperTestCase and related trait
      Update phpdoc of ProcessBuilder#setPrefix()
    
    Conflicts:
    	src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
    	src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
    	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
    	src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Validator] Add missing pt_BR translations
      Add parsing of hexadecimal strings for PHP 7
      [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
      [Validator] Added missing Hungarian translation
      [Validator] Fixed grammar in Hungarian translation
      CS: Unary operators should be placed adjacent to their operands
      CS: Binary operators should be arounded by at least one space
      remove useless tests that fail in php 7
      [Translator] fix test for php 7 compatibility
      Update phpdoc of ProcessBuilder#setPrefix()
    
    Conflicts:
    	src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
    	src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
  3. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      [Validator] Add missing pt_BR translations
      Add parsing of hexadecimal strings for PHP 7
      [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
      [Validator] Added missing Hungarian translation
      [Validator] Fixed grammar in Hungarian translation
      CS: Unary operators should be placed adjacent to their operands
      CS: Binary operators should be arounded by at least one space
      remove useless tests that fail in php 7
      [Translator] fix test for php 7 compatibility
      Update phpdoc of ProcessBuilder#setPrefix()
    
    Conflicts:
    	src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf
    	src/Symfony/Component/Yaml/Parser.php
Commits on Mar 27, 2015
  1. @fabpot

    minor #13829 [Process] prefix should not be escaped (pyrech)

    fabpot authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    [Process] prefix should not be escaped
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #12826
    | License       | MIT
    | Doc PR        | -
    
    The phpdoc of `ProcessBuilder#setPrefix` says:
    
    ```
    Adds an unescaped prefix to the command string.
    ```
    But in the current implementation, the prefix is merged with arguments array and then is escaped which seems wrong.
    
    Commits
    -------
    
    67f65c9 Update phpdoc of ProcessBuilder#setPrefix()
  2. @pyrech
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 23, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [Process] Fix outdated Process->start() docblock
      prevent inlining service configurators
      [DomCrawler] Improve namespace discovery performance
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
  2. @johnkary @fabpot

    [Process] Fix outdated Process->start() docblock

    johnkary authored fabpot committed
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
Something went wrong with that request. Please try again.