Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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

    fixed CS

    fabpot authored
  4. @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
  5. @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
  6. @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
  2. @dosten @fabpot

    [Finder] Only use GLOB_BRACE when available

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

    Merge branch '2.8'

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

    Merge branch '2.7' into 2.8

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

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [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.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
      [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
      [2.3] Static Code Analysis for Components
      [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
      [Translation] LoggingTranslator simplifications
      [Translation][fixed test] refresh cache when resources are no longer fresh.
      [FrameworkBundle] Fixed server:start --router relative path issue #14124
      [FrameworkBundle] improve usage of Table helper
      [Validator] Added missing Simplified Chinese (zh_CN) translations
      [FrameworkBundle] Workaround php -S ignoring auto_prepend_file
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Console/Helper/Table.php
    	src/Symfony/Component/Translation/LoggingTranslator.php
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      [Routing][DependencyInjection] Support .yaml extension in YAML loaders
      [DX] improve file loader error for router/other resources in bundle
      [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
      [HttpKernel] Cleanup ExceptionListener
      CS fixes
      [DependencyInjection] Show better error when the Yaml component is not installed
      [2.3] SCA for Components - reference mismatches
      [2.3] Static Code Analysis for Components
      [Translation][fixed test] refresh cache when resources are no longer fresh.
      [Validator] Added missing Simplified Chinese (zh_CN) translations
      [FrameworkBundle] Workaround php -S ignoring auto_prepend_file
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
    	src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
    	src/Symfony/Component/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Component/Console/Helper/TableHelper.php
    	src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
    	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
    	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
Commits on Apr 15, 2015
  1. @fabpot

    minor #14287 [Finder] Removed duplicated toRegex() code (jaytaph)

    fabpot authored
    This PR was merged into the 2.7 branch.
    
    Discussion
    ----------
    
    [Finder] Removed duplicated toRegex() code
    
    This patch removes duplicated `toRegex()` code by using the already existing `Glob` class. As this class wasn't unit-tested to begin with, this duplication also makes sure this class is tested properly.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #14075
    | License       | MIT
    
    Commits
    -------
    
    6150c3a Removed duplicated toRegex() code
  2. @kalessil @fabpot

    [2.3] Static Code Analysis for Components

    kalessil authored fabpot committed
Commits on Apr 11, 2015
  1. @Tobion
  2. @jaytaph
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. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      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
Commits on Apr 7, 2015
  1. @gharlan
  2. @nicolas-grekas
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
  4. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7: (29 commits)
      [Validator] Added missing Hungarian translation
      remove usage of deprecated class
      Fix merge
      Fix merge
      CS: fixes
      [Translation][Extractor] Allow extracting an array of files besides extracting a directory
      [VarDumper] Fix dumping ThrowingCasterException
      [Console][Table] Add support for colspan/rowspan + multiple header lines
      Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
      Displays friendly message if the event does not have any registered listeners
      [VarDumper] Ctrl+click toggles-all and fix IE8 support
      Implemented check on interface implementation
      [Form] [TwigBridge] Bootstrap layout whitespace control
      |Validator] Add PHPUnit hint in AbstractConstraintValidatorTest
      [VarDumper] implement expand all on ALT+click
      [WebProfilerBundle] Fixed collapsed profiler menu icons
      [travis] Kill tests when a new commit has been pushed
      fixed CS
      Change behavior to mirror hash_equals() returning early if there is a length mismatch
      CS fixing
      ...
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
    	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
Commits on Mar 27, 2015
  1. @keradus
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      CS: fixes
      Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
      [Form] [TwigBridge] Bootstrap layout whitespace control
      [travis] Kill tests when a new commit has been pushed
      fixed CS
      Change behavior to mirror hash_equals() returning early if there is a length mismatch
      CS fixing
      Prevent modifying secrets as much as possible
      Update StringUtils.php
      Whitespace
      Update StringUtils.php
      StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
      CS: general fixes
      [SecurityBundle] removed a duplicated service definition and simplified others.
    
    Conflicts:
    	src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
Something went wrong with that request. Please try again.