Permalink
Commits on Jul 11, 2013
Commits on May 16, 2013
  1. updated version to 2.4

    fabpot committed May 16, 2013
Commits on May 10, 2013
  1. Merge branch '2.2'

    * 2.2:
      fixed CS
      Fixed XML syntax.
      Fixed parsing of leading blank lines in folded scalars. Closes #7989.
      [Form] Fixed a method name.
      Added a test case for Loader::import().
      Fixed Loader import
      [Console] Added dedicated testcase for HelperSet class
      [Serializer] fixed CS (refs #7971)
      Fixed fatal error in normalize/denormalizeObject.
      Fixed 2 namespaces
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
    	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
    fabpot committed May 10, 2013
  2. Merge branch '2.1' into 2.2

    * 2.1:
      Fixed XML syntax.
      Fixed parsing of leading blank lines in folded scalars. Closes #7989.
      Added a test case for Loader::import().
      Fixed Loader import
      [Console] Added dedicated testcase for HelperSet class
    fabpot committed May 10, 2013
Commits on Apr 21, 2013
  1. Fixed PHPDocs

    pborreli committed Apr 21, 2013
Commits on Apr 17, 2013
  1. Merge branch '2.2'

    * 2.2:
      Fix default value handling for multi-value options
      [HttpKernel] truncate profiler token to 6 chars (see #7665)
      Disabled APC on Travis for PHP 5.5+ as it is not available
      [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
      Fix download over SSL using IE < 8 and binary file response
      [Console] Fix merging of application definition, fixes #7068, replaces #7158
      [HttpKernel] fixed the Kernel when the ClassLoader component is not available (closes #7406)
      fixed output of bag values
      [Yaml] improved boolean naming ($notEOF -> !$EOF)
      [Yaml] fixed handling an empty value
      [Routing][XML Loader] Add a possibility to set a default value to null
      [Console] fixed handling of "0" input on ask
      The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
      fixed handling of "0" input on ask
      [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
      [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
      Update PhpEngine.php
      [PropertyAccess] Add objectives to pluralMap
      [Security] Removed unused var
      [HttpFoundation] getClientIp is fixed.
    
    Conflicts:
    	src/Symfony/Component/Console/Tests/Command/CommandTest.php
    	src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
    	src/Symfony/Component/HttpFoundation/Request.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Apr 17, 2013
  2. Merge branch '2.1' into 2.2

    * 2.1:
      Fix default value handling for multi-value options
      [HttpKernel] truncate profiler token to 6 chars (see #7665)
      Disabled APC on Travis for PHP 5.5+ as it is not available
      [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
      [Yaml] improved boolean naming ($notEOF -> !$EOF)
      [Yaml] fixed handling an empty value
      [Routing][XML Loader] Add a possibility to set a default value to null
      The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
      [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
      [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
      Update PhpEngine.php
      [HttpFoundation] getClientIp is fixed.
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
    	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
    	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
    	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
    fabpot committed Apr 17, 2013
Commits on Apr 12, 2013
Commits on Apr 2, 2013
Commits on Mar 23, 2013
  1. Merge branch '2.2'

    * 2.2:
      #7106 - fix for ZTS builds
      Added '@@' escaping strategy for YamlFileLoader and YamlDumper
      [Yaml] fixed bugs with folded scalar parsing
      [Form] made DefaultCsrfProvider using session_status() when available
      Added unit tests to Dumper
      Update .travis.yml (closes #7355)
      [HttpFoudantion] fixed Request::getPreferredLanguage()
      Revert "merged branch jfsimon/issue-6928 (PR #7378)"
      Routing issue with installation in a sub-directory ref: symfony/symfony#7129
    fabpot committed Mar 23, 2013
  2. Merge branch '2.1' into 2.2

    * 2.1:
      #7106 - fix for ZTS builds
      Added '@@' escaping strategy for YamlFileLoader and YamlDumper
      [Yaml] fixed bugs with folded scalar parsing
      [Form] made DefaultCsrfProvider using session_status() when available
      Added unit tests to Dumper
      Update .travis.yml (closes #7355)
      [HttpFoudantion] fixed Request::getPreferredLanguage()
      Revert "merged branch jfsimon/issue-6928 (PR #7378)"
      Routing issue with installation in a sub-directory ref: symfony/symfony#7129
    
    Conflicts:
    	.travis.yml
    	src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
    	src/Symfony/Component/Routing/RouteCollection.php
    fabpot committed Mar 23, 2013
Commits on Mar 20, 2013
  1. Added unit tests to Dumper

    eddiejaoude committed with fabpot Feb 21, 2013
Commits on Mar 6, 2013
  1. Merge branch '2.2'

    * 2.2: (26 commits)
      [FrameworkBundle] Fixes invalid serialized objects in cache
      remove dead code in yaml component
      Fixed typo in UPGRADE-2.2
      fixed typo
      RedisProfilerStorage wrong db-number/index-number selected
      [DependencyInjection] added a test for the previous merge (refs #7261)
      Unset loading[$id] in ContainerBuilder on exception
      Default validation message translation fix.
      remove() should not use deprecated getParent() so it does not trigger deprecation internally
      adjust routing tests to not use prefix in addCollection
      add test for uniqueness of resources
      added tests for addDefaults, addRequirements, addOptions
      adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component
      added tests for remove() that wasnt covered yet and special route name
      refactor interator test that was still assuming a tree
      adjust tests to no use addPrefix with options
      adjusted tests to not use RouteCollection::getPrefix
      [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3
      [Console] fixed StringInput binding
      [Console] added string input test
      ...
    fabpot committed Mar 6, 2013
  2. Merge branch '2.1' into 2.2

    * 2.1:
      [FrameworkBundle] Fixes invalid serialized objects in cache
      remove dead code in yaml component
      fixed typo
      RedisProfilerStorage wrong db-number/index-number selected
      [DependencyInjection] added a test for the previous merge (refs #7261)
      Unset loading[$id] in ContainerBuilder on exception
      [Console] fixed StringInput binding
      [Console] added string input test
      Revert "merged branch jfsimon/issue-6749 (PR #7220)"
      fixed CS
    
    Conflicts:
    	src/Symfony/Component/Console/Tests/Input/StringInputTest.php
    	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
    fabpot committed Mar 6, 2013
  3. remove dead code in yaml component

    gimler committed with fabpot Mar 5, 2013
Commits on Jan 31, 2013
Commits on Jan 27, 2013
  1. Merge branch '2.1'

    * 2.1:
      [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
      Fixed missing class argument when throwing exception
    fabpot committed Jan 27, 2013
Commits on Jan 23, 2013
  1. Merge branch '2.1'

    * 2.1:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      Fix typos in README
      Added an error message in the DebugClassLoader when using / instead of \.
      KNOWN_ISSUES with php 5.3.16
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.1.8-DEV
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Bundle/FrameworkBundle/Client.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 23, 2013
Commits on Jan 22, 2013
  1. Merge branch '2.0' into 2.1

    * 2.0:
      [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
      [Security] PHPDoc in SecurityEvents
      [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
      [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
      [Yaml] fixed #6773
      [Yaml] fixed #6770
      bumped Symfony version to 2.0.23-DEV
    
    Conflicts:
    	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
    	src/Symfony/Component/HttpKernel/Kernel.php
    	src/Symfony/Component/Yaml/Inline.php
    	src/Symfony/Component/Yaml/Tests/InlineTest.php
    fabpot committed Jan 22, 2013
Commits on Jan 18, 2013
  1. merged branch ezzatron/yaml-negative-integers (PR #6784)

    This PR was merged into the 2.0 branch.
    
    Commits
    -------
    
    fea20b7 [Yaml] fixed #6770
    
    Discussion
    ----------
    
    [Yaml] fixed parsing of negative integers (2.0 branch)
    
    | Q             | A
    | ------------- | ---
    | Bug fix?      | yes
    | New feature?  | no
    | BC breaks?    | no
    | Deprecations? | no
    | Tests pass?   | yes
    | Fixed tickets | #6770
    | License       | MIT
    | Doc PR        | n/a
    
    Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
    fabpot committed Jan 18, 2013
Commits on Jan 17, 2013
  1. [Yaml] fixed #6773

    ezzatron committed Jan 17, 2013
  2. [Yaml] fixed #6770

    ezzatron committed Jan 17, 2013
  3. Merge branch '2.1'

    * 2.1:
      [Yaml] fixed unneeded BC break
      [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
      [Yaml] fixed typo
      updated VERSION for 2.1.7
      updated CHANGELOG for 2.1.7
      updated VERSION for 2.0.22
      update CONTRIBUTORS for 2.0.22
      updated CHANGELOG for 2.0.22
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 17, 2013
  4. Merge branch '2.0' into 2.1

    * 2.0:
      [Yaml] fixed unneeded BC break
      [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
      [Yaml] fixed typo
      updated VERSION for 2.0.22
      update CONTRIBUTORS for 2.0.22
      updated CHANGELOG for 2.0.22
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
    fabpot committed Jan 17, 2013
  5. [Yaml] fixed unneeded BC break

    fabpot committed Jan 17, 2013
  6. [Yaml] fixed typo

    fabpot committed Jan 17, 2013
  7. 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
  8. Merge branch '2.0' into 2.1

    * 2.0:
      [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()
      [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
    
    Conflicts:
    	src/Symfony/Component/Yaml/Dumper.php
    	src/Symfony/Component/Yaml/Parser.php
    	src/Symfony/Component/Yaml/Tests/DumperTest.php
    	src/Symfony/Component/Yaml/Tests/ParserTest.php
    	src/Symfony/Component/Yaml/Yaml.php
    fabpot committed Jan 17, 2013
  9. [Yaml] fixed default value

    fabpot committed Jan 17, 2013