Commit Graph

220 Commits

Author SHA1 Message Date
Fabien Potencier b126664406 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
2012-11-13 15:08:04 +01:00
Fabien Potencier 2fa9bd0b3f forced Travis to use source to workaround their not-up-to-date Composer on PHP 5.3.3 2012-11-13 15:04:20 +01:00
Fabien Potencier ad91b3b464 Merge branch '2.1'
* 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
2012-09-20 10:40:30 +02:00
Bilal Amarni 589a8b38d4 composer is available in travis workers 2012-09-19 16:29:32 +02:00
Eriksen Costa d909360942 [Locale] don't create a "current" directory anymore, uses only the ICU version as the name of the data directory 2012-08-07 12:17:02 -03:00
Eriksen Costa 3f2b4bf344 [Locale] changed build data script name 2012-08-07 12:17:02 -03:00
Eriksen Costa 86da1b3bf4 [Locale] added ICU update-data script to be run before the test suite 2012-08-07 12:17:00 -03:00
Fabien Potencier e8a9cf1ffe Revert "merged branch stof/travis_version (PR #4905)"
This reverts commit f9765d57f8, reversing
changes made to 4b2230da93.
2012-07-15 12:13:31 +02:00
Christophe Coevoet 7dcb6373ae Removed PHP 5.3.3 from the travis build as we require 5.3.4 now 2012-07-14 11:15:49 +02:00
Fabien Potencier eba4aba364 merged 2.0 2012-05-30 13:44:37 +02:00
Maks face1f1bd1 Add 5.3.3 to Travis, now is available. 2012-05-28 15:38:15 +03:00
Victor Berchet cc42a1873d php 5.3.2 is no more supported by travis 2012-05-28 10:43:19 +03:00
Jordi Boggiano f2d169508d Force root package version in travis builds 2012-05-24 20:40:53 +02:00
Fabien Potencier 898ff4e0eb removed 5.3.3 from Travis as it is not (yet) available 2012-05-08 08:42:40 +02:00
Fabien Potencier b5ef264c07 fixed Travis configuration 2012-05-07 10:40:27 +02:00
Fabien Potencier ee0be6c408 tweaked previous merge 2012-04-18 11:17:58 +02:00
Dariusz Górecki aa055dfd98 [Composer] Stwitch to composer vendors management
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.
2012-04-08 21:11:03 +02:00
lsmith77 dfbed9f91d also test PHP 5.3.2, since this is the official lowest supported PHP version 2011-12-26 01:15:21 +01:00
Fabien Potencier 9d2bd1cd51 tweaked travis configuration 2011-11-22 20:12:00 +01:00
pborreli f68c0286cc [CI] travis-ci.org integration 2011-11-22 19:57:22 +01:00