Skip to content

HTTPS clone URL

Subversion checkout URL

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

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (27 commits)
      [2.8] Fix 3.0 incompatible deps
      [HttpKernel] Fix lowest dep
      [Security] fix check for empty usernames
      [Form] updated exception message of ButtonBuilder::setRequestHandler()
      [travis] Fix deps=high jobs
      Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7
      [Serializer] Simplify AbstractNormalizer::prepareForDenormalization()
      [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
      [DependencyInjection] Forbid container cloning
      [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
      [WebProfilerBundle] Add link to show profile of latest request
      [DependencyInjection] Remove unused code in XmlFileLoader
      [HttpFoundation] Behaviour change in PHP7 for substr
      [Console] Set QuestionHelper max attempts in tests
      [Form] Fix a BC break in the entity
      fix broken ChoiceQuestion
      bumped Symfony version to 2.7.3
      updated VERSION for 2.7.2
      updated CHANGELOG for 2.7.2
      bumped Symfony version to 2.6.11
      ...
    
    Conflicts:
    	.travis.yml
    	CHANGELOG-2.3.md
    	CHANGELOG-2.6.md
    	CHANGELOG-2.7.md
    	UPGRADE-2.7.md
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Form/composer.json
    	src/Symfony/Component/HttpKernel/composer.json
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      [HttpKernel] Fix lowest dep
      [Security] fix check for empty usernames
      [Form] updated exception message of ButtonBuilder::setRequestHandler()
      [travis] Fix deps=high jobs
      Fix typo 'assets.package' => 'assets.packages' in UPGRADE-2.7
      [Serializer] Simplify AbstractNormalizer::prepareForDenormalization()
      [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
      [DependencyInjection] Remove unused code in XmlFileLoader
      [HttpFoundation] Behaviour change in PHP7 for substr
      bumped Symfony version to 2.3.32
      updated VERSION for 2.3.31
      update CONTRIBUTORS for 2.3.31
      updated CHANGELOG for 2.3.31
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/HttpKernel/composer.json
  3. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      [Security] fix check for empty usernames
      [Form] updated exception message of ButtonBuilder::setRequestHandler()
      [travis] Fix deps=high jobs
      [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
      [DependencyInjection] Remove unused code in XmlFileLoader
      [HttpFoundation] Behaviour change in PHP7 for substr
      bumped Symfony version to 2.3.32
      updated VERSION for 2.3.31
      update CONTRIBUTORS for 2.3.31
      updated CHANGELOG for 2.3.31
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
  4. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      [Security] fix check for empty usernames
      [Form] updated exception message of ButtonBuilder::setRequestHandler()
      [travis] Fix deps=high jobs
      [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
      [DependencyInjection] Remove unused code in XmlFileLoader
      [HttpFoundation] Behaviour change in PHP7 for substr
      bumped Symfony version to 2.3.32
      updated VERSION for 2.3.31
      update CONTRIBUTORS for 2.3.31
      updated CHANGELOG for 2.3.31
    
    Conflicts:
    	src/Symfony/Bridge/Twig/composer.json
    	src/Symfony/Bundle/FrameworkBundle/composer.json
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Jul 16, 2015
  1. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
      [Console] Set QuestionHelper max attempts in tests
      [Form] Fix a BC break in the entity
      fix broken ChoiceQuestion
      bumped Symfony version to 2.7.3
      updated VERSION for 2.7.2
      updated CHANGELOG for 2.7.2
      bumped Symfony version to 2.6.11
      updated VERSION for 2.6.10
      updated CHANGELOG for 2.6.10
      [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
  2. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
      bumped Symfony version to 2.6.11
      updated VERSION for 2.6.10
      updated CHANGELOG for 2.6.10
      [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
  3. @fabpot

    bug #15249 [HttpFoundation] [PSR-7] Allow to use resources as content…

    fabpot authored
    … body and to return resources from string content (dunglas)
    
    This PR was squashed before being merged into the 2.3 branch (closes #15249).
    
    Discussion
    ----------
    
    [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | n/a
    | License       | MIT
    | Doc PR        | not yet
    
    * Allows to fix tests of https://github.com/symfony/psr-http-message-bridge with PHP 5.6.
    * Ease the transition to PSR-7 (in PSR-7, almost everything is stream - #15186)
    
    Maybe should I open it against 2.8 but it can be considered a bug fix at least for the part "returning a string as a resource".
    
    Commits
    -------
    
    059964d [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  4. @dunglas @fabpot

    [HttpFoundation] [PSR-7] Allow to use resources as content body and t…

    dunglas authored fabpot committed
    …o return resources from string content
  5. @nicolas-grekas
Commits on Jul 15, 2015
  1. @Nicofuma

    [HttpFoundation] Behaviour change in PHP7 for substr

    Nicofuma authored
    In PHP7 the behaviour of substr() changed.
    To resume: "Truncating an entire string should result in a string."
    
    See: https://bugs.php.net/bug.php?id=62922
Commits on Jul 9, 2015
  1. @fabpot

    Merge branch '2.8'

    fabpot authored
    * 2.8:
      Added 'default' color
      [HttpFoundation] Reload the session after regenerating its id
      [HttpFoundation] Add a test case to confirm a bug in session migration
      [Serializer] Fix ClassMetadata::sleep()
      [2.6] Static Code Analysis for Components and Bundles
      [Finder] Command::addAtIndex() fails with Command instance argument
      [DependencyInjection] Freeze also FrozenParameterBag::remove
      [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
      fix CS
      fixed CS
      Add a way to reset the singleton
      [Security] allow to use `method` in XML configs
      [Serializer] Fix Groups tests.
      Remove duplicate example
      Remove var not used due to returning early (introduced in 8982c32)
      [Serializer] Fix Groups PHPDoc
      Enhance hhvm test skip message
      fix for legacy asset() with EmptyVersionStrategy
      [Form] Added upgrade notes for #15061
  2. @fabpot

    Merge branch '2.7' into 2.8

    fabpot authored
    * 2.7:
      Added 'default' color
      [HttpFoundation] Reload the session after regenerating its id
      [HttpFoundation] Add a test case to confirm a bug in session migration
      [Serializer] Fix ClassMetadata::sleep()
      [2.6] Static Code Analysis for Components and Bundles
      [Finder] Command::addAtIndex() fails with Command instance argument
      [DependencyInjection] Freeze also FrozenParameterBag::remove
      [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
      fix CS
      fixed CS
      Add a way to reset the singleton
      [Security] allow to use `method` in XML configs
      [Serializer] Fix Groups tests.
      Remove duplicate example
      Remove var not used due to returning early (introduced in 8982c32)
      [Serializer] Fix Groups PHPDoc
      Enhance hhvm test skip message
      fix for legacy asset() with EmptyVersionStrategy
      [Form] Added upgrade notes for #15061
  3. @fabpot

    Merge branch '2.6' into 2.7

    fabpot authored
    * 2.6:
      Added 'default' color
      [HttpFoundation] Reload the session after regenerating its id
      [HttpFoundation] Add a test case to confirm a bug in session migration
      [2.6] Static Code Analysis for Components and Bundles
      [Finder] Command::addAtIndex() fails with Command instance argument
      [DependencyInjection] Freeze also FrozenParameterBag::remove
      [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
      fix CS
      fixed CS
      Add a way to reset the singleton
      [Security] allow to use `method` in XML configs
      Remove duplicate example
      Remove var not used due to returning early (introduced in 8982c32)
      Enhance hhvm test skip message
  4. @fabpot

    Merge branch '2.3' into 2.6

    fabpot authored
    * 2.3:
      Added 'default' color
      [HttpFoundation] Reload the session after regenerating its id
      [HttpFoundation] Add a test case to confirm a bug in session migration
      [Finder] Command::addAtIndex() fails with Command instance argument
      [DependencyInjection] Freeze also FrozenParameterBag::remove
      fix CS
      fixed CS
      Add a way to reset the singleton
      [Security] allow to use `method` in XML configs
      Remove var not used due to returning early (introduced in 8982c32)
      Enhance hhvm test skip message
Commits on Jul 8, 2015
  1. @jakzal
  2. @jakzal
  3. @kalessil @fabpot

    [2.6] Static Code Analysis for Components and Bundles

    kalessil authored fabpot committed
Commits on Jul 7, 2015
  1. @fabpot

    minor #15204 CS fixes for 2.3 (keradus)

    fabpot authored
    This PR was merged into the 2.3 branch.
    
    Discussion
    ----------
    
    CS fixes for 2.3
    
    | 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
    
    To keep fabbot.io happy ;)
    
    Commits
    -------
    
    464b67e fix CS
Commits on Jul 5, 2015
  1. @keradus

    fix CS

    keradus authored
  2. @fabpot

    fixed CS

    fabpot authored
  3. @dawehner @fabpot

    Add a way to reset the singleton

    dawehner authored fabpot committed
Commits on Jul 3, 2015
  1. @Tobion

    Remove var not used due to returning early (introduced in 8982c32)

    Dave Hulbert authored Tobion committed
Commits on Jul 1, 2015
  1. @nicolas-grekas

    Merge branch '2.8'

    nicolas-grekas authored
    * 2.8: (65 commits)
      [VarDumper] Fix tests for HHVM
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
      Fix merge
      [2.6] Towards 100% HHVM compat
      [Security/Http] Fix test
      [Stopwatch] Fix test
      Minor fixes
      [Validator] Added missing error codes and turned codes into UUIDs
      Towards 100% HHVM compat
      Warmup twig templates in non-standard paths (closes #12507)
      [Bridge/PhpUnit] Enforce a consistent locale
      Fix param order of assertEquals (expected, actual) in test for Finder\Glob
      Fix choice translation domain for expanded choice widget
      unify default AccessDeniedExeption message
      trigger event with right user (add test)
      [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
      fixed CS
      ...
    
    Conflicts:
    	UPGRADE-2.8.md
    	src/Symfony/Bridge/ProxyManager/composer.json
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
    	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
    	src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
    	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php
    	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
    	src/Symfony/Bundle/SecurityBundle/composer.json
    	src/Symfony/Component/Debug/ErrorHandler.php
    	src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
    	src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
    	src/Symfony/Component/DependencyInjection/Definition.php
    	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
    	src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
    	src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/legacy-services9.dot
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services6.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/legacy-services9.xml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services6.yml
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/legacy-services9.yml
    	src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
    	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
    	src/Symfony/Component/Form/ResolvedFormType.php
    	src/Symfony/Component/Form/Tests/CompoundFormTest.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
    	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
  2. @nicolas-grekas

    Merge branch '2.7' into 2.8

    nicolas-grekas authored
    * 2.7:
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
  3. @nicolas-grekas

    Merge branch '2.6' into 2.7

    nicolas-grekas authored
    * 2.6:
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
  4. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Update DateTimeToArrayTransformer.php
      Mock microtime() and time() in transient tests
      Azerbaijani language pluralization rule
      Move HHVM tests out of the allowed failures
  5. @nicolas-grekas
  6. @aitboudad

    Merge remote-tracking branch 'origin/2.7' into 2.8

    aitboudad authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
  7. @nicolas-grekas

    Merge branch '2.6' into 2.7

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

    Merge branch '2.3' into 2.6

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

    Merge remote-tracking branch 'origin/2.6' into 2.7

    aitboudad authored
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
    	src/Symfony/Component/Validator/Constraints/EmailValidator.php
  2. @nicolas-grekas

    Merge branch '2.3' into 2.6

    nicolas-grekas authored
    * 2.3:
      Fixed the regexp for the validator of Maestro-based credit/debit cards
      [Console] Fix STDERR output text on IBM iSeries OS400
      [HttpFoundation] Use convention to allow throwing from __toString()
      [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern)
      [bugfix][MonologBridge] WebProcessor: passing  to BaseWebProcessor
      [2.3] Static Code Analysis for Components
      [Translation][update cmd] taken account into bundle overrides path.
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
Commits on Jun 23, 2015
  1. @nicolas-grekas
Something went wrong with that request. Please try again.