Commit Graph

16189 Commits

Author SHA1 Message Date
Fabien Potencier
d618762956 Merge branch '2.3' into 2.4
* 2.3:
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  Fixed typo in phpdoc
  Handled the scenario when no entity manager is passed with closure query builder.
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
2013-12-03 15:52:22 +01:00
Fabien Potencier
40c097276d Merge branch '2.2' into 2.3
* 2.2:
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
2013-12-03 15:51:26 +01:00
Christian Raue
8209a7f95b fixed typos in several translations 2013-12-03 11:59:03 +01:00
Fabien Potencier
8221ce0a8b minor #9683 [MonologBridge] updated Composer suggested packages (aitboudad)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #9683).

Discussion
----------

[MonologBridge] updated Composer suggested packages

Commits
-------

1faf588 [MonologBridge] updated Composer suggested packages
2013-12-03 11:22:46 +01:00
Abdellatif AitBoudad
50c7dd576d updated Composer suggested packages 2013-12-03 11:22:45 +01:00
Tóth Gábor
2e241cc606 [HttpKernel] use static late binding when dumping out container 2013-12-02 15:32:33 +01:00
Fabien Potencier
6a9c223b06 updated VERSION for 2.2.11 2013-12-02 08:14:10 +01:00
Fabien Potencier
b84b1a6e92 update CONTRIBUTORS for 2.2.11 2013-12-02 08:14:02 +01:00
Fabien Potencier
9ff365d734 updated CHANGELOG for 2.2.11 2013-12-02 08:04:36 +01:00
Fabien Potencier
a9b8dfec4c minor #9675 Fixed typo in phpdoc (staabm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9675).

Discussion
----------

Fixed typo in phpdoc

Commits
-------

350d5ea Fixed typo in phpdoc
2013-12-02 07:43:49 +01:00
Markus Staab
fe735ed4be Fixed typo in phpdoc 2013-12-02 07:43:49 +01:00
Fabien Potencier
efcca3e2e1 bug #9673 Fixed BC break in csrf protection (WouterJ)
This PR was merged into the 2.4 branch.

Discussion
----------

Fixed BC break in csrf protection

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9429
| License       | MIT
| Doc PR        | n/a

Commits
-------

d00954a Default form.csrf_protection.enabled to csrf_protection.enabled
2013-12-01 14:57:34 +01:00
Wouter J
d00954a14e Default form.csrf_protection.enabled to csrf_protection.enabled 2013-12-01 13:27:05 +01:00
Fabien Potencier
62d9cc8031 bug #9665 [Bridge/Doctrine] ORMQueryBuilderLoader - handled the scenario when no entity manager is passed with closure query builder (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bridge/Doctrine] ORMQueryBuilderLoader - handled the scenario when no entity manager is passed with closure query builder

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

a534b55 Handled the scenario when no entity manager is passed with closure query builder.
2013-11-30 19:14:55 +01:00
Jakub Zalas
a534b55fcb Handled the scenario when no entity manager is passed with closure query builder. 2013-11-30 19:02:13 +01:00
Fabien Potencier
c922d672ad minor #9664 [HttpKernel] minor optimalization at bundle initialization (fabpot)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] minor optimalization at bundle initialization

fast check to avoid six array method calls

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [|no]
| Tests pass?   | [yes]
| Fixed tickets | #9657
| License       | MIT
| Doc PR        |

That's a rebased version of #9657 on 2.2 + another optimization suggested by @GromNaN

Commits
-------

3330c40 [HttpKernel] made a small optimization to Bundle initialization
4ba6c0b minor optimalization at bundle initialization
2013-11-30 18:33:48 +01:00
Fabien Potencier
d4f2ffb27a bug #9662 [FrameworkBundle] Enabled csrf_protection by default if form.csrf_protection is enabled (bschussek)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #9662).

Discussion
----------

[FrameworkBundle] Enabled csrf_protection by default if form.csrf_protection is enabled

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9429
| License       | MIT
| Doc PR        | -

