Commit Graph

15458 Commits

Author SHA1 Message Date
Krzysztof Przybyszewski
40e58cdc9a fixed TableHelper when cell value has new line 2013-12-15 19:44:57 +01:00
Fabien Potencier
f056ac1c22 bug #9760 [Routing] Fix router matching pattern against multiple hosts (karolsojko)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix router matching pattern against multiple hosts

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

When you had a pattern that matched on multiple host then only the first one was displayed as "almost matching". Fixed router matching against the same pattern on multiple hosts so now it shows every "almost match" on different hosts.

Commits
-------

f727b22 [Routing] Fix router matching pattern against multiple hosts
2013-12-15 18:21:48 +01:00
Fabien Potencier
cb12401dd2 minor #9765 [Validator] Improved and fixed grammar mistakes. Added pluralized messages (benatespina)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9765).

Discussion
----------

[Validator] Improved and fixed grammar mistakes. Added pluralized messages

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

Commits
-------

d38dbd5 [Validator] Improved and fixed grammar mistakes. Added pluralized messages
2013-12-15 18:13:26 +01:00
benatespina
37962a6e94 Improved and fixed grammar mistakes. Added pluralized messages 2013-12-15 18:13:25 +01:00
Fabien Potencier
eed1db0d4d minor #9783 [BrowserKit] Add missing exception message parameter (bicpi)
This PR was merged into the 2.3 branch.

Discussion
----------

[BrowserKit] Add missing exception message parameter

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

Commits
-------

a834c2f [BrowserKit] Add missing exception message parameter
2013-12-15 18:00:33 +01:00
Fabien Potencier
d521215d70 minor #9763 Update validators.cs.xlf (gondo)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9763).

Discussion
----------

Update validators.cs.xlf

fixed CZ translation.
there is not such a word as "null" in czech

Commits
-------

eac9032 Update validators.cs.xlf
2013-12-15 17:54:46 +01:00
gondo
31c5979152 Update validators.cs.xlf
fixed CZ translation.
there is not such a word as "null" in czech
2013-12-15 17:54:46 +01:00
Philipp
a834c2fd6c [BrowserKit] Add missing exception message parameter
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-12-15 13:21:03 +01:00
Fabien Potencier
1bc2d9f00e minor #9777 [Validator] updated the Spanish translation of the validator strings (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] updated the Spanish translation of the validator strings

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

Commits
-------

c9c21a5 [Validator] updated the Spanish translation of the validator strings
2013-12-14 21:35:13 +01:00
Javier Eguiluz
c9c21a51ad [Validator] updated the Spanish translation of the validator strings 2013-12-14 17:08:30 +01:00
karolsojko
f727b2254c [Routing] Fix router matching pattern against multiple hosts 2013-12-14 12:06:34 +01:00
Fabien Potencier
cbce47211e minor #9751 [Validator] Fix mistype in lithuanian validator translations (asarturas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fix mistype in lithuanian validator translations

Fix mistype which slipped through initial proof reading.

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

Commits
-------

e2ef38c Fix mistype which slipped through initial proof reading.
2013-12-13 11:57:55 +01:00
Daniel Tschinder
557dfaa2c1 Remove usage of deprecated _scheme in Routing Component
Instead correctly use the array of schemes from the Route.
Also adjusted the dumpers to dump the correct data.

I extended the tests to not only test the deprecated behavior, but also
the new schemes-requirement.
2013-12-13 00:37:21 +01:00
Arturas Smorgun
e2ef38c806 Fix mistype which slipped through initial proof reading. 2013-12-12 18:03:36 +01:00
Fabien Potencier
b7470df8fa bug #9674 [2.2][Form] rename validators.ua.xlf to validators.uk.xlf (craue)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9674).

Discussion
----------

[2.2][Form] rename validators.ua.xlf to validators.uk.xlf

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

The ISO 639-1 code for Ukrainian is "uk".

Shall I open separate PRs for newer branches as well, or can this be merged into them?

Commits
-------

fe6995d renamed validators.ua.xlf to validators.uk.xlf
2013-12-12 17:34:24 +01:00
Christian Raue
6ddb12d1c7 renamed validators.ua.xlf to validators.uk.xlf
ISO 639-1 code for Ukrainian is "uk"
2013-12-12 17:34:24 +01:00
Fabien Potencier
c4bf848c5d bug #9722 [Validator]Fixed getting wrong msg when value is an object in Exception (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator]Fixed getting wrong msg when value is an object in Exception

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

Commits
-------

cdb5ae0 [Validator]Fixed getting wrong msg when value is an object in UnexpectedTypeException
2013-12-12 17:27:40 +01:00
Fabien Potencier
d490e5a541 bug #9750 allow TraceableEventDispatcher to reuse event instance in nested events (evillemez)
This PR was merged into the 2.3 branch.

Discussion
----------

allow TraceableEventDispatcher to reuse event instance in nested events

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

Commits
-------

454ce16 allow TraceableEventDispatcher to reuse event instance in nested events
2013-12-12 17:20:49 +01:00
Fabien Potencier
cfe7d7fa98 minor #9749 [Validator] Add missing lithuanian validator translations (asarturas)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9749).

Discussion
----------

[Validator] Add missing lithuanian validator translations

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

Commits
-------

bebb55c Add missing lithuanian validator translations
2013-12-12 17:17:03 +01:00
Arturas Smorgun
923640ac4a Add missing lithuanian validator translations 2013-12-12 17:17:03 +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
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
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
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
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
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
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
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
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