Commit Graph

11916 Commits

Author SHA1 Message Date
Fabien Potencier
b392a47cff merged branch vicb/changelog (PR #5982)
This PR was merged into the master branch.

Commits
-------

2972f31 [HttpKernel] Changlog update - document a BC break

Discussion
----------

[HttpKernel] Changlog update - document a BC break
2012-11-11 20:10:17 +01:00
David Buchmann
e77ecc95de [FrameworkBundle] switch to parameter for base url to make it configurable for tests and cli as done for host and scheme in d30943c2e8 2012-11-11 19:27:43 +01:00
Victor Berchet
2972f3142c [HttpKernel] Changlog update - document a BC break 2012-11-11 18:39:27 +01:00
Igor Wiedler
c659e7858a Make YamlFileLoader and XmlFileLoader file loading extensible
By changing visibility to protected it becomes possible to extend the
loader and cache file contents. phpBB needs this.
2012-11-11 12:59:36 +01:00
Fabien Potencier
b337655feb merged branch vicb/stopwatch (PR #5970)
This PR was squashed before being merged into the master branch (closes #5970).

Commits
-------

d0433b6 [Stopwatch] Get the "real size" used & minor tweaks

Discussion
----------

[Stopwatch] Get the "real size" used & minor tweaks

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

by vicb at 2012-11-11T09:45:50Z

@fabpot @maoueh thanks for your feedback, integrated.
2012-11-11 11:18:42 +01:00
Victor Berchet
d0433b69aa [Stopwatch] Get the "real size" used & minor tweaks 2012-11-11 11:18:42 +01:00
Fabien Potencier
c9f2ae6155 merged branch vicb/httpkernel/changelog (PR #5979)
This PR was merged into the master branch.

Commits
-------

f9e8465 [HttpKernel] Changelog update

Discussion
----------

[HttpKernel] Changelog update
2012-11-11 11:15:48 +01:00
Victor Berchet
f9e8465d1b [HttpKernel] Changelog update 2012-11-11 11:07:37 +01:00
Fabien Potencier
f3c644061a merged branch dlsniper/classloader-composer-tune (PR #5977)
This PR was merged into the master branch.

Commits
-------

02315a0 Removed duplicate line

Discussion
----------

Removed duplicate line

This just removes a duplicate line in ```composer.json``` file.

Thanks.
2012-11-11 09:34:44 +01:00
Florin Patan
02315a0b91 Removed duplicate line 2012-11-11 01:16:13 +02:00
Florin Patan
bdf0334434 Fixed the lap method. Added upgrade notes. Some CS fixes 2012-11-10 22:20:20 +02:00
Fabien Potencier
f387b13ac8 merged branch vicb/replace (PR #5976)
This PR was merged into the master branch.

Commits
-------

e13b050 Add missing symfony/stopwatch in the replace section of composer.json

Discussion
----------

Add missing symfony/stopwatch in the replace section of composer.json

And order the sections alphabeticaly for easier navigation
2012-11-10 20:15:36 +01:00
Fabien Potencier
262049b412 merged branch vicb/fmwkrouter (PR #5971)
This PR was merged into the master branch.

Commits
-------

fc300ec [FrameworkBundle] Router class tweak

Discussion
----------

[FrameworkBundle] Router class tweak
2012-11-10 19:58:38 +01:00
Fabien Potencier
228c9e6613 merged branch vicb/memory (PR #5973)
This PR was merged into the master branch.

Commits
-------

4c0c588 [MemoryDataCollector] Stop being optimistic about memory usage

Discussion
----------

[MemoryDataCollector] Stop being optimistic about memory usage

Take into account the memory used in the kernel.terminate listeners
2012-11-10 19:56:21 +01:00
Fabien Potencier
15a5868ab4 [Validator] fixed Ukrainian language code (closes #5972) 2012-11-10 19:51:50 +01:00
Fabien Potencier
c184613dcd fixed typo 2012-11-10 19:43:32 +01:00
Fabien Potencier
061421b3b5 fixed typo 2012-11-10 19:41:36 +01:00
Fabien Potencier
d9b291b878 merged branch Tobion/patch-2 (PR #5969)
This PR was merged into the 2.1 branch.

Commits
-------

8e62248 [HttpKernel] fix typo

Discussion
----------

[HttpKernel] fix typo
2012-11-10 19:40:26 +01:00
Victor Berchet
e13b0508d6 Add missing symfony/stopwatch in the replace section of composer.json
And order the sections alphabeticaly for easier navigation
2012-11-10 18:59:49 +01:00
Victor Berchet
4c0c588a68 [MemoryDataCollector] Stop being optimistic about memory usage
Take into account the memory used in the kernel.terminate listeners
2012-11-10 17:53:14 +01:00
Victor Berchet
fc300ecda1 [FrameworkBundle] Router class tweak 2012-11-10 17:18:12 +01:00
Tobias Schultze
8e6224840e [HttpKernel] fix typo 2012-11-10 11:47:17 +01:00
Fabien Potencier
e621b6f169 fixed wrong merge 2012-11-10 09:21:13 +01:00
Fabien Potencier
2a156cf9f4 merged branch fabpot/tests-in-components (PR #5958)
This PR was merged into the master branch.

Commits
-------

b27b749 made usage of Composer autoloader for subtree-split unit tests

Discussion
----------

made usage of Composer autoloader for subtree-split unit tests

This PR also normalizes the way components are tested.

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

by stof at 2012-11-09T23:14:22Z

👍
2012-11-10 09:20:22 +01:00
Fabien Potencier
5bdf8cbaf9 merged branch fabpot/client-streamed-response (PR #5961)
This PR was merged into the 2.1 branch.

Commits
-------

84b760b [HttpKernel] fixed Client when using StreamedResponses (closes #5370)

Discussion
----------

[HttpKernel] fixed Client when using StreamedResponses (closes #5370)
2012-11-10 09:18:00 +01:00
Fabien Potencier
cf1871abd5 merged branch fabpot/profiler-listeners (PR #5963)
This PR was merged into the master branch.

Commits
-------

a288521 displayed the full event listener names to avoid name collisions (closes #5019)

Discussion
----------

displayed the full event listener names to avoid name collisions (closes #5019)

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

by stof at 2012-11-09T23:14:41Z

👍
2012-11-10 09:15:57 +01:00
Fabien Potencier
d2fdd5afbd merged branch pvanliefland/form_singularify_prices (PR #5967)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5967).

Commits
-------

79f750d [Form] Fixed singularization of "prices"

Discussion
----------

[Form] Fixed singularization of "prices"

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

This PR is similar to #4758, although in this case, the singularization of "prices" into "prex" or "prix" is obviously a mistake. I guess anyone working on a e-commerce platform with multiple prices on a product model could encounter this issue.

I adapted the tests as well ; there shouldn't be any bc break.

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

by bschussek at 2012-11-10T07:23:00Z

👍
2012-11-10 09:15:15 +01:00
pvanliefland
92849480d3 Fixed singularization of "prices" 2012-11-10 09:15:15 +01:00
Fabien Potencier
de63128cab merged branch bschussek/issue5730 (PR #5962)
This PR was merged into the 2.1 branch.

Commits
-------

0f75586 [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.

Discussion
----------

[Form] Removed an exception that prevented valid formats from being passed

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5730
Todo: -
License of the code: MIT
Documentation PR: -
2012-11-09 17:32:10 +01:00
Fabien Potencier
a288521204 displayed the full event listener names to avoid name collisions (closes #5019) 2012-11-09 17:27:53 +01:00
Bernhard Schussek
0f75586248 [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc. 2012-11-09 17:22:53 +01:00
Fabien Potencier
84b760b923 [HttpKernel] fixed Client when using StreamedResponses (closes #5370) 2012-11-09 16:49:48 +01:00
Fabien Potencier
ae61d354c9 merged branch fabpot/response-protocol (PR #5954)
This PR was merged into the 2.1 branch.

Commits
-------

e34fb41 [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)

Discussion
----------

[HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
2012-11-09 15:00:29 +01:00
Fabien Potencier
d965464d86 merged branch fabpot/pdo-session-handler (PR #5960)
This PR was merged into the 2.1 branch.

Commits
-------

67e697f fixed PDO session handler for Oracle (closes #5829)

Discussion
----------

fixed PDO session handler for Oracle (closes #5829)
2012-11-09 14:59:32 +01:00
Fabien Potencier
7ed728a894 merged branch fabpot/stopwatch-component (PR #5952)
This PR was merged into the master branch.

Commits
-------

6b54a51 moved the Stopwatch classes to their own component

Discussion
----------

moved the Stopwatch classes to their own component

see https://github.com/symfony/symfony/issues/5911

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

by stof at 2012-11-09T08:06:06Z

you should also add the ``.gitattributes`` in the new component

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

by fabpot at 2012-11-09T09:09:35Z

@stof: I've added the .gitattributes file, but also the phpunit and LICENSE ones.

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

by dlsniper at 2012-11-09T13:51:23Z

Also you should add this to the changelog/update files. I'll do it myself but only in about 8 hours or so as I'm not at home.
2012-11-09 14:58:13 +01:00
matt foster
67e697f7cb fixed PDO session handler for Oracle (closes #5829) 2012-11-09 14:46:23 +01:00
matt foster
c2a8a0b8bd [HttpFoundation] fixed PDO session handler for Oracle (closes #5829) 2012-11-09 14:44:15 +01:00
Fabien Potencier
b27b749025 made usage of Composer autoloader for subtree-split unit tests 2012-11-09 14:10:06 +01:00
Fabien Potencier
a30383d12c [Locale] removed a check that is done too early (and it is done twice anyways) 2012-11-09 13:55:40 +01:00
Bilal Amarni
84635bda7f [Form] allowed no type guesser to be registered 2012-11-09 13:51:19 +01:00
Fabien Potencier
48af594929 merged branch pborreli/patch-1 (PR #5957)
This PR was merged into the 2.0 branch.

Commits
-------

235250e Fixed case of php function

Discussion
----------

Fixed case of php function
2012-11-09 13:32:00 +01:00
Pascal Borreli
235250e192 Fixed case of php function 2012-11-09 10:41:41 +00:00
Fabien Potencier
6b54a51963 moved the Stopwatch classes to their own component 2012-11-09 10:08:25 +01:00
Fabien Potencier
dd23f6c418 merged branch gajdaw/gitattributes-windows (PR #5938)
This PR was merged into the 2.1 branch.

Commits
-------

646a714 Fix export-ignore on Windows

Discussion
----------

Fix export-ignore on Windows

Rules:

    Tests/ export-ignore

don't work on Windows. My proposition is:

    /Tests export-ignore
2012-11-09 09:52:51 +01:00
Fabien Potencier
e19b98bc79 merged branch empire/patch-vadlidator-translation (PR #5955)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5955).

Commits
-------

c2955b7 Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
2dd87ae Adding new localized strings for farsi validation.

Discussion
----------

Adding new localized strings for farsi validation.

Adding new localized strings for farsi validation.
2012-11-09 09:49:39 +01:00
Hossein Zolfi
275f0946c2 Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
Adding missed localized string.
2012-11-09 09:49:39 +01:00
Hossein Zolfi (Ocean)
8377146ded Adding new localized strings for farsi validation. 2012-11-09 09:49:39 +01:00
Fabien Potencier
e34fb4172c [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937) 2012-11-09 08:57:59 +01:00
Fabien Potencier
178a73633c merged branch bschussek/issue4359 (PR #5947)
This PR was merged into the 2.1 branch.

Commits
-------

4909bc3 [Form] Fixed forms not to be marked invalid if their children are already marked invalid

Discussion
----------

[Form] Fixed forms not to be marked invalid if their children are already marked invalid

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4359
Todo: -
License of the code: MIT
Documentation PR: -

This PR prevents unsynchronized forms from being marked invalid if any of their children is also unsynchronized (and thus also marked invalid). Displaying an invalid message twice does not help the user and, if used in conjunction with error bubbling, may lead to duplicate errors (see #4359).
2012-11-09 07:55:23 +01:00
Fabien Potencier
c290776b45 merged branch fabpot/stopwatch (PR #5944)
This PR was merged into the master branch.

Commits
-------

380cf4f [HttpKernel] added memory information in the Stopwatch

Discussion
----------

[HttpKernel] added memory information in the Stopwatch
2012-11-09 07:37:03 +01:00