This PR enables the CSRF protection services automatically if CSRF protection for forms is enabled. In this case, the CSRF protection services cannot be disabled anymore manually (the same as with the validation services).

Commits
-------

b5e5c71 [FrameworkBundle] Enabled csrf_protection by default if form.csrf_protection is enabled
2013-11-30 17:55:47 +01:00
Bernhard Schussek
5bf759a54e Enabled csrf_protection by default if form.csrf_protection is enabled 2013-11-30 17:55:47 +01:00
Fabien Potencier
3330c40621 [HttpKernel] made a small optimization to Bundle initialization 2013-11-30 13:45:29 +01:00
Gábor Tóth
4ba6c0b90e minor optimalization at bundle initialization
fast check to avoid six array method calls
2013-11-30 13:44:15 +01:00
Fabien Potencier
b82ab2ab13 minor #9661 Removed observer pattern, in favour of mediator (fabpot)
This PR was merged into the 2.2 branch.

Discussion
----------

Removed observer pattern, in favour of mediator

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | *
| Fixed tickets | #9344

I don't think this is the best tool to implement the observer pattern.

I just have copied the sentence from:
https://github.com/symfony/symfony-docs/edit/2.3/components/event_dispatcher/introduction.rst

but maybe could be improved with something like:

"Symfony Event Dispatcher is a tool that allows to make your projects truly extensible, facilitating the implementation of Mediator pattern and Publish subscribe pattern"

[edit-1]
I think this could be modified also here:
https://github.com/symfony/symfony-marketing/edit/master/views/en/get_started/components.html.twig

Commits
-------

ab3e231 [EventDispatcher] tweaked README
b9ad62e removed observer pattern, in favour of mediator
2013-11-30 10:39:57 +01:00
Fabien Potencier
ab3e231b93 [EventDispatcher] tweaked README 2013-11-30 10:35:04 +01:00
Giulio De Donato
b9ad62e15c removed observer pattern, in favour of mediator 2013-11-30 10:34:17 +01:00
Fabien Potencier
05b17555d4 bug #9656 [DoctrineBridge] normalized class names in the ORM type guesser (fabpot)
This PR was merged into the 2.2 branch.

Discussion
----------

[DoctrineBridge] normalized class names in the ORM type guesser

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5837
| License       | MIT
| Doc PR        | n/a

Commits
-------

a1b9c2e [DoctrineBridge] normalized class names in the ORM type guesser
2013-11-29 15:23:51 +01:00
Fabien Potencier
a1b9c2ed60 [DoctrineBridge] normalized class names in the ORM type guesser 2013-11-29 15:03:45 +01:00
Fabien Potencier
261a459876 bug #9647 use the correct class name to retrieve mapped class' metadata and reposi... (xabbuh)
This PR was merged into the 2.2 branch.

Discussion
----------

use the correct class name to retrieve mapped class' metadata and reposi...

...tory

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9646
| License       | MIT
| Doc PR        |

The validation context isn't necessarily the entity being validated. In case that you added the Unique Entity constraint inside your custom type via the ``constraints`` option the validation context will be the ``Form`` class itself. Thus, not the validation context should be used to get the class metadata and the repository of the validated entity, but the entity itself should be used.

Commits
-------

cd4df11 use the correct class name to retrieve mapped class' metadata and repository
2013-11-29 14:14:31 +01:00
Fabien Potencier
3b703291d9 minor #9651 Fix extract method to avoid recalculating count() for each iteration. (fabpot)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9651).

Discussion
----------

Fix `extract` method to avoid recalculating count() for each iteration.

