Commit Graph

16122 Commits

Author SHA1 Message Date
Fabien Potencier
0ac9f85f4d fixed CS 2013-12-12 17:10:42 +01:00
Fabien Potencier
c2c3504472 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
2013-12-12 17:09:11 +01:00
Fabien Potencier
3062681110 fixed CS 2013-12-12 17:08:59 +01:00
Evan Villemez
454ce16709 allow TraceableEventDispatcher to reuse event instance in nested events 2013-12-12 11:08:12 -05:00
Fabien Potencier
de5790314d Merge branch '2.4'
* 2.4:
  [Debug] fixed tests
  ErrorHandlerTest: restore_error_handler() on assertion failure
  Fixed typo
  [validator] throw an exception if isn't an instance of ConstraintValidatorInterface.
  Reset the box model to content-box in the web debug toolbar
  [FrameworkBundle] Allowed "0" as a checkbox value in the php template.
  raising delta on stopwatch as travis really breaks with less than 35
  Switched to correct gender of "Token"
  bumped Symfony version to 2.4.1
  updated VERSION for 2.4.0
  updated CHANGELOG for 2.4.0
  fixed typos in several translations
  [HttpKernel] use static late binding when dumping out container

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-12-12 17:07:18 +01:00
Fabien Potencier
4147141e1f Merge branch '2.3' into 2.4
* 2.3:
  Fixed typo
  [validator] throw an exception if isn't an instance of ConstraintValidatorInterface.
  Reset the box model to content-box in the web debug toolbar
  [FrameworkBundle] Allowed "0" as a checkbox value in the php template.
  raising delta on stopwatch as travis really breaks with less than 35
  Switched to correct gender of "Token"
  fixed typos in several translations
  [HttpKernel] use static late binding when dumping out container
2013-12-12 17:06:47 +01:00
Fabien Potencier
5f7cec1e38 [Debug] fixed tests 2013-12-12 17:06:35 +01:00
Fabien Potencier
bb619ba020 minor #9742 ErrorHandlerTest: restore_error_handler() on assertion failure (nicolas-grekas)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #9742).

Discussion
----------

ErrorHandlerTest: restore_error_handler() on assertion failure

Before the patch, if any test fail in src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php,
phpunit's error handler is not correctly restored.
When running a test batch, this breaks other tests that rely on its behavior (@expectedException PHPUnit_Framework_Error)

Commits
-------

a6ed37c ErrorHandlerTest: restore_error_handler() on assertion failure
2013-12-12 16:53:02 +01:00
Nicolas Grekas
a259c048f4 ErrorHandlerTest: restore_error_handler() on assertion failure 2013-12-12 16:53:02 +01:00
Fabien Potencier
64cb5149f0 minor #9733 Fixed typo (eduardoconceicao)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed typo

Commits
-------

