Permalink
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
Commits on Aug 22, 2012
Commits on Jul 26, 2012
Commits on Jul 15, 2012
  1. Revert "raised the minimum version of PHP to 5.3.4 (closes #3856)"

    This reverts commit 2dcc44897ef1ceec2721bbf616c4744131340657.
    fabpot committed Jul 15, 2012
Commits on Jul 14, 2012
  1. Moved the NormalizationAwareInterface check to the ChainEncoder

    This allows nesting a ChainEncoder inside another one without breaking
    the check.
    stof committed Jul 14, 2012
  2. [Serializer] Added a ChainEncoder and a ChainDecoder

    These classes contains the logic previously defined in the Serializer
    itself to handle the choice of a serializer. This allows reusing it when
    using only the encoding part of the component.
    stof committed Jul 14, 2012
Commits on Jul 13, 2012
  1. raised the minimum version of PHP to 5.3.4 (closes #3856)

    We've raised the minimum version of PHP because of a PHP
    bug before 5.3.4:
    
    https://bugs.php.net/bug.php?id=52083
    https://bugs.php.net/bug.php?id=50027
    fabpot committed Jul 13, 2012
Commits on Jul 9, 2012
  1. fixed CS

    fabpot committed Jul 9, 2012
Commits on Jun 12, 2012
Commits on May 18, 2012
  1. fixed CS

    fabpot committed May 18, 2012
  2. fixed CS

    fabpot committed May 18, 2012
Commits on May 15, 2012
  1. fixed phpdoc @param alignment

    fabpot committed May 15, 2012
  2. fixed phpdoc @param alignment

    fabpot committed May 15, 2012
  3. fixed CS

    fabpot committed May 15, 2012
Commits on May 14, 2012
  1. Moved JSON encoding and decoding to separate classes which expose all…

    … their available parameters
    scoolen committed May 14, 2012
Commits on May 13, 2012
Commits on May 7, 2012
  1. updated minimum PHP version to 5.3.3

    5.3.3 has some interesting fixes and this is the version used by
    Redhat 6 and Debian 6
    fabpot committed May 7, 2012
Commits on May 1, 2012
  1. merged branch willdurand/fix-components (PR #4155)

    Commits
    -------
    
    c195957 [Components] Tests/Autoloading fixes
    
    Discussion
    ----------
    
    Fix components
    
    See #4141
    
    ----
    This PR:
    
    * configures each component to use composer to manage "dev" dependencies instead of env variables;
    * adds phpunit configuration file on Filesystem component;
    * fixes READMEs.
    
    It's mergeable without any problems, but I would recommend to wait a fix in Composer in order to use `self.version` in `require`/`require-dev` sections.
    
    Note: I kept `suggest` sections because it makes sense but this PR doesn't aim to provide useful explanations for each entry. It could be another PR, not that one.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-04-30T20:43:13Z
    
    @fabpot I reviewed each component, one by one. Now `phpunit` always works, even if tests are skipped. A simple `composer install --dev` allows to run the complete test suite. Each commit is well separated from the others. I guess, everything is ok now.
    
    ---------------------------------------------------------------------------
    
    by Tobion at 2012-04-30T20:47:00Z
    
    Please squash, as it makes no sense to have the same commit for each component.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T14:26:11Z
    
    Can you squash your commits before I merge? Thanks.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T14:29:38Z
    
    done
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-01T15:48:25Z
    
    It does not seem that the commits are squashed.
    
    ---------------------------------------------------------------------------
    
    by willdurand at 2012-05-01T15:54:08Z
    
    done
    fabpot committed May 1, 2012
  2. [Components] Tests/Autoloading fixes

    * Switched to Composer to manage "dev" dependencies
    * Fixed READMEs
    * Excluded vendor in phpunit.xml.dist files
    * Fixed message in bootstrap.php files
    * Added autoloader for the component itself
    willdurand committed Apr 27, 2012
  3. fixed CS

    fabpot committed May 1, 2012
Commits on Apr 27, 2012
  1. Revert "merged branch Seldaek/master (PR #4133)"

    This reverts commit 00e7a94a8c761a3e10c388e4d06cb3ce4cd04ad7, reversing
    changes made to a01dec00f4e8de357cce5fdf121ac98729f7f8ff.
    fabpot committed Apr 27, 2012
  2. Update branch aliases

    Seldaek committed Apr 27, 2012
Commits on Apr 26, 2012
  1. [Serializer] added CHANGELOG

    fabpot committed Apr 26, 2012
Commits on Apr 7, 2012
  1. allow more control on GetSetMethodNormalizer by using callback functi…

    …ons and an ignoreAttributes list
    tvlooy committed Mar 12, 2012
Commits on Apr 2, 2012
Commits on Mar 31, 2012
  1. updated license blocks

    eriksencosta committed Mar 31, 2012
Commits on Mar 30, 2012
Commits on Mar 29, 2012
  1. moved component and bridge unit tests to the src/ directory

    This is the first step to make each Symfony Component and Bridge self-contained.
    fabpot committed Mar 28, 2012
Commits on Feb 27, 2012
  1. merged branch Seldaek/composer_alias (PR #3457)

    Commits
    -------
    
    bafcaaf Removed version field
    f9d9dc7 Add branch-alias for composer
    
    Discussion
    ----------
    
    Add branch-alias for composer
    
    This should restore the 2.1-dev version (as an alias of dev-master) so that `2.*` or `2.1.*` constraints work again. I'll adjust packagist soon to also display those aliases.
    fabpot committed Feb 27, 2012
  2. Removed version field

    Seldaek committed Feb 27, 2012