This PR was submitted on the symfony/DomCrawler read-only repository and moved automatically to the main Symfony repository (closes symfony/DomCrawler#16).

Cache the value of `count($attributes)` to avoid recalculating it for each iteration of the loop.

Since this count will never change during the method execution, this change make the code a bit more efficient.

Commits
-------

9ababf4 Fix `extract` method to avoid recalculating count() for each iteration.
2013-11-29 06:58:12 +01:00
Youpie
3447f896a7 Fix extract method to avoid recalculating count() for each iteration.
Cache the value of `count($attributes)` to avoid recalculating it for each iteration of the loop.

Since this count will never change during the method execution, this change make the code a bit more efficient.
2013-11-29 06:58:12 +01:00
Fabien Potencier
843b221f44 bug #9648 [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler

This is a follow-up for #9641 where I try to restore the previous code behavior as much as possible.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

d7a4cfb [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler
2013-11-28 19:00:39 +01:00
Fabien Potencier
d7a4cfb0e4 [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler 2013-11-28 17:41:31 +01:00
Christian Flothmann
cd4df11b06 use the correct class name to retrieve mapped class' metadata and repository 2013-11-28 17:08:45 +01:00
Fabien Potencier
a95503abc8 bug #9643 [WebProfilerBundle] Fixed js escaping in time.html.twig (hason)
This PR was merged into the 2.2 branch.

Discussion
----------

[WebProfilerBundle] Fixed js escaping in time.html.twig

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

For some event names I received the JavaScript error: ```Uncaught SyntaxError: Unexpected token ILLEGAL```

Commits
-------

4828350 [WebProfilerBundle] Fixed js escaping in time.html.twig
2013-11-28 16:59:49 +01:00
Martin Hasoň
4828350370 [WebProfilerBundle] Fixed js escaping in time.html.twig 2013-11-28 13:42:54 +01:00
Fabien Potencier
db4f551527 Merge branch '2.4'
* 2.4:
  [Debug] fixed unit tests
  Avoid notice from being *eaten* by fatal error.
  Teardown used wrong property
  Modified guessDefaultEscapingStrategy to not escape txt templates
  Fix DateType for 32bits computers.
  Fixed the registration of validation.xml file when the form is disabled
  fixed lexing expression ending with spaces
  Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase
  [Validator] Replaced inexistent interface.
  [HttpKernel] Fix profiler event-listener usage outside request stack context
  When getting the session's id, check if the session is not closed
  Fix undefined offset when formatting namespace suggestions
  Adjusting CacheClear Warmup method to namespaced kernels
2013-11-28 11:27:35 +01:00
Fabien Potencier
1a33e1b18b Merge branch '2.3' into 2.4
* 2.3:
  [Debug] fixed unit tests
  Avoid notice from being *eaten* by fatal error.
  Teardown used wrong property
  Modified guessDefaultEscapingStrategy to not escape txt templates
  Fix DateType for 32bits computers.
  Fixed the registration of validation.xml file when the form is disabled
  Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase
  [Validator] Replaced inexistent interface.
  When getting the session's id, check if the session is not closed
  Adjusting CacheClear Warmup method to namespaced kernels

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
2013-11-28 11:27:26 +01:00
Fabien Potencier
ad9008e452 Merge branch '2.2' into 2.3
* 2.2:
  Teardown used wrong property
  Modified guessDefaultEscapingStrategy to not escape txt templates
  Fix DateType for 32bits computers.
  Fixed the registration of validation.xml file when the form is disabled
  When getting the session's id, check if the session is not closed
2013-11-28 11:26:47 +01:00
Fabien Potencier
2f89250c22 bug #9641 [Debug] Avoid notice from being "eaten" by fatal error. (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] Avoid notice from being "eaten" by fatal error.

Workaround for https://bugs.php.net/bug.php?id=54275. Follow-up to PR #9428 and #9449.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8703
| License       | MIT
| Doc PR        | n/a

Commits
-------

872d584 [Debug] fixed unit tests
2d6c2aa Avoid notice from being *eaten* by fatal error.
2013-11-28 11:26:18 +01:00
Fabien Potencier
872d584c94 [Debug] fixed unit tests 2013-11-28 11:16:43 +01:00
Christian Schmidt
2d6c2aac3a Avoid notice from being *eaten* by fatal error. 2013-11-28 11:16:19 +01:00
Fabien Potencier
9ec6a9c3dc minor #9640 Fixed wrong property in test teardown (fabpot)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9640).

Discussion
----------

Fixed wrong property in test teardown

This PR was submitted on the symfony/EventDispatcher read-only repository and moved automatically to the main Symfony repository (closes symfony/EventDispatcher#2).

Commits
-------

5330603 Teardown used wrong property
2013-11-28 08:36:42 +01:00
Jan Behrens
e1d0d5c1f7 Teardown used wrong property 2013-11-28 08:36:42 +01:00
Fabien Potencier
c3b4b68f51 bug #9639 Modified guessDefaultEscapingStrategy to not escape txt templates (fabpot)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9639).

Discussion
----------

Modified guessDefaultEscapingStrategy to not escape txt templates

This PR was submitted on the symfony/TwigBundle read-only repository and moved automatically to the main Symfony repository (closes symfony/TwigBundle#2).

Useful for plaintext emails.

Commits
-------

6affe94 Modified guessDefaultEscapingStrategy to not escape txt templates
2013-11-28 08:35:42 +01:00
Marek Štípek
9f35368847 Modified guessDefaultEscapingStrategy to not escape txt templates
Useful for plaintext emails.
2013-11-28 08:35:42 +01:00
Fabien Potencier
9b99f094a5 bug #9314 [Form] Fix DateType for 32bits computers. (WedgeSama)
This PR was squashed before being merged into the 2.2 branch (closes #9314).

Discussion
----------

[Form] Fix DateType for 32bits computers.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5227,#5554
| License       | MIT
| Doc PR        | -

Fix an issue due to 32bits machines, date can be only between 1902-2037.
Simply not add date if false. Can be good to add this to 2.3 and master too.

Commits
-------

b80fb43 [Form] Fix DateType for 32bits computers.
2013-11-28 08:06:13 +01:00
WedgeSama
2f9bb75174 Fix DateType for 32bits computers. 2013-11-28 08:06:13 +01:00
Fabien Potencier
3aa4e14d07 bug #9443 [FrameworkBundle] Fixed the registration of validation.xml file when the form is disabled (hason)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #9443).

Discussion
----------

[FrameworkBundle] Fixed the registration of validation.xml file when the form is disabled

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

cfa5aa5 [FrameworkBundle] Fixed the registration of validation.xml file when the form is disabled
2013-11-28 08:03:21 +01:00
Martin Hasoň
d0c1db82fa Fixed the registration of validation.xml file when the form is disabled 2013-11-28 08:03:21 +01:00
Fabien Potencier
be0a3102cc bug #9625 [HttpFoundation] Do not return an empty session id if the session was closed (Taluu)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Do not return an empty session id if the session was closed

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7936
| License       | MIT
| Doc PR        | ~

A regression from the bug fix #9246 was introduced due to an incomplete fix ;

As the `started` flag on the NativeSessionStorage was not `true` anymore when saving the session, the session id was always empty when saving it, and thus when sending the `PHPSESSID` cookie.

The previous PR I made (#9530) was another approach to solve this regression, but this one should keep the fix made by @tecbot on #9246, and finish it with another verification. I may miss another place where `started` is used, but I don't really see which other conditions depending on this property should be altered...

**Note : this is #9611 rebased on 2.2**

This should be mergeable.

Commits
-------

5b9a727 When getting the session's id, check if the session is not closed
2013-11-28 07:56:59 +01:00
Fabien Potencier
2d31a0a3e6 bug #9621 [ExpressionLanguage] fixed lexing expression ending with spaces (fabpot)
This PR was submitted for the master branch but it was merged into the 2.4 branch instead (closes #9621).

Discussion
----------

[ExpressionLanguage] fixed lexing expression ending with spaces

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9606, #9615
| License       | MIT
| Doc PR        |

Alternative fix for #9615

Commits
-------

d8f61c4 [ExpressionLanguage] fixed lexing expression ending with spaces
2013-11-28 07:52:02 +01:00
Fabien Potencier
4c0b44ee44 fixed lexing expression ending with spaces 2013-11-28 07:52:02 +01:00