Permalink
Commits on Jan 19, 2013
  1. fixed markup

    fabpot committed Jan 19, 2013
  2. merged branch beberlei/SerializerOptions (PR #6797)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    fcabadf Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md
    b6bdb45 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
    ef652e2 Added context to JsonEncoder
    eacb7e2 Rename $options to $context, as it makes the intent much more clear.
    8854b85 Fix CS issues, removed global options
    9c54a4b [Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.
    
    Discussion
    ----------
    
    [2.2] [Serializer] Configurable Serializer
    
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: yes
    Symfony2 tests pass: yes
    Fixes the following tickets: #4907, #4938
    License of the code: MIT
    Todo:
    
    This is an extension of GH-6574 that removes the context state in favor of passing this information around.
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2013-01-18T13:12:39Z
    
    @fabpot @lsmith I think this is how it should work from an OOP/OOD perpesctive, avoiding the context state. This makes for a much cleaner code and dependency graph.
    
    ---------------------------------------------------------------------------
    
    by lsmith77 at 2013-01-18T14:14:37Z
    
    makes sense. anything fancier would lose this components simplicity which IMHO is the main benefit versus JMS serializer.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2013-01-18T14:26:25Z
    
    Looks very good. 👍
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2013-01-18T14:37:32Z
    
    I need to fix the failures with the JsonEncoder and then this is good to merge
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-01-18T14:40:21Z
    
    you also need to update the CHANGELOG of the component
    
    ---------------------------------------------------------------------------
    
    by beberlei at 2013-01-18T23:17:57Z
    
    Fixed, only the Redis Profiler problem still failing the Travis builds. Also I updated the CHANGELOG.md.
    
    @fabpot  Good to merge from my POV
    
    ---------------------------------------------------------------------------
    
    by stof at 2013-01-18T23:27:59Z
    
    @beberlei see #6804 for the Redis profiler issue
    fabpot committed Jan 19, 2013
Commits on Jan 18, 2013
  1. Completly refactor the Serializer Options Pull Request to push contex…

    …t information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
    beberlei committed Jan 18, 2013
Commits on Jan 17, 2013
  1. 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
    fabpot committed Jan 17, 2013
Commits on Jan 9, 2013
Commits on Jan 5, 2013
  1. Added context to JsonEncoder

    dlsniper committed Jan 5, 2013
Commits on Jan 4, 2013
  1. [Serializer] Allow options to be passed to SerialiizerInterface#seria…

    …lize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.
    beberlei committed with dlsniper Jul 16, 2012
  2. 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
    fabpot committed Jan 4, 2013
  3. updated license year

    fabpot committed Jan 4, 2013
  4. updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 19, 2012
Commits on Dec 13, 2012
  1. Merge branch '2.1'

    * 2.1:
      [Console] Add support for parsing terminal width/height on localized windows, fixes #5742
      [Form] Fixed treatment of countables and traversables in Form::isEmpty()
      refactor ControllerNameParser
      [Form] Fixed FileType not to throw an exception when bound empty
      - Test undefined index #
      Maintain array structure
      Check if key # is defined in $value
      Update src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
    fabpot committed Dec 13, 2012
Commits on Dec 12, 2012
  1. - Test undefined index #

    egulias committed with fabpot Dec 12, 2012
  2. Maintain array structure

    Harry Walter committed with fabpot Sep 1, 2012
  3. Check if key # is defined in $value

    If # is undefined in $value use set the attribute value as $value
    haswalt committed with fabpot Aug 31, 2012
Commits on Dec 6, 2012
Commits on Nov 17, 2012
  1. Improve docBlock

    lanthaler committed with fabpot Nov 16, 2012
Commits on Nov 13, 2012
  1. 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
    fabpot committed Nov 13, 2012
Commits on Nov 9, 2012
Commits on Nov 8, 2012
  1. Fix export-ignore on Windows

    gajdaw committed Nov 8, 2012
Commits on Oct 24, 2012
  1. Merge branch '2.1'

    * 2.1:
      added missing use statment (closes #5825)
      Code cleanup
      [WebProfilerBundle] Fixed the use of nested macros
      Removed unused use statements.
      Nsdocblocks
      [ConfigDumpReference] avoid notice for variable nodes
      fixed fallback locale
      UniqueValidatorTest, Change message on assertions
      Documented removed _form_is_choice_group function
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
    	src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
    fabpot committed Oct 24, 2012
Commits on Oct 20, 2012
  1. Nsdocblocks

    Drak committed with fabpot Oct 19, 2012
Commits on Oct 6, 2012
  1. 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
    fabpot committed Oct 6, 2012
Commits on Oct 4, 2012
Commits on Sep 28, 2012
  1. Optimize autoload prefix in composer.json

    By having more specific autoload prefixes it is possible to reduce the
    number of stat calls made. Also it prevents conflicts with similar
    namespaces.
    Slamdunk committed Sep 28, 2012
Commits on Sep 18, 2012
  1. merged branch romainneutron/DependencyInjectionExceptions (PR #5399)

    Commits
    -------
    
    f2e4802 [Yaml] Normalize exceptions
    b0f5f2e [Serializer] Normalize exceptions
    bcd8db2 [DependencyInjection] Normalize exceptions
    
    Discussion
    ----------
    
    Normalize exceptions
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    License of the code: MIT
    
    This PR adds consistence to components which already have their own exception interface.
    
    DependencyInjection, Serializer and Yaml now only throw their own scoped exceptions.
    
    For other components, it's much more work and could introduce some bugs. It would be better to do it in Symfony 2.2.
    fabpot committed Sep 18, 2012
Commits on Sep 6, 2012
  1. udpated composer.json to 2.2

    fabpot committed Sep 6, 2012
Commits on Aug 30, 2012
Commits on Aug 28, 2012
  1. Merge branch '2.0'

    * 2.0:
      updated VERSION for 2.0.17
      updated CHANGELOG for 2.0.17
      updated vendors for 2.0.17
      fixed XML decoding attack vector through external entities
      prevents injection of malicious doc types
      disabled network access when loading XML documents
      refined previous commit
      prevents injection of malicious doc types
      standardized the way we handle XML errors
      Redirects are now absolute
    
    Conflicts:
    	CHANGELOG-2.0.md
    	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
    	src/Symfony/Component/DomCrawler/Crawler.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php
    	tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php
    	tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php
    	tests/Symfony/Tests/Component/Translation/Loader/XliffFileLoaderTest.php
    	tests/Symfony/Tests/Component/Validator/Mapping/Loader/XmlFileLoaderTest.php
    	vendors.php
    fabpot committed Aug 28, 2012
  2. refined previous commit

    fabpot committed Aug 26, 2012