Commit Graph

6719 Commits

Author SHA1 Message Date
Tobias Schultze
c73643675f fixed language in test 2011-10-16 07:53:44 +03:00
Tobias Schultze
2009249128 fixed language 2011-10-16 07:51:23 +03:00
Fabien Potencier
64302103f6 merged branch igorw/composer (PR #2402)
Commits
-------

a1bab83 [composer] make doctrine dbal and orm recommended by doctrine-bundle
225b512 [composer] make doctrine dbal and orm recommended by doctrine-bridge
03bdac0 [composer] make twig-bundle require twig-bridge
5757713 [composer] add doctrine and twig dependencies

Discussion
----------

Composer update

Add doctrine and twig dependencies (they are now on packagist.org), move doctrine requires to recommends, add twig-bridge require to twig-bundle.

Per @stof, symfony 2.1 (master) will need doctrine to be updated to 2.2-dev.

---------------------------------------------------------------------------

by Seldaek at 2011/10/15 09:13:35 -0700

Also @fabpot it'd be great if you would submit all the sub-tree packages to packagist.org, that way we could start using them individually.

By the way if you want the automatic versioning is now working so if you just delete the "version" from the json files, it should do the right thing. Up to you. See details on http://packagist.org/about
2011-10-16 03:27:55 +02:00
Igor Wiedler
a1bab8305d [composer] make doctrine dbal and orm recommended by doctrine-bundle 2011-10-15 16:57:28 +02:00
Igor Wiedler
225b512b67 [composer] make doctrine dbal and orm recommended by doctrine-bridge 2011-10-15 16:56:23 +02:00
Igor Wiedler
03bdac04ae [composer] make twig-bundle require twig-bridge 2011-10-15 16:56:13 +02:00
Igor Wiedler
575771380b [composer] add doctrine and twig dependencies 2011-10-15 16:55:54 +02:00
Joseph Bielawski
205f524758 [Tests] Skip MimeTypeTest if running as root 2011-10-15 13:45:35 +02:00
Fabien Potencier
548c968444 merged branch stloyd/monolog-tests (PR #2400)
Commits
-------

d9d9c6b [Tests] Skip Monolog test if it's not available.

Discussion
----------

[Tests] Skip Monolog test if it's not available.
2011-10-15 13:08:41 +02:00
Joseph Bielawski
d3e9104b52 [Tests] Skip Routing annotation tests when Doctrine is not available. 2011-10-15 13:06:22 +02:00
Joseph Bielawski
d9d9c6b57a [Tests] Skip Monolog test if it's not available. 2011-10-15 13:00:48 +02:00
Fabien Potencier
5dba01851e merged branch beberlei/GH-1635 (PR #2396)
Commits
-------

9d8046e [Doctrine] GH-1635 - UniqueValidator now works with associations

Discussion
----------

GH 1635

Handle associations in unique validator correctly.

---------------------------------------------------------------------------

by beberlei at 2011/10/15 00:34:31 -0700

This can be merged into "master" as well. The test-code is also a little bit smelling, it includes files manually that dont follow PSR-0. I am going to fix that in another PR after this is merged.
2011-10-15 11:06:44 +02:00
Benjamin Eberlei
9d8046e407 [Doctrine] GH-1635 - UniqueValidator now works with associations 2011-10-15 09:20:06 +02:00
Fabien Potencier
3426c8390c [BrowserKit] fixed cookie updates from Response (the URI here is not the base URI, so it should not be used to determine the default values missing in the cookie, closes #2309) 2011-10-15 02:32:15 +02:00
Fabien Potencier
c0f5b8a3b6 [HttpKernel] fixed profile saving when it has children 2011-10-15 01:46:19 +02:00
Fabien Potencier
3d7510e921 [HttpKernel] fixed missing init for Profile children property 2011-10-15 00:56:18 +02:00
Fabien Potencier
663e25af64 merged branch cs278/issue/2394 (PR #2394)
Commits
-------

d8dfca2 [BrowserKit] Added additional unit tests for capital letters in cookies
00cbd39 [BrowserKit] Fixed cookie expiry discard when attribute contains capitals

Discussion
----------

[BrowserKit] Cookie expiry is discared if the attribute name contains a capital letter

`Cookie::fromString()` discards the expiry time of a cookie where the `expires` attribute contains a capital letter, like `foo=bar; Expires=Fri, 31 Dec 2010 23:59:59 GMT`.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-15 00:31:26 +02:00
Chris Smith
d8dfca21f2 [BrowserKit] Added additional unit tests for capital letters in cookies 2011-10-14 20:31:31 +01:00
Chris Smith
00cbd39813 [BrowserKit] Fixed cookie expiry discard when attribute contains capitals 2011-10-14 20:23:34 +01:00
Miha Vrhovnik
edfa29b01b session data needs to be encoded because it can contain non binary safe
characters e.g null. Fixes #2067
2011-10-11 21:42:38 +02:00
Fabien Potencier
c00ba4dab8 [Console] fixed typo (closes #2358) 2011-10-11 12:56:40 +02:00
Fabien Potencier
d01b29e9f6 [FrameworkBundle] added some unit tests 2011-10-11 12:54:11 +02:00
Fabien Potencier
550f158428 merged branch weaverryan/entity_better_exception_2_0 (PR #2372)
Commits
-------

2270a4d [Bridge][Doctrine] Adding a catch for when a developer uses the EntityType with multiple=false but on a "hasMany" relationship

Discussion
----------

[Bridge][Doctrine] Adding a catch for when a developer uses the EntityType

Hey guys!

See #2348 - same commit, but against the right branch.

Thanks!
2011-10-10 15:40:52 +02:00
Ryan Weaver
2270a4da5a [Bridge][Doctrine] Adding a catch for when a developer uses the EntityType with multiple=false but on a "hasMany" relationship
Without this, the exception is eventually thrown in EntityChoiceList::getIdentifierValues() with a very a message that doesn't really suit the real error: "Entities passed to the choice field must be managed"
2011-10-10 08:26:22 -05:00
Lukas Kahwe Smith
d3f137b9c1 cosmetic tweak 2011-10-09 16:09:22 +02:00
Lukas Kahwe Smith
28778834c7 anything in front of ;q= is part of the mime type, anything after may be ignored
see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
2011-10-09 12:58:45 +02:00
Fabien Potencier
d233c44e98 merged branch ioalessio/2.0 (PR #2363)
Commits
-------

dd0d6fd fixing italian messages

Discussion
----------

italian messages

"bug fix" for branch 2.0
2011-10-09 08:39:22 +02:00
Alessio
dd0d6fd15b fixing italian messages 2011-10-09 02:40:44 +03:00
Tigran Azatyan
d2d849cf60 First 2011-10-08 22:57:17 +02:00
Fabien Potencier
d867f22b46 merged branch craue/patch-14 (PR #2354)
Commits
-------

2e5869d fixed "using $this when not in object context" error for 2.0 branch (replaces #2353)

Discussion
----------

fixed "using $this when not in object context" error for 2.0 branch (replaces #2353)
2011-10-08 14:23:35 +02:00
Christian Raue
2e5869db00 fixed "using $this when not in object context" error for 2.0 branch (replaces #2353) 2011-10-08 14:05:33 +02:00
Fabien Potencier
f75f46682d merged branch stealth35/fix_distant_trans (PR #2346)
Commits
-------

ae0685a [Translation] Loader should only load local files

Discussion
----------

[Translation] Security : Loader should only load local files

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
See: #2327
2011-10-08 13:34:50 +02:00
stealth35
ae0685a314 [Translation] Loader should only load local files 2011-10-07 18:30:56 +02:00
Fabien Potencier
50c47aa687 merged branch stloyd/form_texttypes (PR #2343)
Commits
-------

8bd0e42 [Form] Use proper parent (text) for EmailType and TextareaType

Discussion
----------

[2.0][Form] Use proper parent (text) for EmailType and TextareaType

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 14:07:29 +02:00
Fabien Potencier
f22566ca19 merged branch stloyd/ScalarTransformer (PR #2341)
Commits
-------

95049ef [Form] Added type check to `ScalarToChoiceTransformer`

Discussion
----------

[2.0][Form] Added type check to ScalarToChoiceTransformer

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 14:06:24 +02:00
Fabien Potencier
4cdf6ac9f4 merged branch stloyd/FormUtil (PR #2340)
Commits
-------

18a83c6 [Form] Simplified a bit `FormUtil` and extended test coverage

Discussion
----------

[2.0][Form] Simplified a bit `FormUtil` and extended test coverage

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 14:05:47 +02:00
Joseph Bielawski
8bd0e42233 [Form] Use proper parent (text) for EmailType and TextareaType 2011-10-07 13:47:48 +02:00
stloyd
18a83c67f4 [Form] Simplified a bit FormUtil and extended test coverage 2011-10-07 12:04:26 +02:00
stloyd
95049ef902 [Form] Added type check to ScalarToChoiceTransformer 2011-10-07 12:01:07 +02:00
Fabien Potencier
aeb27ebebb merged branch stloyd/date_time_validator_tests (PR #2338)
Commits
-------

d7c9644 [Validator] Extend and fix DateValidator & TimeValidator tests

Discussion
----------

[2.0][Validator] Extend and fix DateValidator & TimeValidator tests

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
2011-10-07 11:56:54 +02:00
Joseph Bielawski
d7c9644d29 [Validator] Extend and fix DateValidator & TimeValidator tests 2011-10-07 10:47:59 +02:00
Fabien Potencier
a74ae9d325 [HttpFoundation] made X_REWRITE_URL only available on Windows platforms 2011-10-07 08:20:12 +02:00
Fabien Potencier
15f19e50fc [DoctrineBundle] fixed a unit test (detected thanks to PHP 3.6.0) 2011-10-06 21:40:38 +02:00
Fabien Potencier
5fe18cad90 merged branch fivestar/fix-form-datetime-2_0 (PR #2326)
Commits
-------

828b18f [Form] Fixed lacking attributes in DateTimeType

Discussion
----------

[Form] Fixed lacking attributes in DateTimeType

Added invalid_message and invalid_message_parameters. (Moved from #2311)
2011-10-05 11:21:28 +02:00
Katsuhiro OGAWA
828b18f467 [Form] Fixed lacking attributes in DateTimeType 2011-10-05 17:57:43 +09:00
Fabien Potencier
1f2e72d84a updated VERSION for 2.0.4 2011-10-04 13:47:14 +02:00
Fabien Potencier
408c913991 update CONTRIBUTORS for 2.0.4 2011-10-04 13:46:51 +02:00
Fabien Potencier
b6ef87f68e updated CHANGELOG for 2.0.4 2011-10-04 13:46:16 +02:00
Fabien Potencier
f172547d84 updated vendors for 2.0.4 2011-10-04 13:43:49 +02:00
Fabien Potencier
92d19063a8 [Translation] changed some unit tests for PHPUnit 3.6.0 compatibility 2011-10-04 08:43:04 +02:00