Commit Graph

16174 Commits

Author SHA1 Message Date
Fabien Potencier
c05395cb6c minor #13572 [Validator] Add a Russian translation for invalid charset message (vadim2404)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Add a Russian translation for invalid charset message

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

Commits
-------

503f061 [Validator] Add a Russian translation for invalid charset message
2015-02-04 15:17:38 +01:00
Fabien Potencier
724209cc8f minor #13576 [Serializer] minor: update changelog (dunglas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Serializer] minor: update changelog

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

Commits
-------

021a253 [Serializer] update changelog
2015-02-04 15:16:11 +01:00
Fabien Potencier
8a9a3ef7a9 minor #13579 [Validator] fix DOS-style line endings (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] fix DOS-style line endings

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

Commits
-------

603fec5 [Validator] fix DOS-style line endings
2015-02-04 15:10:59 +01:00
Kévin Dunglas
a4a581c20d [Validator] Remove unnecessary include in tests 2015-02-04 13:44:35 +01:00
Kévin Dunglas
1aba7b4f3d [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex 2015-02-04 08:33:10 +01:00
Fabien Potencier
87c0659b14 fixed typo 2015-02-04 08:25:10 +01:00
Nicolas Grekas
603fec52f9 [Validator] fix DOS-style line endings 2015-02-03 20:11:13 +01:00
David Prévot
6141f3a625 Drop useless execution bit 2015-02-03 14:46:06 -04:00
Fabien Potencier
e58a68ca73 bumped Symfony version to 2.6.5 2015-02-03 11:03:51 +01:00
Kévin Dunglas
021a253d1d [Serializer] update changelog 2015-02-03 08:04:31 +01:00
Fabien Potencier
23b647f1e4 updated VERSION for 2.6.4 2015-02-02 19:02:30 +01:00
Fabien Potencier
5af363dc5e bug #13489 [VarDumper] CSS fix (Arrilot)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] CSS fix

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

Small css issue:
When you use `dump()` after some html has been already echoed (this can be common in non-Symfony app) and you have elements with e.g. `position: absolute` you can end up watching logos and menus instead of vardumper's output:
![css-issue](https://cloud.githubusercontent.com/assets/2826480/5841607/438bf874-a1af-11e4-9905-542a59d358f8.png)

`position: relative` and `z-index` help a lot and i don't see any disadvantages in having these styles by default

Commits
-------

538195c [Var-Dumper] css-fix
2015-02-02 17:32:08 +01:00
Fabien Potencier
45e42a8d21 bumped Symfony version to 2.5.11 2015-02-02 15:03:24 +01:00
sergey
aa6538a8a9 [HttpKernel] Added use of provided by #12022 method to instantiate controller class in bundle's controller resolver 2015-02-02 15:24:27 +02:00
Fabien Potencier
6ffe6437a9 updated VERSION for 2.5.10 2015-02-02 10:26:53 +01:00
Vadim Kharitonov
503f061f75 [Validator] Add a Russian translation for invalid charset message 2015-02-02 12:24:57 +03:00
Javier Spagnoletti
40ace962de [2.3] [Validator] spanish translation for invalid charset message 2015-02-02 10:24:02 +01:00
Nicolas Grekas
4205559cdc [VarDumper] fix handling of non-UTF8 strings 2015-02-01 17:12:20 +01:00
Nicolas Grekas
c47bbbe5d3 Merge branch '2.5' into 2.6
* 2.5:
  [Validator] use 2.5 API in LengthValidator
  fixed id for translations
  bumped Symfony version to 2.3.26
  Dutch translation for invalid charset message
  German translation for invalid charset message
  Add a Slovenian translation for invalid charset message
  Add a Polish translation.
  Test lowest deps with latest 5.3
  updated VERSION for 2.3.25
  update CONTRIBUTORS for 2.3.25
  updated CHANGELOG for 2.3.25
  Fix docblocks to comments
  Inject the correct EventDispatcher instance
  [Validator] reject ill-formed strings
  [Validator] drop grapheme_strlen in LengthValidator
  Unique Entity Validator Invalid Value
  [FrameworkBundle][config] allow multiple fallback locales.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
2015-02-01 17:10:57 +01:00
Nicolas Grekas
760245423e [Validator] use 2.5 API in LengthValidator 2015-02-01 16:46:51 +01:00
Fabien Potencier
f1f657a68d Merge branch '2.3' into 2.5
* 2.3:
  fixed id for translations
  bumped Symfony version to 2.3.26
  Dutch translation for invalid charset message
  German translation for invalid charset message
  Add a Slovenian translation for invalid charset message
  Add a Polish translation.
  Test lowest deps with latest 5.3
  updated VERSION for 2.3.25
  update CONTRIBUTORS for 2.3.25
  updated CHANGELOG for 2.3.25
  Fix docblocks to comments
  [Validator] reject ill-formed strings
  [Validator] drop grapheme_strlen in LengthValidator
  Unique Entity Validator Invalid Value
  [FrameworkBundle][config] allow multiple fallback locales.

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
	src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf
	src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
2015-02-01 10:36:16 +01:00
Fabien Potencier
d03a905253 fixed id for translations 2015-02-01 10:22:11 +01:00
Fabien Potencier
28368d4c16 minor #13561 [Validator] Add a Polish translation for invalid charset message (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Add a Polish translation for invalid charset message

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

re #13528

Commits
-------

0d562eb Add a Polish translation.
2015-02-01 10:15:59 +01:00
Fabien Potencier
ddc94f1728 minor #13565 [Validator] Dutch translation for invalid charset message (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Dutch translation for invalid charset message

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

re https://github.com/symfony/symfony/pull/13528

Commits
-------

0f72a1e Dutch translation for invalid charset message
2015-02-01 10:14:48 +01:00
Fabien Potencier
b5c1445a08 minor #13563 [Validator] German translation for invalid charset message (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] German translation for invalid charset message

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

Commits
-------

97576ff German translation for invalid charset message
2015-02-01 10:13:48 +01:00
Fabien Potencier
8462a92df6 minor #13562 [Validator] Add a Slovenian translation for invalid charset message (peterkokot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Add a Slovenian translation for invalid charset message

| 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

Concerning PR #13528

Commits
-------

bd804e6 Add a Slovenian translation for invalid charset message
2015-02-01 10:12:39 +01:00
Fabien Potencier
4425a3ffd8 bumped Symfony version to 2.3.26 2015-02-01 06:48:52 +01:00
Tobias Schultze
952388c277 [Routing] make host matching case-insensitive according to RFC 3986 2015-01-31 23:26:34 +01:00
possum
0f72a1eb2b Dutch translation for invalid charset message 2015-01-31 19:01:54 +01:00
Christian Flothmann
97576ff44e German translation for invalid charset message 2015-01-31 13:01:07 +01:00
Peter Kokot
bd804e6cdc Add a Slovenian translation for invalid charset message 2015-01-31 12:20:07 +01:00
Jakub Zalas
0d562eb3e7 Add a Polish translation. 2015-01-30 23:45:57 +00:00
Fabien Potencier
959733dc4b updated VERSION for 2.3.25 2015-01-30 14:55:40 +01:00
Fabien Potencier
e58bb438cf minor #13469 Fix docblocks to comments (keradus)
This PR was squashed before being merged into the 2.3 branch (closes #13469).

Discussion
----------

Fix docblocks to comments

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

Change docblock into comment when it's not a proper docblock.

Commits
-------

779926a Fix docblocks to comments
2015-01-30 10:53:49 +01:00
Dariusz Ruminski
779926a9f2 Fix docblocks to comments 2015-01-30 10:53:48 +01:00
Fabien Potencier
0c2fa6eea7 bug #13528 [Validator] reject ill-formed strings (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] reject ill-formed strings

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

ping @Tobion

Commits
-------

3a9058a [Validator] reject ill-formed strings
2015-01-30 10:19:53 +01:00
Fabien Potencier
b9540b847d bug #13525 [Validator] UniqueEntityValidator - invalidValue fixed. (Dawid Sajdak)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] UniqueEntityValidator - invalidValue fixed.

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

Commits
-------

58bf582 Unique Entity Validator Invalid Value
2015-01-30 10:14:30 +01:00
Diego Saint Esteben
458b02939f Inject the correct EventDispatcher instance 2015-01-29 19:20:43 +01:00
Nicolas Grekas
3a9058a7d7 [Validator] reject ill-formed strings 2015-01-28 12:08:28 +01:00
Nicolas Grekas
915fcd8dec [Validator] drop grapheme_strlen in LengthValidator 2015-01-26 18:35:52 +01:00
Fabien Potencier
eadc8c7de5 bug #12649 [Hackday] [Toolbar] Fix info position and icons on small screens (stefanosala)
This PR was merged into the 2.6 branch.

Discussion
----------

[Hackday] [Toolbar] Fix info position and icons on small screens

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

I changed a bit the order of profiles, IMO the dump goes closer to request data. Then I tweaked a bit the toolbar to show more icons even on smaller screen. I tested everything with Chrome and IE9 and it seems to work smoothly.

Here are some explanatory screenshots:

![](http://cl.ly/image/3E2e360Y0a15/Screen%20Shot%202014-11-29%20at%2011.56.17.png)
![](http://cl.ly/image/1d073v2v2U2J/Screen%20Shot%202014-11-29%20at%2011.56.42.png)

Commits
-------

838857c [Toolbar] Reset right and left .sf-toolbar-info values needed for window resize
23c0ddc [Toolbar] Handle info position via javascript Place info div to not float out of the window
7a8582e [Toolbar] Display all icons, even on two lines for small screens
2015-01-26 17:00:24 +01:00
Fabien Potencier
1901c84749 minor #13331 [OptionsResolver] added test for allowed values and types that default to null (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] added test for allowed values and types that default to null

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

Added test to keep logic as experienced in #12809

Commits
-------

0b42cad [OptionsResolver] added test for allowed values and types that default to null
2015-01-26 16:57:35 +01:00
Dawid Sajdak
58bf5822b2 Unique Entity Validator Invalid Value 2015-01-26 14:32:32 +01:00
Abdellatif Ait boudad
1251f0e0b2 [FrameworkBundle][config] allow multiple fallback locales. 2015-01-25 14:06:13 +00:00
Fabien Potencier
3015f12b20 minor #13518 [SecurityBundle] fixed tests where cleanup was not done properly (fabpot)
This PR was merged into the 2.6 branch.

Discussion
----------

[SecurityBundle] fixed tests where cleanup was not done properly

| 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
-------

f853cf2 [SecurityBundle] fixed tests where cleanup was not done properly
2015-01-25 10:03:10 +01:00
Fabien Potencier
155a8def14 Merge branch '2.5' into 2.6
* 2.5:
  [HttpKernel] fixed tests
2015-01-25 09:45:24 +01:00
Fabien Potencier
82130a0e55 Merge branch '2.3' into 2.5
* 2.3:
  [HttpKernel] fixed tests
2015-01-25 09:45:13 +01:00
Fabien Potencier
f853cf2dd9 [SecurityBundle] fixed tests where cleanup was not done properly 2015-01-25 07:09:57 +01:00
Fabien Potencier
a3f0299d5a [HttpKernel] fixed tests 2015-01-25 06:22:15 +01:00
Fabien Potencier
29e2c0d355 Merge branch '2.5' into 2.6
* 2.5:
  [2.3] [HttpFoundation] [MimeTypeGuesser]
  Removed dead code and various cleaning
  [Console] Make it clear that the second argument is not about command options.
  Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
  [Yaml] fixed parse shortcut Key after unindented collection.
  [Console] fixed #10531
  Make the container considered non-fresh if the environment parameters are changed

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
2015-01-25 05:39:26 +01:00
Fabien Potencier
8f9af3a23a Merge branch '2.3' into 2.5
* 2.3:
  [2.3] [HttpFoundation] [MimeTypeGuesser]
  Removed dead code and various cleaning
  [Console] Make it clear that the second argument is not about command options.
  Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
  [Yaml] fixed parse shortcut Key after unindented collection.
  [Console] fixed #10531
  Make the container considered non-fresh if the environment parameters are changed

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
	src/Symfony/Component/Console/Tests/ApplicationTest.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
2015-01-25 05:37:39 +01:00
Fabien Potencier
92c7635161 bug #13473 [FrameworkBundle][xsd] added missing logging attribute. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle][xsd] added missing logging attribute.

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

Commits
-------

7e19fab [FrameworkBundle][xsd] added missing logging attribute.
2015-01-25 05:25:56 +01:00
Fabien Potencier
3ee74e54a4 minor #13481 [2.6] Removed dead code and various cleaning (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Removed dead code and various cleaning

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

In complement of this one: https://github.com/symfony/symfony/pull/13488/

Commits
-------

dbbe170 Removed dead code and various cleaning
2015-01-25 05:20:58 +01:00
Fabien Potencier
8892cf06c1 minor #13488 [2.3] Removed dead code and various cleaning (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Removed dead code and various cleaning

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

Commits
-------

50973ba Removed dead code and various cleaning
2015-01-25 05:18:27 +01:00
Fabien Potencier
aa0bf6c396 bug #12972 Make the container considered non-fresh if the environment parameters are changed (thewilkybarkid)
This PR was merged into the 2.3 branch.

Discussion
----------

Make the container considered non-fresh if the environment parameters are changed

| Q             | A
| ------------- | ---
| Bug fix?      | not really
| New feature?  | kind of
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #11365
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/4645

Fixes #11365 by making the container non-fresh if any of the prefixed environment parameters are added/removed/changed. Not a bug as it was documented as behaving as such, but I think it's worth applying to 2.3 rather than considering it a new feature.

Commits
-------

b49fa12 Make the container considered non-fresh if the environment parameters are changed
2015-01-25 05:04:46 +01:00
Fabien Potencier
5dd44b6f37 bug #13309 [Console] fixed 10531 (nacmartin)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] fixed 10531

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

This is a fix for #10531. It works by extracting all the parent namespaces of a command.

Commits
-------

e6afff4 [Console] fixed #10531
2015-01-25 05:00:20 +01:00
Fabien Potencier
4b368937a8 bug #13352 [Yaml] fixed parse shortcut Key after unindented collection. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] fixed parse shortcut Key after unindented collection.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | #13345, #8093, #11019 and #10885
| Tests pass?   | yes
| License       | MIT

Commits
-------

58a7426 [Yaml] fixed parse shortcut Key after unindented collection.
2015-01-25 04:54:01 +01:00
Fabien Potencier
b36900ed33 minor #13515 [Form] fixed form tests when using 2.7 deps (fabpot)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] fixed form tests when using 2.7 deps

| 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

This PR allows tests to pass for the Form subtree-split when using any version of the Validator component. The build was broken because the 2.4 API works in the same way as the 2.5 one in Symfony 2.7, so the cause is set. Testing the implementation of the context allows to know whether to expect the cause more reliably.

Commits
-------

a55f5c8 [Form] fixed form tests when using 2.7 deps
2015-01-25 04:35:46 +01:00
Fabien Potencier
a55f5c8dda [Form] fixed form tests when using 2.7 deps 2015-01-25 04:25:09 +01:00
Javier Spagnoletti
1e4a8d55cb [2.3] [HttpFoundation] [MimeTypeGuesser]
Updated exception message in MimeTypeGuesser when no guessers available
(issue #12857).

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12857
| License       | MIT
| Doc PR        | none
2015-01-24 20:09:16 -03:00
Fabien Potencier
6000f60190 minor #13236 Consistent spaceless nodes in form templates (peterrehm)
This PR was merged into the 2.3 branch.

Discussion
----------

Consistent spaceless nodes in form templates

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

Added '-' at the start and at the end of all if, for, set and block nodes. Related to #12422.
Replaces #12560.

Commits
-------

41c5be6 Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
2015-01-23 20:42:42 +01:00
Grégoire Pineau
717c6d1800 [TwigBridge] Fix bootstrap rendering when user explicitly use form_label 2015-01-23 12:14:04 +01:00
Giorgio Premi
b6d4390ab6 Keep "pre" meaning for var_dump quick-and-dirty debug 2015-01-22 11:07:27 +01:00
sarah khalil
dbbe170168 Removed dead code and various cleaning 2015-01-21 21:57:55 +01:00
Arrilot
538195c7f5 [Var-Dumper] css-fix 2015-01-21 23:15:29 +03:00
sarah khalil
50973bace1 Removed dead code and various cleaning 2015-01-21 21:14:55 +01:00
Hippolyte Alain
0a327eb639 Fixed HtmlDumper with long string 2015-01-21 18:40:20 +01:00
Abdellatif Ait boudad
7e19fab51c [FrameworkBundle][xsd] added missing logging attribute. 2015-01-20 22:59:02 +00:00
Stefano Sala
838857c992 [Toolbar] Reset right and left .sf-toolbar-info values needed for window resize 2015-01-20 22:09:33 +01:00
Fabien Potencier
7a3332b798 Merge branch '2.5' into 2.6
* 2.5:
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones
  [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
2015-01-20 02:40:20 +01:00
Fabien Potencier
760553176f Merge branch '2.3' into 2.5
* 2.3:
  [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
  [Twig][Bridge][TranslationDefaultDomain] add support of named arguments.
  [Form] Improved exception message if the data class is not found
  Fixes ArgvInput's argument getter with empty tokens
  execute cheaper checks before more expensive ones

Conflicts:
	src/Symfony/Component/Form/FormConfigBuilder.php
2015-01-20 02:39:13 +01:00
Jakub Zalas
32338af211 [Console] Make it clear that the second argument is not about command options. 2015-01-19 19:35:05 +00:00
Fabien Potencier
a38fde3fab minor #13439 [WebProfilerBundle] Minor plural/singular change (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Minor plural/singular change

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

Commits
-------

b3cfc1a Minor plural/singular change
2015-01-19 16:17:25 +01:00
Wouter J
b3cfc1abc0 Minor plural/singular change 2015-01-19 10:36:52 +01:00
Peter Rehm
41c5be672f Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes 2015-01-18 15:22:12 +01:00
Fabien Potencier
aeec129c5a bug #13343 [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled (hason)
This PR was merged into the 2.5 branch.

Discussion
----------

[FrameworkBundle] FormDataCollector should be loaded only if form config is enabled

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

Commits
-------

af496ea [FrameworkBundle] FormDataCollector should be loaded only if form config is enabled
2015-01-18 14:51:01 +01:00
Christian Flothmann
6b2537b902 print error message if server couldn't be started 2015-01-18 14:37:55 +01:00
Fabien Potencier
b8e4b4af3d bug #13039 [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info (rk3rn3r)
This PR was squashed before being merged into the 2.3 branch (closes #13039).

Discussion
----------

[HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info

Hi everyone!

We at trivago had an issue with the Request object. It seems that all versions of symfony 2.x and 3.x are affected from this (possible) bug (don't checked 1.x).
Here is the problem:

some old legacy pages are deployed in the Document Root, let's say /var/www/www.test.com/ .
one or more new applications based on symfony are deployed to /var/release/new_app1/ , /var/release/new_app2/ , ... .
in /var/www/www.test.com/ there is a symlink "app" to /var/release/new_app1/web, like:
/var/www/www.test.com/app --> /var/release/new_app1/web/

there is a "SEO"/human-readable rewrite rule for Document Root (if called path/file not exist): (.*) --> app/app.php

the problem comes, when the user calls a uri starting with "app" or whatever the rewrite rule / symlink points to:

the user calls "http://www.test.com/apparthotel-1234"
results in $_SERVER parameters like this
```
'DOCUMENT_ROOT' =>'/var/www/www.test.com',
'SCRIPT_FILENAME' => '/var/www/www.test.com/app/app.php',
'SCRIPT_NAME' => '/app/app.php',
'PHP_SELF' => '/app/app.php/apparthotel-1234'
```
in Request::prepareBaseUrl() there are checks to find the baseUrl:
```
        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) {
            // full $baseUrl matches
            return $prefix;
        }

        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, dirname($baseUrl))) {
            // directory portion of $baseUrl matches
            return rtrim($prefix, '/');
        }
```
first it is checked if (in our case) "/app/app.php" is in the request uri (/apparthotel-1234).
it's not.

then it takes the dirname (of /app/app.php) which is /app and checks if it is in the request uri (/apparthotel-1234), and YES, it is! and "/app" is returned, but this is wrong, it should be empty (because it comes from a rewrite rule from root: /)!

later in preparePathInfo(), if there is a baseUrl, then the baseUrl is removed from the request uri:
/apparthotel-1234  --->  /arthotel-1234

The cause is, the second baseUrl check, checks if the path of the application is already in the uri, like when the request was "http://www.test.com/app/apparthotel-1234" and hit a rewrite rule like (.*) --> app.php in there, but because it matches a directory it must match "dirname($baseUrl) . '/'".

I also needed to fix one unit test of the getBaseUrl test:
the request uri recently was "/foo%20bar".
but from the $_SERVER infos "foo bar" is a directory, see:
```
'SCRIPT_FILENAME' => '/home/John Doe/public_html/foo bar/app.php',
'SCRIPT_NAME' => '/foo bar/app.php',
'PHP_SELF' => '/foo bar/app.php',
```

webservers will redirect a request "http://www.test.com/foo%20bar" to "http://www.test.com/foo%20bar/" when "foo bar" is a directory. checked this for apache 2.x and nginx 1.4.x.

this fix is for symfony master (3.0.x, see #13039).
I also prepared a merge request for actual 2.7 branch, it will also follow in some minutes. (see #13040)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | this, #13040, #13038, #7329
| License       | MIT

[HttpFoundation] [Request]
* added missing slash to baseUrl-path part check to remove the path, only when it's also a path in the uri
[HttpFoundation] [Tests] [RequestTest]
* fixed and added unittests

This is the symfony 2.3 branch fix for the issue related to #13038 and #13040

Happy christmas!

Commits
-------

3a3ecd3 [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info
2015-01-18 14:31:14 +01:00
rkerner
3a3ecd3353 [HttpFoundation] [Request] fix baseUrl parsing to fix wrong path_info 2015-01-18 14:31:11 +01:00
Abdellatif Ait boudad
02bc23a735 [Twig][Bridge][TranslationDefaultDomain] add support of named arguments. 2015-01-18 14:05:48 +01:00
Fabien Potencier
ec1cae8b14 minor #13431 [Form] Improved exception message if the data class is not found (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Improved exception message if the data class is not found

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

Commits
-------

4145836 [Form] Improved exception message if the data class is not found
2015-01-16 22:23:29 +01:00
Fabien Potencier
7fdb07b206 minor #13430 [Yaml] execute cheaper checks before more expensive ones (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] execute cheaper checks before more expensive ones

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

Minor improvements to the checks as suggested by @stof in #13262.

Commits
-------

cd4349d execute cheaper checks before more expensive ones
2015-01-16 17:22:21 +01:00
Fabien Potencier
414583607c [Form] Improved exception message if the data class is not found 2015-01-16 16:35:59 +01:00
Baptiste Clavié
afa1e2079d Fixes ArgvInput's argument getter with empty tokens
If an empty token is provided (from automated tools, or on purpose when
running a command), the argument getter was not checking the other
tokens, as '' == false in php, which is the stop condition of the while
loop in this method.

This method should now rely on the count of tokens rather than the value
of the return of array_shift
2015-01-16 16:21:58 +01:00
Fabien Potencier
820b973dab bug #13353 [DependencyInjection] Fix missing ExpressionLanguageProviders (szicsu)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] Fix missing ExpressionLanguageProviders

Fix missing ExpressionLanguageProviders extension bild

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

Commits
-------

b248368 [DependencyInjection] Fix missing ExpressionLanguageProviders on extension bild
2015-01-16 16:13:39 +01:00
Christian Flothmann
cd4349df50 execute cheaper checks before more expensive ones 2015-01-16 15:59:09 +01:00
Fabien Potencier
39520c0cdd Merge branch '2.5' into 2.6
* 2.5:
  fixed tests
  [EventDispatcher] Add missing checks to RegisterListenersPass
  Inline private 'is quoting required' methods in Escaper
  [Debug] fix loading order for legacy classes
  Add comment as requested
  Remove duplicate 'require'
  [Yaml] Improve YAML boolean escaping

Conflicts:
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-01-16 15:55:47 +01:00
Fabien Potencier
99a627a040 Merge branch '2.3' into 2.5
* 2.3:
  fixed tests
  [EventDispatcher] Add missing checks to RegisterListenersPass
  Inline private 'is quoting required' methods in Escaper
  [Debug] fix loading order for legacy classes
  Add comment as requested
  Remove duplicate 'require'
  [Yaml] Improve YAML boolean escaping

Conflicts:
	src/Symfony/Component/Debug/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
2015-01-16 15:51:58 +01:00
Fabien Potencier
b08115bd63 fixed tests 2015-01-16 15:49:28 +01:00
Lorenz Schori
0a50b63da1 [EventDispatcher] Add missing checks to RegisterListenersPass
* Support services using a parameter for their class name.
* Prevent abstract services as event subscribers.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |
2015-01-16 15:48:25 +01:00
Fabien Potencier
689cf99c4e bug #13262 [Yaml] Improve YAML boolean escaping (petert82, larowlan)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Improve YAML boolean escaping

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

This PR ensures that PHP [values which would be interpreted as booleans][1] in older versions of the YAML spec are escaped with single quotes when dumped by the Dumper.

For example, dumping this:

```php
array(
    'country_code' => 'no',
    'speaks_norwegian' => 'y',
    'heating' => 'on',
)
```

Will produce this YAML:

```yaml
country_code: 'no'
speaks_norwegian: 'y'
heating: 'on'
```

[1]: http://yaml.org/type/bool.html

Commits
-------

8fa056b Inline private 'is quoting required' methods in Escaper
afe827a Merge pull request #2 from larowlan/patch-2
a0ec0fe Add comment as requested
1e0633e Merge pull request #1 from larowlan/patch-1
81a8090 Remove duplicate 'require'
3760e67 [Yaml] Improve YAML boolean escaping
2015-01-16 14:53:48 +01:00
pthompson
8fa056bc95 Inline private 'is quoting required' methods in Escaper 2015-01-16 14:15:13 +01:00
Nicolas Grekas
cb347896b2 [Debug] fix loading order for legacy classes 2015-01-15 13:58:08 +01:00
Fabien Potencier
e87d4f7110 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fix routing descriptor for options
  exit when Twig environment is not set
  [Routing] fix misleading test for condition
2015-01-15 13:15:12 +01:00
Tobias Schultze
b0c29a0c18 [FrameworkBundle] fix routing descriptor for options 2015-01-15 12:18:50 +01:00
Christian Flothmann
05a4602450 exit when Twig environment is not set
The `LintCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.
2015-01-13 20:56:15 +01:00
Tobias Schultze
d687a885a4 [Routing] fix misleading test for condition 2015-01-13 15:58:43 +01:00
Nicolas Grekas
df9bb2674e [Debug] fix test 2015-01-13 15:49:42 +01:00
Fabien Potencier
c2f2fe518e Merge branch '2.5' into 2.6
* 2.5:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:35 +01:00
Fabien Potencier
d7e9448353 Merge branch '2.3' into 2.5
* 2.3:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:30 +01:00