Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Apr 16, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      fixed types in phpdocs
      fixed types in phpdocs
    
    Conflicts:
    	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
    	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
    	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
    	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
    	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
    	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
    	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
    	src/Symfony/Component/Validator/MetadataFactoryInterface.php
    authored April 16, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      fixed types in phpdocs
    
    Conflicts:
    	src/Symfony/Bridge/Twig/TwigEngine.php
    	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
    	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
    	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
    	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    	src/Symfony/Component/Stopwatch/StopwatchEvent.php
    	src/Symfony/Component/Templating/PhpEngine.php
    authored April 16, 2014
  3. Fabien Potencier

    fixed types in phpdocs

    authored April 16, 2014

Mar 26, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4: (52 commits)
      Fix #8205 : Deprecate file mode update when calling dumpFile
      Fix #10437: Catch exceptions when reloading a no-cache request
      Fix libxml_use_internal_errors and libxml_disable_entity_loader usage
      removed ini check to make uploadedfile work on gae
      Update OptionsResolver.php
      fixed comment in forms.xml file
      Clean KernelInterface docblocks
      Cast the group name as a string
      Fixed doc of InitAclCommand
      [Form] Fix "Array was modified outside object" in ResizeFormListener.
      Fix IBAN validator
      [Process] Remove unreachable code + avoid skipping tests in sigchild environment
      Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute
      Added travis_retry to .travis.yml
      [Process] fix some typos and refactor some code
      [Process] Fix unit tests in sigchild disabled environment
      [Process] Trow exceptions in case a Process method is supposed to be called after termination
      fixed typo
      [Process] fixed fatal errors in getOutput and getErrorOutput when process was not started
      [Process] Fix escaping on Windows
      ...
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
    	src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
    	src/Symfony/Component/Process/Process.php
    	src/Symfony/Component/Process/ProcessPipes.php
    	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
    authored March 26, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3: (34 commits)
      Fix #8205 : Deprecate file mode update when calling dumpFile
      Fix #10437: Catch exceptions when reloading a no-cache request
      Fix libxml_use_internal_errors and libxml_disable_entity_loader usage
      removed ini check to make uploadedfile work on gae
      Update OptionsResolver.php
      fixed comment in forms.xml file
      Clean KernelInterface docblocks
      Cast the group name as a string
      Fixed doc of InitAclCommand
      [Form] Fix "Array was modified outside object" in ResizeFormListener.
      Fix IBAN validator
      [Process] Remove unreachable code + avoid skipping tests in sigchild environment
      Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute
      Added travis_retry to .travis.yml
      [Process] fix some typos and refactor some code
      [Process] Fix unit tests in sigchild disabled environment
      [Process] Trow exceptions in case a Process method is supposed to be called after termination
      fixed typo
      [Process] fixed fatal errors in getOutput and getErrorOutput when process was not started
      [Process] Fix escaping on Windows
      ...
    
    Conflicts:
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/Filesystem/Filesystem.php
    	src/Symfony/Component/Process/Process.php
    authored March 26, 2014

Mar 25, 2014

  1. Shady

    Update OptionsResolver.php

    Deleting an extra space in the exception.
    authored March 25, 2014 fabpot committed March 25, 2014

Jan 07, 2014

  1. Fabien Potencier

    Merge branch '2.4'

    * 2.4:
      udpated LICENSE year
      update year on licenses
      rundown and typo fix
      [Process] Fix #9861 : Revert TTY mode
      [Form] Update minimal requirement in composer.json
      Fix Empty translations with Qt files
      [Console] Fixed command name guessing if an alternative is an alias.
      Update UPGRADE-2.3.md to account for #9388
      [WebProfilerBundle] Fixed profiler toolbar icons for XHTML.
      [BrowserKit] Throw exception on invalid cookie expiration timestamp
      [Propel1Bridge][ModelChoiceList] add exception message for invalid classes
    authored January 07, 2014
  2. Fabien Potencier

    Merge branch '2.3' into 2.4

    * 2.3:
      update year on licenses
      rundown and typo fix
      [Process] Fix #9861 : Revert TTY mode
      [Form] Update minimal requirement in composer.json
      Fix Empty translations with Qt files
      Update UPGRADE-2.3.md to account for #9388
    
    Conflicts:
    	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
    authored January 07, 2014
  3. Luis Cordova

    update year on licenses

    authored January 06, 2014
  4. Fabien Potencier

    feature #8375 [OptionsResolver] Allow giving a callback as an allowed…

    …Value to OptionsResolver (marekkalnik)
    
    This PR was merged into the 2.5-dev branch.
    
    Discussion
    ----------
    
    [OptionsResolver] Allow giving a callback as an allowedValue to OptionsResolver
    
    I recently had to use an option which was an array and could contain some one or multiple values from a list. As it could contain all possible combinations, it was not possible to validate it with a list of allowed values.
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | no
    | New feature?  | yes
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | --
    | License       | MIT
    | Doc PR        | symfony/symfony-docs#3437
    
    Commits
    -------
    
    07d1d30 Allow giving a callback as an allowedValue to OptionsResolver
    authored January 07, 2014
  5. Marek Kalnik

    Allow giving a callback as an allowedValue to OptionsResolver

    authored June 28, 2013

