1. 30 Mar, 2022 1 commit
  2. 02 May, 2015 2 commits
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · 2ab9eba5
      Fabien Potencier 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
      2ab9eba5
    • Fabien Potencier's avatar
      Merge branch '2.3' into 2.6 · e6cfcd79
      Fabien Potencier 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
      e6cfcd79
  3. 01 May, 2015 1 commit
  4. 18 Apr, 2015 3 commits
    • Nicolas Grekas's avatar
      Merge branch '2.6' into 2.7 · af6281f4
      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
      af6281f4
    • Nicolas Grekas's avatar
      Merge branch '2.3' into 2.6 · aed15e14
      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
      aed15e14
    • Fabien Potencier's avatar
      minor #14081 [Config][DX] improve file loader error message for missing resource (cordoval) · ee991d62
      Fabien Potencier authored
      This PR was merged into the 2.3 branch.
      
      Discussion
      ----------
      
      [Config][DX] improve file loader error message for missing resource
      
      |Q            |A     |
      |---          |---   |
      |Bug Fix?     |y     |
      |New Feature? |n     |
      |BC Breaks?   |n     |
      |Deprecations?|n     |
      |Tests Pass?  |y     |
      |Fixed Tickets|#11958|
      |License      |MIT   |
      |Doc PR       |      |
      
      Commits
      -------
      
      a2deb61 [DX] improve file loader error for router/other resources in bundle
      ee991d62
  5. 17 Apr, 2015 1 commit
  6. 16 Apr, 2015 1 commit
  7. 11 Apr, 2015 1 commit
  8. 10 Apr, 2015 3 commits
  9. 08 Apr, 2015 2 commits
  10. 01 Apr, 2015 1 commit
  11. 30 Mar, 2015 5 commits
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · bc88f113
      Fabien Potencier 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
      bc88f113
    • Fabien Potencier's avatar
      Merge branch '2.3' into 2.6 · c35f5bca
      Fabien Potencier 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
      c35f5bca
    • Fabien Potencier's avatar
      minor #14101 [Configuration] improve description for ignoreExtraKeys on... · 4186b574
      Fabien Potencier authored
      minor #14101 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition (cordoval)
      
      This PR was merged into the 2.3 branch.
      
      Discussion
      ----------
      
      [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
      
      |Q            |A  |
      |---          |---|
      |Bug Fix?     |y  |
      |New Feature? |n  |
      |BC Breaks?   |n  |
      |Deprecations?|n  |
      |Tests Pass?  |y  |
      |Fixed Tickets| #13957  |
      |License      |MIT|
      |Doc PR       |   |
      
      Commits
      -------
      
      b735022 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
      4186b574
    • Fabien Potencier's avatar
      minor #14089 CS: Binary operators should be arounded by at least one space (keradus) · 84c59e98
      Fabien Potencier authored
      This PR was merged into the 2.3 branch.
      
      Discussion
      ----------
      
      CS: Binary operators should be arounded by at least one space
      
      | 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
      -------
      
      ec2cec6 CS: Binary operators should be arounded by at least one space
      84c59e98
    • Christophe Coevoet's avatar
      Add parsing of hexadecimal strings for PHP 7 · c8fca5d3
      Christophe Coevoet authored
      PHP 7 does not handle the hexadecimal notation in is_numeric checks
      anymore, so the detection needs to be implemented explicitly.
      c8fca5d3
  12. 29 Mar, 2015 1 commit
  13. 27 Mar, 2015 4 commits
    • Dariusz Ruminski's avatar
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · 97555222
      Fabien Potencier 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
      97555222
    • Fabien Potencier's avatar
      Merge branch '2.3' into 2.6 · 28d9ad58
      Fabien Potencier authored
      * 2.3:
        CS: fixes
        Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
        [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
        CS: general fixes
        [SecurityBundle] removed a duplicated service definition and simplified others.
      
      Conflicts:
      	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
      	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
      	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
      	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
      28d9ad58
    • Dariusz Ruminski's avatar
      CS: fixes · 0e703974
      Dariusz Ruminski authored
      0e703974
  14. 22 Mar, 2015 2 commits
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · b2d0d623
      Fabien Potencier 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
      b2d0d623
    • Fabien Potencier's avatar
      Merge branch '2.3' into 2.6 · 8584ef02
      Fabien Potencier 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/DependencyIn...
      8584ef02
  15. 21 Mar, 2015 1 commit
  16. 12 Mar, 2015 2 commits
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · 73f3862f
      Fabien Potencier 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
      73f3862f
    • Nicolas Grekas's avatar
      Merge branch '2.3' into 2.6 · 8e0a8b5e
      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
      8e0a8b5e
  17. 11 Mar, 2015 1 commit
  18. 07 Mar, 2015 4 commits
    • Vladimir Reznichenko's avatar
      Php Inspections (EA Extended) - static code analysis includes: · 5f420a0d
      Vladimir Reznichenko authored
      Reduce couple count calls in [Yaml]
      Modernize type casting, fix several strict comparisons
      Unsets merged
      Elvis operator usage
      Short syntax for applied operations
      5f420a0d
    • Fabien Potencier's avatar
      Merge branch '2.6' into 2.7 · 9f12fd9b
      Fabien Potencier 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
      9f12fd9b
    • Fabien Potencier's avatar
      Merge branch '2.3' into 2.6 · 73827d40
      Fabien Potencier 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
      73827d40
    • Vladimir Reznichenko's avatar
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form]... · 3e3979c5
      Vladimir Reznichenko authored
      [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
      
      3e3979c5
  19. 25 Feb, 2015 3 commits
    • Nicolas Grekas's avatar
      Merge branch '2.6' into 2.7 · 18fc3347
      Nicolas Grekas authored
      * 2.6:
        [Form] NativeRequestHandler file handling fix
        [VarDumper] Workaround stringy numeric keys
        [HttpKernel] Throw double-bounce exceptions
        minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
        [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
      18fc3347
    • Nicolas Grekas's avatar
      Merge branch '2.3' into 2.6 · dae135e9
      Nicolas Grekas authored
      * 2.3:
        [Form] NativeRequestHandler file handling fix
        [HttpKernel] Throw double-bounce exceptions
        minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
        [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
      dae135e9
    • Fabien Potencier's avatar
      bug #13744 minor #13377 [Console] Change greater by greater or equal for... · 994ac06e
      Fabien Potencier authored
      bug #13744 minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource (bijibox)
      
      This PR was merged into the 2.3 branch.
      
      Discussion
      ----------
      
      minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
      
      | Q             | A
      | ------------- | ---
      | Fixed tickets | #13377
      | License       | MIT
      
      FileResource and tests update
      
      Commits
      -------
      
      87800ae minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
      994ac06e
  20. 24 Feb, 2015 1 commit
    • Nicolas Grekas's avatar
      Merge branch '2.3' into 2.6 · cd8f077c
      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
      cd8f077c