Commit Graph

16254 Commits

Author SHA1 Message Date
Fabien Potencier
dc79423d04 [Console] fixed CS 2013-12-15 19:46:51 +01:00
Fabien Potencier
2314a6b196 bug #9758 [Console] fixed TableHelper when cell value has new line (k-przybyszewski)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9758).

Discussion
----------

[Console] fixed TableHelper when cell value has new line

#9757

Commits
-------

2e14ba6 [Console] fixed TableHelper when cell value has new line
2013-12-15 19:44:57 +01:00
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
7b9f39e215 bug #9768 [FrameworkBundle] Fixed bug in XMLDescriptor (Exelenz)
This PR was squashed before being merged into the 2.4 branch (closes #9768).

Discussion
----------

[FrameworkBundle] Fixed bug in XMLDescriptor

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

Fixed bug in container:debug command where parameter value doesn't get printed.

Commits
-------

34d0b1d [FrameworkBundle] Fixed bug in XMLDescriptor
2013-12-15 18:04:04 +01:00
Alexander Volochnev
34d0b1dab3 [FrameworkBundle] Fixed bug in XMLDescriptor 2013-12-15 18:04:04 +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
066618027e minor #9778 [Security] Add ExpressionLanguage to require-dev. (realityking)
This PR was merged into the 2.4 branch.

Discussion
----------

[Security] Add ExpressionLanguage to require-dev.

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

Running the tests for Security-Core fails because ExpressionLanguage is missing.

Commits
-------

7f18d19 [Security] Add ExpressionLanguage to require-dev.
2013-12-15 08:03:44 +01:00
Rouven Weßling
7f18d19df2 [Security] Add ExpressionLanguage to require-dev. 2013-12-15 00:12:17 +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
Fabien Potencier
aff0594b75 minor #9756 [Config] Removed duplicated condition (gnugat)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #9756).

Discussion
----------

[Config] Removed duplicated condition

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

Removed unnecessary condition (looks like it's been copy/pasted from
line 84).

Commits
-------

5c9dd30 [Config] Removed duplicated condition
2013-12-14 13:09:50 +01:00
Loïc Chardonnet
e1fe3272d2 Removed duplicated condition
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Removed unnecessary condition (looks like it's been copy/pasted from
line 84).
2013-12-14 13:09:49 +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
b3afa8dda2 bug #9700 [ExpressionLanguage] throw exception when parameters contain expressions (aitboudad)
This PR was merged into the 2.4 branch.

Discussion
----------

[ExpressionLanguage] throw exception when parameters contain expressions

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9658
| License       | MIT
| Doc PR        | symfony/symfony-docs#3232

Commits
-------

ca123bc [ExpressionLanguage] throw exception when parameters contain expressions
2013-12-12 17:41:50 +01:00
Fabien Potencier
830c71270b minor #9696 [Security] added test for ExpressionVoter.php (liuggio)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #9696).

Discussion
----------

[Security] added test for ExpressionVoter.php

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

Added the missing test for `ExpressioneVoter`,
Fixed small docblock.

Commits
-------

e9de00f added ExpressionVoterTest
2013-12-12 17:37:42 +01:00
Giulio De Donato
b7567d17d9 added ExpressionVoterTest 2013-12-12 17:37:42 +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
6764f91ce9 Merge branch '2.4'
* 2.4:
  fixed CS
  fixed CS
2013-12-12 17:10:54 +01:00
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