Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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 16, 2015
  1. @keradus

    CS fixes

    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. @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 1, 2015
  1. @gharlan
Commits on Mar 30, 2015
  1. @saro0h
  2. @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
  3. @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
  4. @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
  5. @fabpot

    minor #14090 CS: Unary operators should be placed adjacent to their o…

    fabpot authored
    …perands (keradus)
    
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    CS: Unary operators should be placed adjacent to their operands
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | ?
    | Fixed tickets | N/A
    | License       | MIT
    | Doc PR        | N/A
    
    Update before upcoming changes on PHP CS Fixer 1.7
    
    To keep fabbot.io happy ;)
    
    Commits
    -------
    
    2367f4a CS: Unary operators should be placed adjacent to their operands
  6. @stof

    Add parsing of hexadecimal strings for PHP 7

    stof authored
    PHP 7 does not handle the hexadecimal notation in is_numeric checks
    anymore, so the detection needs to be implemented explicitly.
Commits on Mar 27, 2015
  1. @keradus
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 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
Commits on Mar 13, 2015
  1. @nicolas-grekas

    [2.7] add @group legacy

    nicolas-grekas authored
  2. @nicolas-grekas

    Merge branch '2.7'

    nicolas-grekas authored
    * 2.7:
      Changed visibility of setUp() and tearDown to protected
      Changed visibility of setUp() and tearDown to protected
      [2.7] Fix travis file
      [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
      [Debug] reintroduce charset param to ExceptionHandler
      Changed visibility of setUp() and tearDown to protected
      [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
      [Debug] deprecate ExceptionHandler::utf8Htmlize
      Added default button class
      used HTML5 meta charset tag and removed hardcoded ones
      Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      [FrameworkBundle] Read config/validation/*.(xml|yml) files
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LegacyTemplatingAssetHelperPassTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/Extension/LegacyAssetsExtensionTest.php
    	src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php
    	src/Symfony/Component/ClassLoader/Tests/LegacyUniversalClassLoaderTest.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
    	src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
    	src/Symfony/Component/Templating/Tests/Helper/LegacyAssetsHelperTest.php
Commits on Mar 12, 2015
  1. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
      Changed visibility of setUp() and tearDown to protected
      [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
      Added default button class
      used HTML5 meta charset tag and removed hardcoded ones
      Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	.travis.yml
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Changed visibility of setUp() and tearDown to protected
      fixed XSS in the exception handler
      Php Inspections (EA Extended) - static code analysis includes:
      [2.3] Remove most refs uses
      Test with local components instead of waiting for the subtree-splitter when possible
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
    	src/Symfony/Component/Config/Util/XmlUtils.php
    	src/Symfony/Component/Console/Helper/ProgressHelper.php
    	src/Symfony/Component/Debug/ExceptionHandler.php
    	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/OptionsResolver/Options.php
    	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
    	src/Symfony/Component/Yaml/Inline.php
Commits on Mar 7, 2015
  1. @kalessil

    Php Inspections (EA Extended) - static code analysis includes:

    kalessil authored
    Reduce couple count calls in [Yaml]
    Modernize type casting, fix several strict comparisons
    Unsets merged
    Elvis operator usage
    Short syntax for applied operations
  2. @fabpot

    Merge branch '2.7'

    fabpot authored
    * 2.7: (22 commits)
      Php Inspections (EA Extended): squash all PR-13813 commits
      replaced the last remaining is_integer() call
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
      [FrameworkBundle] simplify dep declaration
      [VarDumper] Fix "next element is already occupied"
      [Serializer] Introduce ObjectNormalizer
      [Serializer] Refactoring of metadata
      [Validator] Added missing galician (gl) translations
      [WebProfilerBundle] Update ajax calls in toolbar to add the css error class
      [PropertyAccess] stop overwriting once a reference is reached (3rd)
      [OptionsResolver] Remove Unused Variable from Foreach Cycles
      [travis] Tests Security sub-components
      [Serializer] Test that normalizers ignore non-existing attributes.
      [Twig] bootstrap_3_layout.html.twig is usable as a trait
      [travis] Tests Security sub-components
      [Serializer] Fix ClassMetadataFactory PHPDoc
      CS fixes
      [Serializer] rename exception interface
      [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
      [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
      ...
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
    	src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
    	src/Symfony/Component/Serializer/composer.json
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Php Inspections (EA Extended): squash all PR-13813 commits
      replaced the last remaining is_integer() call
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
      [FrameworkBundle] simplify dep declaration
      [VarDumper] Fix "next element is already occupied"
      [Validator] Added missing galician (gl) translations
      [PropertyAccess] stop overwriting once a reference is reached (3rd)
      [OptionsResolver] Remove Unused Variable from Foreach Cycles
      [travis] Tests Security sub-components
      [Twig] bootstrap_3_layout.html.twig is usable as a trait
      [travis] Tests Security sub-components
      CS fixes
      [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
      [travis] test with php nightly
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
    	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
  4. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      replaced the last remaining is_integer() call
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
      [Validator] Added missing galician (gl) translations
      [travis] Tests Security sub-components
      [travis] Tests Security sub-components
      CS fixes
      [travis] test with php nightly
    
    Conflicts:
    	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
  5. @kalessil @fabpot

    [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [H…

    kalessil authored fabpot committed
    …ttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
Commits on Feb 24, 2015
  1. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Minor hot fix
      [PROCESS] make sure /dev/tty is readable
      [2.3] require-dev PHPUnit bridge
      [FrameworkBundle] Fixed Shell logo
      [2.3] Update CONTRIBUTING.md
      [2.3][Process] Fixed PhpProcess::getCommandLine() result
      [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
      Enforce UTF-8 charset for core controllers
    
    Conflicts:
    	CONTRIBUTING.md
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
    	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
    	src/Symfony/Component/Console/composer.json
    	src/Symfony/Component/Debug/composer.json
    	src/Symfony/Component/DomCrawler/composer.json
    	src/Symfony/Component/EventDispatcher/composer.json
    	src/Symfony/Component/HttpFoundation/composer.json
    	src/Symfony/Component/Security/composer.json
    	src/Symfony/Component/Templating/composer.json
Something went wrong with that request. Please try again.