Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 5, 2013
  1. @fabpot

    Merge branch '2.1'

    fabpot authored
    * 2.1:
      Restrict Monolog version to be in version <1.3
      [Console] Make getTerminalWith & getTerminalHeight public
      [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly
      [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties
      [DependencyInjection] added some tests for PhpDumper when the container is compiled
      [DependencyInjection] fixed CS
      [Process] Do not reset stdout/stderr pipes on Interrupted system call
      [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5
      use the right RequestMatcherInterface
      [Locale] Fix failing `StubIntlDateFormatter` tests in PHP 5.5
      [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5
      [Form] Fix failing `MonthChoiceList` in PHP 5.5
      Update .travis.yml
    
    Conflicts:
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
  2. @fabpot

    Merge branch '2.0' into 2.1

    fabpot authored
    * 2.0:
      Restrict Monolog version to be in version <1.3
      [Console] Make getTerminalWith & getTerminalHeight public
      [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly
      [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties
      [DependencyInjection] added some tests for PhpDumper when the container is compiled
      [DependencyInjection] fixed CS
      [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5
      [Locale] Fix failing `StubIntlDateFormatter` tests in PHP 5.5
      [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5
      [Form] Fix failing `MonthChoiceList` in PHP 5.5
      Update .travis.yml
    
    Conflicts:
    	src/Symfony/Bridge/Monolog/composer.json
    	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
    	src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php
    	tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services9.yml
Commits on Jan 4, 2013
  1. @stloyd

    Update .travis.yml

    stloyd authored
    Add PHP 5.5 to Travis-CI testing and allow it to fail.
Commits on Nov 19, 2012
  1. @pborreli @fabpot

    [travis-ci] Zend Garbage Collection only for PHP5.4

    pborreli authored fabpot committed
Commits on Nov 17, 2012
  1. @pborreli

    Fix PHP 5.4 segfault

    pborreli authored
Commits on Nov 13, 2012
  1. @fabpot

    Merge branch '2.1'

    fabpot authored
    * 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
  2. @fabpot
Commits on Sep 20, 2012
  1. @fabpot

    Merge branch '2.1'

    fabpot authored
    * 2.1:
      bumped Symfony version to 2.1.3-DEV
      updated VERSION for 2.1.2
      updated CHANGELOG for 2.1.2
      Fixed FlashBagInterface phpdoc, clarified UPGRADE docs
      composer is available in travis workers
    
    Conflicts:
    	src/Symfony/Component/HttpKernel/Kernel.php
Commits on Sep 19, 2012
  1. @bamarni
Commits on Aug 7, 2012
  1. @eriksencosta

    [Locale] don't create a "current" directory anymore, uses only the IC…

    eriksencosta authored
    …U version as the name of the data directory
  2. @eriksencosta
  3. @eriksencosta
Commits on Jul 15, 2012
  1. @fabpot

    Revert "merged branch stof/travis_version (PR #4905)"

    fabpot authored
    This reverts commit f9765d5, reversing
    changes made to 4b2230d.
Commits on Jul 14, 2012
  1. @stof
Commits on May 30, 2012
  1. @fabpot

    merged 2.0

    fabpot authored
Commits on May 28, 2012
  1. @Maks3w
  2. @vicb
Commits on May 24, 2012
  1. @Seldaek
Commits on May 8, 2012
  1. @fabpot
Commits on May 7, 2012
  1. @fabpot

    fixed Travis configuration

    fabpot authored
Commits on Apr 18, 2012
  1. @fabpot

    tweaked previous merge

    fabpot authored
Commits on Apr 8, 2012
  1. @canni

    [Composer] Stwitch to composer vendors management

    canni authored
    Bug fix: no
    Feature addition: yes
    Backwards compatibility break: ?
    Symfony2 tests pass: yes
    Fixes the following tickets: -
    Todo: -
    
    This speeds up Travis CI builds to `~2 min` also makes vendor management
    a lot easier.
Commits on Dec 26, 2011
  1. @lsmith77
Commits on Nov 22, 2011
  1. @fabpot @lsmith77

    tweaked travis configuration

    fabpot authored lsmith77 committed
  2. @pborreli @lsmith77

    [CI] travis-ci.org integration

    pborreli authored lsmith77 committed
Something went wrong with that request. Please try again.