Commit Graph

19632 Commits

Author SHA1 Message Date
Fabien Potencier
38f03bd2f5 Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] Fix title and placeholder rendering in php form templates.
  RequestDataCollector - small fix
  renamed composer.phar to composer to be consistent with the Symfony docs
  [FrameworkBundle] bumped min version of Routing to 2.3
  removed composer --dev option everywhere
  fixed a test
  [Console] Fixed output bug, if escaped string in a formatted string.
  [Security] Remove ContextListener's onKernelResponse listener as it is used
  Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
  Revert "fixed assertion"
  fixed assertion
  [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
  fixed URL
  Add reference to documentation in FormEvents phpdocs
  [YAML] Fix one-liners to work with multiple new lines
  Keep "pre" meaning for var_dump quick-and-dirty debug
  [Console][Table] Fix cell padding with multi-byte

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Helper/TableHelper.php
2015-02-11 08:12:14 +01:00
Fabien Potencier
917067e940 bug #13647 [FrameworkBundle] Fix title and placeholder rendering in php form templates (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix title and placeholder rendering in php form templates

Small fix for rendering placeholder on widgets in php templates.

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

This is a test case for #13290, including a fix applied on 2.3, since that's the earliest supported branch the bug exist.

In 2.6 the template is a bit different, and unfortunately I couldn't re-use #13290's fix.

When this is merged into 2.3, and then to 2.6 I think we can also merge #13290.

Commits
-------

f82193d [FrameworkBundle] Fix title and placeholder rendering in php form templates.
2015-02-11 08:05:50 +01:00
Jakub Zalas
f82193db99 [FrameworkBundle] Fix title and placeholder rendering in php form templates. 2015-02-10 17:14:04 +00:00
Fabien Potencier
d0c1c534b2 minor #13638 [TwigBridge] Removed duplicated code from TwigRenderer (hason)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13638).

Discussion
----------

[TwigBridge] Removed duplicated code from TwigRenderer

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

See https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Form/FormRenderer.php#L65-L69

Commits
-------

1a9aca7 [TwigBridge] Removed duplicated code from TwigRenderer
2015-02-10 17:22:44 +01:00
Martin Hasoň
1a9aca7152 [TwigBridge] Removed duplicated code from TwigRenderer 2015-02-10 17:22:35 +01:00
Fabien Potencier
8b12bf967a bug #13608 Fix form icon position in web profiler (sadikoff)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix form icon position in web profiler

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

Form icon in web profiler toolbar moved to the left edge
![pe64g11](https://cloud.githubusercontent.com/assets/213810/6077805/4523c5ba-adfb-11e4-9e8c-61c4940cd7c1.png)

This fix changes icon position to its default value.

Commits
-------

b128439 Fix form icon position in web profiler
2015-02-10 17:18:48 +01:00
Fabien Potencier
85c7195ad7 bug #13642 [Translator][Logging] implement TranslatorBagInterface. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translator][Logging] implement TranslatorBagInterface.

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

Commits
-------

dcb2306 [Translator][Logging] implement TranslatorBagInterface.
2015-02-10 15:54:53 +01:00
Abdellatif Ait boudad
dcb2306d03 [Translator][Logging] implement TranslatorBagInterface. 2015-02-10 13:48:21 +00:00
Fabien Potencier
9a70bbbdb2 minor #13624 removed composer --dev option everywhere (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

removed composer --dev option everywhere

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

Commits
-------

0fe4913 renamed composer.phar to composer to be consistent with the Symfony docs
af59316 removed composer --dev option everywhere
2015-02-10 09:04:11 +01:00
Fabien Potencier
ce95fa8fb3 minor #13629 RequestDataCollector - small fix (ovr)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13629).

Discussion
----------

RequestDataCollector - small fix

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

Commits
-------

7ed48db RequestDataCollector - small fix
2015-02-09 20:53:11 +01:00
Дмитрий Пацура
7ed48db94c RequestDataCollector - small fix 2015-02-09 20:53:11 +01:00
Fabien Potencier
0fe4913079 renamed composer.phar to composer to be consistent with the Symfony docs 2015-02-08 08:41:14 +01:00
Fabien Potencier
bfa181bd65 [FrameworkBundle] bumped min version of Routing to 2.3 2015-02-08 08:36:25 +01:00
Fabien Potencier
af59316536 removed composer --dev option everywhere 2015-02-08 08:33:54 +01:00
Fabien Potencier
004e5abbd6 fixed a test 2015-02-08 08:28:06 +01:00
Fabien Potencier
a43a58ccff bug #13607 [Console] Fixed output bug, if escaped string in a formatted string. (tronsha)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13607).

Discussion
----------

[Console] Fixed output bug, if escaped string in a formatted string.

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

If there is a escaped tag in a formatted string, the output wasn't correct.

I have add a test for this problem and integrated a solution for this.

Commits
-------

1c62eb7 [Console] Fixed output bug, if escaped string in a formatted string.
2015-02-08 08:25:55 +01:00
Stefan Hüsges
1c62eb77e0 [Console] Fixed output bug, if escaped string in a formatted string. 2015-02-08 08:25:54 +01:00
Fabien Potencier
8b10043dad bug #13611 [Console] “console help” ignores --raw option (c960657)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13611).

Discussion
----------

[Console] “console help” ignores --raw option

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

The option for DescriptorHelper::describe() is `raw_text`, not `raw`.

Commits
-------

eabc5d8 “console help” ignores --raw option
2015-02-08 08:19:48 +01:00
Christian Schmidt
eabc5d8e92 “console help” ignores --raw option 2015-02-08 08:19:48 +01:00
Vladimir Sadicov
b12843971c Fix form icon position in web profiler 2015-02-06 12:24:56 +02:00
Fabien Potencier
d9c0c55ace bug #13466 [Security] Remove ContextListener's onKernelResponse listener as it is used (davedevelopment)
This PR was squashed before being merged into the 2.3 branch (closes #13466).

Discussion
----------

[Security] Remove ContextListener's onKernelResponse listener as it is used

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

The context listeners are specific to a particular firewall, and as such, should not be applied if the current request doesn't match that context listener. To avoid this, the context listener can remove itself from the dispatcher as it is called.

This comes in to affect when two or more firewalls are setup and using the same kernel for multiple requests.  Assuming there are two firewalls 'site' and 'admin'

- Request comes in matching 'site' firewall, 'site' ContextListener adds it's onKernelResponse method to the dispatcher
- Succesful auth for 'site'
- ContextListener writes token to session
- Request comes in matching 'admin' firewall, 'admin' ContextListener can't find anything in the session, so nulls the token in the security context
- 'site' ContextListener listens for response, can't find a token in the security context so removes the 'site' token from the session

Commits
-------

380d805 [Security] Remove ContextListener's onKernelResponse listener as it is used
2015-02-05 11:02:25 +01:00
Dave Marshall
380d8052ac [Security] Remove ContextListener's onKernelResponse listener as it is used 2015-02-05 11:01:10 +01:00
Fabien Potencier
58fcb8d515 Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
This reverts commit 09225c7466, reversing
changes made to a0298331ad.
2015-02-05 10:45:43 +01:00
Fabien Potencier
6e9768c8b9 Revert "fixed assertion"
This reverts commit b0a4c38465.
2015-02-05 10:45:38 +01:00
Fabien Potencier
b0a4c38465 fixed assertion 2015-02-05 10:43:13 +01:00
Fabien Potencier
09225c7466 minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12652).

Discussion
----------

[HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value

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

Implementing test for issue #9942 to confirm that the bug is already fixed. It's possibile to close the issue.

Thanks also to @baiolo, @andyroid1978 for contributions at HackDay of the SymfonyConf

Commits
-------

0b9f310 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
2015-02-05 10:42:23 +01:00
Mauro Foti
0b9f310055 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value 2015-02-05 10:42:22 +01:00
Fabien Potencier
a0298331ad fixed URL 2015-02-05 10:28:56 +01:00
Fabien Potencier
c5b50f28f5 minor #12626 Add reference to documentation in FormEvents phpdocs (ifdattic)
This PR was squashed before being merged into the 2.3 branch (closes #12626).

Discussion
----------

Add reference to documentation in FormEvents phpdocs

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

Commits
-------

2b33ba6 Add reference to documentation in FormEvents phpdocs
2015-02-05 10:26:57 +01:00
Andrew M
2b33ba618c Add reference to documentation in FormEvents phpdocs 2015-02-05 10:26:27 +01:00
Fabien Potencier
e73c5546a9 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fixed tests
2015-02-05 09:35:03 +01:00
Fabien Potencier
7126c8d5d2 [FrameworkBundle] fixed tests 2015-02-05 09:31:48 +01:00
Fabien Potencier
bc75c36e03 bug #12864 [Console][Table] Fix cell padding with multi-byte (ttsuruoka)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console][Table] Fix cell padding with multi-byte

| 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

When the `TableHelper` dealing with East Asian text, it renders wrong widths. This fixes that problem.

Commits
-------

11014c2 [Console][Table] Fix cell padding with multi-byte
2015-02-05 09:10:27 +01:00
Fabien Potencier
25294ce09b bug #13201 [FrameworkBundle][config cmd] initialize extension. (aitboudad)
This PR was submitted for the 2.5 branch but it was merged into the 2.6 branch instead (closes #13201).

Discussion
----------

[FrameworkBundle][config cmd] initialize extension.

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

Commits
-------

d6ec874 [FrameworkBundle][config cmd] initialize extension.
2015-02-05 08:26:17 +01:00
Abdellatif Ait boudad
d6ec874441 [FrameworkBundle][config cmd] initialize extension. 2015-02-05 08:26:16 +01:00
Fabien Potencier
33bf087a9b bug #13375 [YAML] Fix one-liners to work with multiple new lines (Alex Pott)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13375).

Discussion
----------

[YAML] Fix one-liners to work with multiple new lines

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

Commits
-------

4d22bf7 [YAML] Fix one-liners to work with multiple new lines
2015-02-05 08:14:20 +01:00
Alex Pott
4d22bf7f72 [YAML] Fix one-liners to work with multiple new lines 2015-02-05 08:14:20 +01:00
Fabien Potencier
b97e5437c7 minor #13495 [FrameworkBundle] Keep "pre" meaning for var_dump quick-and-dirty debug (giosh94mhz)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Keep "pre" meaning for var_dump quick-and-dirty debug

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

This is a minor fix to have a quick-and-dirty var_dump nicely work with the exception output from Symfony.
In short, the default "pre" whitespace CSS rules should be kept outside of block "#content", so that var_dump output is not diplayed in a single huge line.

Commits
-------

b6d4390 Keep "pre" meaning for var_dump quick-and-dirty debug
2015-02-05 08:04:52 +01:00
Fabien Potencier
2f6d5e4a8d Merge branch '2.5' into 2.6
* 2.5:
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  bumped Symfony version to 2.5.11
  updated VERSION for 2.5.10
  updated CHANGELOG for 2.5.10
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  [Routing] make host matching case-insensitive according to RFC 3986

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
2015-02-05 07:36:51 +01:00
Fabien Potencier
f7a1adbce7 Merge branch '2.3' into 2.5
* 2.3:
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  [Routing] make host matching case-insensitive according to RFC 3986

Conflicts:
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
2015-02-05 07:31:40 +01:00
Fabien Potencier
1aa37689af bug #13545 fixxed order of usage (OskarStark)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13545).

Discussion
----------

fixxed order of usage

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

```[options] command [arguments]```

to

```command [options] [arguments]```

(i made some issues in this branch before #13538 )

Commits
-------

d44ff2a fixxed order of usage
2015-02-05 07:29:55 +01:00
Oskar Stark
d44ff2a135 fixxed order of usage 2015-02-05 07:29:49 +01:00
Fabien Potencier
118602a961 minor #13553 [2.7] [Form] Replaced calls to array_search() by in_array() (phansys)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13553).

Discussion
----------

[2.7] [Form] Replaced calls to array_search() by in_array()

[2.7] [Form] Replaced calls to ```array_search()``` by ```in_array()``` where is no need to get the index.

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

It's a semantic improvement mostly, for readability (no performance impact).

Commits
-------

c2aeeeb [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
2015-02-05 07:23:01 +01:00
Javier Spagnoletti
c2aeeeb042 [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none
| License       | MIT
| Doc PR        | none
2015-02-05 07:23:00 +01:00
Fabien Potencier
82c4edaeb6 bug #13577 [HttpKernel] Added use of instantiateController method provided in (#12022) (stavichenko)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] Added use of instantiateController method provided in (#12022)

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

Commits
-------

aa6538a [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver
2015-02-05 07:19:58 +01:00
Fabien Potencier
2e7434102a bug #13567 [Routing] make host matching case-insensitive (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] make host matching case-insensitive

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

Ignore case in host which means:
- When generating URLs we leave the case in the host as specified.
- When matching we always return lower-cased versions of parameters (because of https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Routing/RequestContext.php#L190 ) in the host. This is also what browers do. They lowercase the host before sending the request, i.e. WWW.eXample.org is sent as www.example.org. But when using curl for example it sends the host as-is. So the HttpFoundation Request class can actually have a non-lowercased host because it doesn't have this normalization.

Commits
-------

952388c [Routing] make host matching case-insensitive according to RFC 3986
2015-02-05 07:17:31 +01:00
Fabien Potencier
051402e888 minor #13446 [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again (ymc-dabe)
This PR was squashed before being merged into the 2.3 branch (closes #13446).

Discussion
----------

[Process] Make test AbstractProcessTest::testStartAfterATimeout useful again

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

The test AbstractProcessTest::testStartAfterATimeout() is pretty useless, due to two reasons:

1. Any exception is caught
This means even the exception thrown with
<code>$this->fail('A RuntimeException should have been raised.');</code>
is caught, making the test pretty useless.

2. Invalid PHP code gets executed
The command that is executed in the tests actually is:
<code># php -r "$n = 1000; while ($n--) {echo ''; usleep(1000); }"</code>
.
This does not wait ~1s, but produces the following error:
<code>PHP Parse error:  syntax error, unexpected '=' in Command line code on line 1</code>

Commits
-------

1be266f [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
2015-02-04 15:30:31 +01:00
Daniel Beyer
1be266fea0 [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again 2015-02-04 15:30:30 +01:00
Fabien Potencier
6f128039a8 removed non-sense example 2015-02-04 15:27:24 +01:00
Fabien Potencier
bbabfc7078 minor #13574 Fixes a very small typo in the SecurityContext. (adri)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13574).

Discussion
----------

Fixes a very small typo in the SecurityContext.

| Q             | A
| ------------- | ---
| Fixes small typo |
| License       | MIT

Commits
-------

7dbf615 Fixes small typo.
2015-02-04 15:20:08 +01:00