Nov 24, 2013

  1. Fabien Potencier

    updated version to 2.5

    authored November 24, 2013

Sep 19, 2013

  1. Fabien Potencier

    Merge branch '2.3'

    * 2.3:
      fixed phpdoc
      Fix some annotates
      [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
      [HttpKernel] remove unneeded strtoupper
      updated the composer install command to reflect changes in Composer
    
    Conflicts:
    	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
    authored September 19, 2013
  2. Fabien Potencier

    Merge branch '2.2' into 2.3

    * 2.2:
      Fix some annotates
      [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
      [HttpKernel] remove unneeded strtoupper
      updated the composer install command to reflect changes in Composer
    
    Conflicts:
    	src/Symfony/Component/Console/Application.php
    	src/Symfony/Component/Console/Command/Command.php
    	src/Symfony/Component/Console/Input/InputDefinition.php
    	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
    	src/Symfony/Component/Form/Form.php
    	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
    	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
    	src/Symfony/Component/Locale/Locale.php
    	src/Symfony/Component/Locale/README.md
    	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
    authored September 19, 2013

Sep 18, 2013

  1. Fabien Potencier

    updated the composer install command to reflect changes in Composer

    authored September 18, 2013

Jul 21, 2013

  1. Fabien Potencier

    Merge branch '2.3'

    * 2.3:
      [Validator] fixed ConstraintViolation:: incorrect when nested
      handle Optional and Required constraints from XML or YAML sources correctly
      added missing comments to WebTestCase
      Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
      Added missing files .gitignore
      [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
      [Validator] Fixed groups argument misplace for validateValue method from validator class
      [Form] Fix of "PATCH'ed forms are never valid"
    authored July 21, 2013
  2. Martin Hasoň

    Added missing files .gitignore

    authored July 16, 2013 fabpot committed July 21, 2013

May 16, 2013

  1. Fabien Potencier

    updated version to 2.4

    authored May 16, 2013

Apr 11, 2013

  1. dantleech

    Enforce sprintf for exceptions

    authored April 10, 2013 fabpot committed April 11, 2013

Apr 02, 2013

  1. Dariusz Górecki

    [CS Fix] Consistent coding-style of concatenation operator usage

    authored April 02, 2013

Jan 31, 2013

  1. Fabien Potencier

    updated the branch alias in composer files

    authored January 31, 2013

Jan 17, 2013

  1. Fabien Potencier

    Merge branch '2.1'

    * 2.1:
      [Yaml] fixed default value
      Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
      added a way to enable/disable object support when parsing/dumping
      added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
      fixed CS
      [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
      fixes a bug when output/error output contains a % character
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
      [Profiler] [Redis] Fix sort of profiler rows.
      Fix version_compare() calls for PHP 5.5.
      Removed underscores from test method names to be consistent with other components.
      [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
      Fix version_compare() calls for PHP 5.5.
      Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
      removed the .gitattributes files (closes #6605, reverts #5674)
      [HttpKernel] Clarify misleading comment in ExceptionListener
    
    Conflicts:
    	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
    	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    	src/Symfony/Component/Process/Process.php
    authored January 17, 2013

Jan 09, 2013

  1. Fabien Potencier

    removed the .gitattributes files (closes #6605, reverts #5674)

    authored January 09, 2013

Jan 05, 2013

  1. Bernhard Schussek

    Fixed @expectedException definitions to reference absolute exception …

    …paths
    authored January 05, 2013

Jan 04, 2013

  1. Fabien Potencier

    Merge branch '2.0' into 2.1

    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    authored January 04, 2013
  2. Fabien Potencier

    updated license year

    authored January 04, 2013

Dec 11, 2012

  1. Fabien Potencier

    fixed CS

    authored December 11, 2012

Dec 06, 2012

  1. Martin Hasoň

    Removed useless branch alias for dev-master in composer.json

    authored December 06, 2012

Nov 24, 2012

  1. Fabien Potencier

    merged branch Tobion/patch-1 (PR #5104)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    e2a50ef [OptionsResolver] fix normalizer without corresponding option
    5a53821 [OptionsResolver] fix removing normalizers
    
    Discussion
    ----------
    
    OptionsResolver: normalizer fix
    
    setNormalizer() -> replace() -> all() would generate an error.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-07-29T16:09:20Z
    
    Thank you for the fix! Could you please add a test case?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-07-30T15:42:26Z
    
    There is another problem: setNormalizer() (without setting an option) -> all()
    I suggest to simply ignore normalizers that have no corresponding option. Do you agree?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-07-30T16:19:24Z
    
    On the other hand, one could argue that a normalizer without option should also work like this:
    ```
    $this->options->setNormalizer('foo', function (Options $options) {
            return '';
    });
    $this->assertEquals(array('foo' => ''), $this->options->all());
    ```
    
    But when having a normalizer that wants a previous value as param, it does not work (because there is none).
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-07-30T16:30:34Z
    
    @Tobion according to github, this need to be rebased
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-07-30T19:16:48Z
    
    I guess setNormalizer() should check whether the option is set and fail otherwise. The second possibility, as you say, is to ignore them in all(). I'd prefer whatever is more efficient.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-07-30T19:17:27Z
    
    But setting a normalizer without setting an option, and having that option appear in the final options, does not make sense if you ask me.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-07-30T21:23:46Z
    
    Well it could make sense. If you want to override/normalize an option to a given value however it has been overloaded by others or just not overloaded at all. This is what normalizers do. I think its more consistent than the other solutions.
    Raising exception in setNormalizer would make the Class dependent on the order you call the methods, e.g. `setNormalizer(); set()` would not work. But the other way round would be ok.
    Ignoring some normalizers in `all` would be strange because they are there but not applied under some circumstances.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-07-30T21:42:40Z
    
    Added the fix. If you disagree tell me.
    
    ---------------------------------------------------------------------------
    
    by bschussek at 2012-08-04T09:30:18Z
    
    > Raising exception in setNormalizer would make the Class dependent on the order you call the methods, e.g. `setNormalizer(); set()` would not work. But the other way round would be ok.
    
    I think this would be a better solution. I dislike if the normalizer magically adds an option that does not exist. This could hide implementation error, e.g. when a refactoring removes an option, but the normalizer is forgotten. Can you throw an exception in this case?
    
    Should we find use cases that rely on this to work, we can soften the behavior and remove the exception.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-08-04T15:02:51Z
    
    Well, that would also make it impossible to set a normalizer for on optional option in OptionsResolver.
    So `setOptional` + `setNormalizers` would throw an exception which sounds counter-intuitive. Are you sure about that?
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-08-17T11:47:58Z
    
    ping @bschussek
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-10-07T22:31:44Z
    
    @bschussek ping
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-10-13T18:04:30Z
    
    @bschussek ping
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-11-08T09:55:15Z
    
    @bschussek please let's get this finished.
    authored November 24, 2012

Nov 13, 2012

  1. Fabien Potencier

    Merge branch '2.1'

    * 2.1: (24 commits)
      forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3
      [Routing] removed irrelevant string cast in Route
      Fixed typo
      Make YamlFileLoader and XmlFileLoader file loading extensible
      [HttpKernel] fix typo
      Fixed singularization of "prices"
      [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
      [HttpKernel] fixed Client when using StreamedResponses (closes #5370)
      fixed PDO session handler for Oracle (closes #5829)
      [HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
      [Locale] removed a check that is done too early (and it is done twice anyways)
      Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
      Adding new localized strings for farsi validation.
      [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
      [Form] Fixed forms not to be marked invalid if their children are already marked invalid
      [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
      added missing tests from previous merge
      [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
      Fix export-ignore on Windows
      Show correct class name InputArgument in error message
      ...
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
    authored November 13, 2012

Nov 09, 2012

  1. Fabien Potencier

    made usage of Composer autoloader for subtree-split unit tests

    authored November 09, 2012

Nov 08, 2012

  1. Włodzimierz Gajda

    Fix export-ignore on Windows

    authored November 08, 2012

Oct 06, 2012

  1. Fabien Potencier

    Merge branch '2.1'

    * 2.1:
      fixed CS
      added doc comments
      added doc comments
      [Validator] Updated swedish translation
      Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
      [2.1] Exclude tests from zips via gitattributes
      [HttpKernel][Translator] Fixed type-hints
      Updated lithuanian validation translation
      [DomCrawler] Allows using multiselect through Form::setValues().
      [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
      Unit test for patched method OptionsResolver::validateOptionValues().
      validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't.
      [Form] Hardened code of ViolationMapper against errors
      [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
      [Form] Fixed negative index access in PropertyPathBuilder
      Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf
    
    Conflicts:
    	src/Symfony/Component/DomCrawler/Form.php
    	src/Symfony/Component/Process/Process.php
    authored October 06, 2012

Oct 04, 2012

  1. Igor Wiedler

    [2.1] Exclude tests from zips via gitattributes

    authored October 04, 2012

Oct 03, 2012

  1. Olivier Maisonneuve

    Unit test for patched method OptionsResolver::validateOptionValues().

    authored September 27, 2012 fabpot committed October 03, 2012
Something went wrong with that request. Please try again.