113831e Fixed typo
2013-12-10 17:45:09 +01:00
Eduardo Conceição
113831ef11 Fixed typo 2013-12-10 14:47:08 +00:00
Derek Lambert
7d85809547 Refactor common code and reduce nesting 2013-12-08 11:07:52 -06:00
Abdellatif AitBoudad
cdb5ae0ede [Validator]Fixed getting wrong msg when value is an object in UnexpectedTypeException 2013-12-07 14:24:25 +00:00
Fabien Potencier
eb7df1a2d7 bug #9718 [validator] throw an exception if isn't an instance of ConstraintValidatorInterface. (aitboudad)
This PR was squashed before being merged into the 2.3 branch (closes #9718).

Discussion
----------

[validator] throw an exception if isn't an instance of ConstraintValidatorInterface.

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

Commits
-------

fc232a5 [validator] throw an exception if isn't an instance of ConstraintValidatorInterface.
2013-12-07 09:07:05 +01:00
Ait boudad Abdellatif
fc232a5d9a [validator] throw an exception if isn't an instance of ConstraintValidatorInterface. 2013-12-07 09:07:04 +01:00
Fabien Potencier
06423a469d bug #9716 Reset the box model to content-box in the web debug toolbar (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Reset the box model to content-box in the web debug toolbar

| 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

This makes the styles compatible with CSS frameworks changing the box model to box-sizing using a universal selector (Bootstrap 3 for instance).

Commits
-------

ae95a71 Reset the box model to content-box in the web debug toolbar
2013-12-06 17:03:13 +01:00
Christophe Coevoet
ae95a718c3 Reset the box model to content-box in the web debug toolbar
This makes the styles compatible with CSS frameworks changing the box
model to box-sizing using a universal selector (Bootstrap 3 for instance).
2013-12-06 14:19:14 +01:00
Fabien Potencier
0ecd186432 bug #9711 [FrameworkBundle] Allowed "0" as a checkbox value in php templates (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Allowed "0" as a checkbox value in php templates

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

Commits
-------

955e8cf [FrameworkBundle] Allowed "0" as a checkbox value in the php template.
2013-12-06 08:09:14 +01:00
Jakub Zalas
955e8cf084 [FrameworkBundle] Allowed "0" as a checkbox value in the php template. 2013-12-05 23:38:14 +00:00
Fabien Potencier
0c71cfa14b minor #9678 [HttpKernel] use static late binding when dumping out container (tgabi333)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9678).

Discussion
----------

[HttpKernel] use static late binding when dumping out container

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

This PR gives the ability to override the stripComments method in descendants (and to disable the memory-eater container whitespace stripping)

Commits
-------

2e241cc [HttpKernel] use static late binding when dumping out container
2013-12-05 08:46:04 +01:00
Fabien Potencier
862b41b264 minor #9698 [Stopwatch] raising delta on stopwatch as travis really breaks with less than 35 (cordoval)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9698).

Discussion
----------

[Stopwatch] raising delta on stopwatch as travis really breaks with less than 35

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | well many failing so far because of travis
| License       | MIT
| Doc PR        | no way

Commits
-------

3348c6a raising delta on stopwatch as travis really breaks with less than 35
2013-12-05 08:40:22 +01:00
Luis Cordova
8d53d8f2c0 raising delta on stopwatch as travis really breaks with less than 35 2013-12-05 08:40:22 +01:00
Abdellatif AitBoudad
ca123bc7af [ExpressionLanguage] throw exception when parameters contain expressions 2013-12-04 21:23:04 +00:00
Fabien Potencier
9033d22c25 minor #9686 [Form] Switched to correct gender of "Token" (ChristianGaertner)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9686).

Discussion
----------

[Form] Switched to correct gender of "Token"

The neutral gender "das Token" is used in science to describe an array of bits or chars, where as the masculin "der Token" is commenly used for keys in communications and authentication in the network.

I guess the a CSRF-Token is more a key for authentication then a bit array.

Cheers,

Christian

| Q             | A
| ------------- | ---
| Bug fix?      | yes/kinda
| New feature?  | not really
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| Doc PR        | none

Commits
-------

c2bc9ae Switched to correct gender of "Token"
2013-12-04 16:54:00 +01:00
Christian Gärtner
a36abaf1b5 Switched to correct gender of "Token"
The neutral gender "das Token" is used in science to describe an array of bits or chars, where as the masculin "der Token" is commenly used for keys in communications and authentication in the network.

I guess the a CSRF-Token is more a key for authentication then a bit array.
2013-12-04 16:53:59 +01:00
Quentin Schuler
74e59fecde Changes the form icon in the toolbar to be pixel perfect. 2013-12-04 15:02:35 +01:00
Fabien Potencier
5e37fc86b5 Revert "encourage the running of coverage"
This reverts commit bb73852c95.
2013-12-04 07:03:18 +01:00
Luis Cordova
bb73852c95 encourage the running of coverage
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | no
| License       | MIT
| Doc PR        | no
2013-12-03 22:31:13 -05:00
Fabien Potencier
d46d725d27 minor #9684 [2.3] fix typos in several translations (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] fix typos in several translations

| Q             | A
| ------------- | ---
| Fixed tickets | --
| License       | MIT

Similar to #9681, but for 2.3, with one additional change.

Commits
-------

8209a7f fixed typos in several translations
2013-12-03 22:41:48 +01:00
Fabien Potencier
a20b9a4103 bumped Symfony version to 2.4.1 2013-12-03 18:55:46 +01:00
Fabien Potencier
2e47d2edd4 updated VERSION for 2.4.0 2013-12-03 16:23:03 +01:00
Fabien Potencier
5784762808 updated CHANGELOG for 2.4.0 2013-12-03 16:21:41 +01:00
Fabien Potencier
e5362c1e8a Merge branch '2.4'
* 2.4:
  updated Composer suggested packages
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  Fixed typo in phpdoc
  Default form.csrf_protection.enabled to csrf_protection.enabled
  Handled the scenario when no entity manager is passed with closure query builder.
  Enabled csrf_protection by default if form.csrf_protection is enabled
  [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
2013-12-03 15:52:29 +01:00
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