Commit Graph

11219 Commits

Author SHA1 Message Date
Fabien Potencier
33abe5c6d6 Merge branch '2.3' into 2.6
* 2.3:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [travis] Kill tests when a new commit has been pushed
  fixed CS
  Change behavior to mirror hash_equals() returning early if there is a length mismatch
  CS fixing
  Prevent modifying secrets as much as possible
  Update StringUtils.php
  Whitespace
  Update StringUtils.php
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
2015-03-27 11:19:51 +01:00
Dariusz Ruminski
11e3a9e4e5 CS: fixes 2015-03-27 10:02:23 +01:00
Nicolas Grekas
9944589068 [VarDumper] Fix dumping ThrowingCasterException 2015-03-26 18:20:25 +01:00
Tobias Schultze
ccd32d5995 Translator component has default domain for null implemented
no need to have default translation domain logic in 3 different places
2015-03-26 14:42:51 +01:00
Fabien Potencier
2981d01baa bug #12948 [Form] [TwigBridge] Bootstrap layout whitespace control (mvar)
This PR was squashed before being merged into the 2.6 branch (closes #12948).

Discussion
----------

[Form] [TwigBridge] Bootstrap layout whitespace control

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

While working with Symfony's Bootstrap layout I have found few minor issues:

- [x] Choice labels are rendered with extra spaces
- [x] Whitespace control for all form widgets (like in default layout)

What was done:
- All failing tests from `AbstractLayoutTest` were copied to `AbstractBootstrap3LayoutTest` and adapted for Bootstrap layout. One of the main fixes was to change class checking for input (e.g., Bootstrap requires "form-control").
- Removed  ` ` and hardcoded space before error message. Spacing here should be handled with CSS.
- Trimmed all unnecessary spaces from widget blocks (whitespace control)

Commits
-------

e8b0678 [Form] [TwigBridge] Bootstrap layout whitespace control
2015-03-26 12:16:49 +01:00
Mantas Varatiejus
e8b06787b0 [Form] [TwigBridge] Bootstrap layout whitespace control 2015-03-26 12:16:40 +01:00
Fabien Potencier
0583cf8f33 minor #14045 CS: general fixes (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: general fixes

| 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

After this PR the whole 2.3 version will be valid when running PHP CS Fixer.
It is also first step to apply PHP CS Fixer on next version.

To keep fabbot.io happy ;)

Commits
-------

063ae13 CS: general fixes
2015-03-25 10:33:20 +01:00
Fabien Potencier
2c67400e52 fixed CS 2015-03-25 10:29:39 +01:00
Anthony Ferrara
45cfb44df8 Change behavior to mirror hash_equals() returning early if there is a length mismatch 2015-03-25 10:28:01 +01:00
Anthony Ferrara
8269589c91 CS fixing 2015-03-25 10:28:01 +01:00
Anthony Ferrara
bdea4bad7f Prevent modifying secrets as much as possible 2015-03-25 10:28:01 +01:00
Scott Arciszewski
76b36d385f Update StringUtils.php 2015-03-25 10:28:01 +01:00
Scott Arciszewski
7221efc095 Whitespace 2015-03-25 10:28:01 +01:00
Scott Arciszewski
56ed71c7d2 Update StringUtils.php 2015-03-25 10:28:00 +01:00
Ivan Kurnosov
ea8da6e091 StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
It must be the other way around
2015-03-25 09:38:46 +01:00
Dariusz Ruminski
063ae13fde CS: general fixes 2015-03-25 00:47:08 +01:00
Fabien Potencier
2559628654 Merge branch '2.3' into 2.6
* 2.3:
  CS: fix some license headers
  CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
  use visited lookup with reference to gain performance
  Replace GET parameters when changed

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
2015-03-24 18:00:37 +01:00
Fabien Potencier
36948bb382 minor #14038 CS: fix some license headers (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: fix some license headers

| 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

Commits
-------

2b74841 CS: fix some license headers
2015-03-24 17:57:18 +01:00
Dariusz Ruminski
2b74841b5b CS: fix some license headers 2015-03-24 17:44:35 +01:00
Dariusz Ruminski
6a16d917fe CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline 2015-03-24 17:36:00 +01:00
Fabien Potencier
86e9b9409c bug #14010 Replace GET parameters when changed in form (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Replace GET parameters when changed in form

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

Commits
-------

fa9fb5c Replace GET parameters when changed
2015-03-23 10:09:00 +01:00
Norman Soetbeer
2cc5011e2f use visited lookup with reference to gain performance 2015-03-23 09:55:31 +01:00
WouterJ
fa9fb5c1ce Replace GET parameters when changed 2015-03-23 09:29:47 +01:00
Fabien Potencier
99330cbebc bug #14013 [DependencyInjection] prevent inlining service configurators (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] prevent inlining service configurators

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

Currently, only the `PhpDumper` is able to dump inlined service
configurators. Since Symfony applications dump the compiled container
in XML, inlined configurators will break this process.

We did something similar before with service factories in #13914.

Commits
-------

34619fe prevent inlining service configurators
2015-03-23 09:10:51 +01:00
John Kary
02a141317d [Process] Fix outdated Process->start() docblock 2015-03-23 08:56:12 +01:00
Fabien Potencier
bd7788a106 bug #14012 [DomCrawler] Improve namespace discovery performance (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[DomCrawler] Improve namespace discovery performance

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

Before this quick-fix, xpath axes like `child::*` or `descendant-or-self::*` were considered namespaces. As a result, far too many xpath queries were being executed during namespace discovery.

Here's a full blackfire before/after comparision of @salaman's script:  https://blackfire.io/profiles/compare/a80b9e77-8e55-45d3-a348-7d34a51053b6/graph

![domcrawler-xpath-query](https://cloud.githubusercontent.com/assets/190447/6767384/ba93c57a-d024-11e4-84e1-e58dd7527f03.png)

Commits
-------

b6af002 [DomCrawler] Improve namespace discovery performance
2015-03-23 07:58:55 +01:00
Christian Flothmann
34619fedff prevent inlining service configurators
Currently, only the `PhpDumper` is able to dump inlined service
configurators. Since Symfony applications dump the compiled container
in XML, inlined configurators will break this process.
2015-03-22 22:40:28 +01:00
Fabien Potencier
618b7dcfb8 Merge branch '2.3' into 2.6
* 2.3:
  Fix small coding style
  [2.3] Static Code Analysis for Components
  [Form] fixed phpdoc
  CS: Convert double quotes to single quotes
  Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
  [Validator] added Japanese translation for unmatched charset (id: 80)
  [DependencyInjection] Highest precedence for user parameters
  [Translation][MoFileLoader] fixed load empty translation.
  bumped Symfony version to 2.3.27
  updated VERSION for 2.3.26
  update CONTRIBUTORS for 2.3.26
  updated CHANGELOG for 2.3.26

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
	src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
	src/Symfony/Component/Filesystem/Filesystem.php
	src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Translation/PluralizationRules.php
	src/Symfony/Component/Validator/Constraints/IssnValidator.php
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-03-22 17:55:57 +01:00
Fabien Potencier
052735d948 minor #14005 CS: Convert double quotes to single quotes (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Convert double quotes to single quotes

| 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

Changes generated automatically by upcoming PHP CS Fixer.
To keep fabbot.io happy ;)

Commits
-------

f99c22c CS: Convert double quotes to single quotes
2015-03-22 17:41:17 +01:00
Jakub Zalas
b6af00292d [DomCrawler] Improve namespace discovery performance
Up until now xpath axes (child::*, descendant-or-self::** etc) were considered namespaces.
As a result, far too many xpath queries were being executed while namespace discovery.
2015-03-21 23:00:29 +00:00
Nuno Rafael Rocha
7d0bd63df5 Fix small coding style
Remove extra space from `PluralizationRulesTest` class declaration.
2015-03-21 18:53:24 +01:00
Fabien Potencier
32964969d7 minor #13995 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13995).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- [Filesystem] : nested ifs, not optimal ifs
- in_array() miss-uses
- class re-implements an interface of super(s)
- array_keys/array_values as foreach array - fixed cases where changes has sense

Commits
-------

4abfabf [2.3] Static Code Analysis for Components
2015-03-21 18:48:07 +01:00
Vladimir Reznichenko
4abfabf8da [2.3] Static Code Analysis for Components 2015-03-21 18:48:06 +01:00
Issei.M
9c557312f2 [Form] fixed phpdoc 2015-03-21 18:46:18 +01:00
Dariusz Ruminski
f99c22c08a CS: Convert double quotes to single quotes 2015-03-21 12:11:30 +01:00
Issei.M
0ada9e4c16 [Validator] added Japanese translation for unmatched charset (id: 80) 2015-03-20 16:04:18 +01:00
Fabien Potencier
bd0eaef28d bug #13953 [Translation][MoFileLoader] fixed load empty translation. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][MoFileLoader] fixed load empty translation.

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

see https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html

![selection_003](https://cloud.githubusercontent.com/assets/1753742/6690874/fcf04ef6-ccba-11e4-83a4-4f50188709c5.png)

Commits
-------

22f5a73 [Translation][MoFileLoader] fixed load empty translation.
2015-03-19 19:49:28 +01:00
Grégoire Pineau
ce2764d416 [DependencyInjection] Highest precedence for user parameters
If `router.request_context.host` is defined in `parameters.yml` and if this
key is used in `globals` section of twig bundle then the value registered in the
DIC/parameters is the default value (`localhost`).

It occurs because generall the framework bundle is defined before the twig
bundle. So after the first loop, the (user) value registered in the
`ContainerBuilder` is overridden by the default value of the framework bundle.
And so, when it comes the time to process twig bundle, the last one gets the
default value, and not the user value.

This patch force the merge of default value, but give an highest precedence of
user parameters for each extensions.
2015-03-18 10:30:04 +01:00
Fabien Potencier
d64cb493af bumped Symfony version to 2.6.6 2015-03-17 16:51:12 +01:00
Abdellatif Ait boudad
22f5a735fd [Translation][MoFileLoader] fixed load empty translation. 2015-03-17 15:35:29 +00:00
Fabien Potencier
80833da9d0 updated VERSION for 2.6.5 2015-03-17 15:58:46 +01:00
Fabien Potencier
4b7e5fabf9 bumped Symfony version to 2.3.27 2015-03-17 15:49:54 +01:00
Fabien Potencier
dd70065d94 updated VERSION for 2.3.26 2015-03-17 15:18:00 +01:00
Fabien Potencier
7055091edc bug #13944 [HttpKernel] UriSigner::buildUrl - default params for http_build_query (Jakub Simon)
This PR was squashed before being merged into the 2.6 branch (closes #13944).

Discussion
----------

[HttpKernel] UriSigner::buildUrl - default params for http_build_query

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

UriSigner fail to verify hash when custom ini setting arg_separator.output is used.
It was introduced in https://github.com/symfony/symfony/pull/12574

Commits
-------

3d6933f [HttpKernel] UriSigner::buildUrl - default params for http_build_query
2015-03-17 13:54:34 +01:00
Jakub Simon
3d6933f00c [HttpKernel] UriSigner::buildUrl - default params for http_build_query 2015-03-17 13:54:32 +01:00
Fabien Potencier
8962d5d3ef minor #13941 [2.6] Marked the ResolveParameterPlaceHoldersPassTest as legacy (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Marked the ResolveParameterPlaceHoldersPassTest as legacy

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

Splitted the ResolveParameterPlaceHoldersPassTest to obtain a legacy test to avoid deprecation rise.

Commits
-------

67ca1f4 Marked the ResolveParameterPlaceHoldersPassTest as legacy
2015-03-17 13:44:40 +01:00
Fabien Potencier
d609e4e313 Merge branch '2.3' into 2.6
* 2.3:
  remove unused code
2015-03-17 13:43:30 +01:00
sarah khalil
67ca1f4df3 Marked the ResolveParameterPlaceHoldersPassTest as legacy 2015-03-17 13:42:58 +01:00
Michael Lee
e504ebee24 [ExpressionLanguage] fixed issues when parsing postfix expressions
Exception shall be thrown when parsing the following expressions:

foo."#", foo."bar", foo.**, foo.123

The original parser didn't throw exception for foo."#", foo.** and
foo.123

| 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
2015-03-17 07:52:13 +01:00
Fabien Potencier
051c3de95a minor #13933 [Serializer] Fix object normalization exceptions (dunglas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Serializer] Fix object normalization exceptions

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

Commits
-------

500df47 [Serializer] Fix object normalization exceptions
2015-03-17 07:44:03 +01:00
Fabien Potencier
9b736c8829 bug #13914 [DependencyInjection] do not inline service factories (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] do not inline service factories

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

The `XmlDumper`, which is used in the full-stack framework to dump the
used container, is not capable to dump inlined factories.

Commits
-------

663ae9f do not inline service factories
2015-03-17 07:43:12 +01:00
Christian Flothmann
8529719c01 remove unused code 2015-03-16 15:31:07 +01:00
Christian Flothmann
663ae9f5aa do not inline service factories
The `XmlDumper`, which is used in the full-stack framework to dump the
used container, is not capable to dump inlined factories.
2015-03-16 15:30:23 +01:00
Christian Flothmann
8bda37c390 resolve class parameters in service factories 2015-03-16 14:48:05 +01:00
Kévin Dunglas
500df475a6 [Serializer] Fix object normalization exceptions 2015-03-16 00:12:13 +01:00
Fabien Potencier
be053446bd Merge branch '2.3' into 2.6
* 2.3:
  `ResolveParameterPlaceHoldersPass` unit tests
  Fixing wrong variable name from #13519
2015-03-15 20:43:27 +01:00
Fabien Potencier
d50f0a89cd minor #13930 [DependencyInjection] ResolveParameterPlaceHoldersPass unit tests (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] `ResolveParameterPlaceHoldersPass` unit tests

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

When working #13924, I noticed that there were no tests for the `ResolveParameterPlaceHoldersPass` class. So I decided to add them for the `2.3` branch too.

Commits
-------

b8d42b3 `ResolveParameterPlaceHoldersPass` unit tests
2015-03-15 20:28:56 +01:00
Christian Flothmann
b8d42b368b ResolveParameterPlaceHoldersPass unit tests 2015-03-15 17:33:36 +01:00
Ryan Weaver
3ae52ed739 Fixing wrong variable name from #13519 2015-03-14 19:44:00 -04:00
Abdellatif Ait boudad
bc066fb3e7 [translation][initialize cache] Remove dead code. 2015-03-14 11:42:25 +00:00
Fabien Potencier
d2fc77e4d1 Merge branch '2.3' into 2.6
* 2.3:
  [DependencyInjection] fixed service resolution for factories

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
2015-03-14 06:27:59 +01:00
Fabien Potencier
e34387d7b5 bug #13519 [DependencyInjection] fixed service resolution for factories (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fixed service resolution for factories

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

In the service container, factories can be defined with a class/method pair or a service/method pair.

The class or service value can be a container parameter, but it was not supported everywhere, this PR fixes that.

Note that the method can never be a container parameter as this is supported nowhere in the current code, so this has not been changed.

Another PR will fix the 2.6 way of configuring a factory.

Commits
-------

f86ad95 [DependencyInjection] fixed service resolution for factories
2015-03-14 06:16:41 +01:00
Nicolas Grekas
ed40c90975 [2.6] add @group legacy 2015-03-13 18:37:22 +01:00
Nicolas Grekas
b5e91071f4 Merge branch '2.3' into 2.6
* 2.3:
  [2.3] add @group legacy
2015-03-13 18:11:24 +01:00
Nicolas Grekas
52ab20607c [2.3] add @group legacy 2015-03-13 18:09:38 +01:00
Nicolas Grekas
5a781cf631 Merge branch '2.3' into 2.6
* 2.3:
  [travis] Do no tar in //
  [2.3] Static Code Analysis for Components
2015-03-13 14:21:46 +01:00
sarah khalil
48d5e20e7e Changed visibility of setUp() and tearDown to protected 2015-03-13 10:50:03 +01:00
Fabien Potencier
8a18b56c3b minor #13908 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13908).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended), no functional changes:
- unused array fill-in removed (dead code)
- reduced str_replace calls \Symfony\Component\BrowserKit\Response::getHeader

Commits
-------

d05cffb [2.3] Static Code Analysis for Components
2015-03-12 18:51:58 +01:00
Vladimir Reznichenko
d05cffb409 [2.3] Static Code Analysis for Components 2015-03-12 18:51:57 +01:00
Fabien Potencier
900558c9c4 bug #13902 [Debug] reintroduce charset param to ExceptionHandler (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] reintroduce charset param to ExceptionHandler

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

For some reason, we removed the charset arg of the constructor in 2.5, then used the same position to add fileLinkFormat in 2.6. This is a BC break with 2.3.
This PR reintroduces charset at second position, with some heuristic to keep compat with 2.6

Commits
-------

c8bd867 [Debug] reintroduce charset param to ExceptionHandler
2015-03-12 15:32:01 +01:00
Fabien Potencier
43efb1ac1c Merge branch '2.3' into 2.6
* 2.3:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2015-03-12 15:30:42 +01:00
Fabien Potencier
374b7180bf bug #13901 [Bundle] Fix charset config (nicolas-grekas, bamarni)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle] Fix charset config

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

This reverts #13715 and resurrects #7532, which was fine.

Commits
-------

ef41059 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
cbd0525 used HTML5 meta charset tag and removed hardcoded ones
6ca7fc9 Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
2015-03-12 15:23:35 +01:00
Benjamin Zikarsky
8289ec35b3 [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age 2015-03-12 15:15:59 +01:00
Nicolas Grekas
c8bd867414 [Debug] reintroduce charset param to ExceptionHandler 2015-03-12 11:30:29 +01:00
Nicolas Grekas
fc009c16d7 Merge branch '2.3' into 2.6
* 2.3:
  Changed visibility of setUp() and tearDown to protected
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Config/Util/XmlUtils.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Yaml/Inline.php
2015-03-12 11:28:44 +01:00
sarah khalil
1e64220b95 Changed visibility of setUp() and tearDown to protected 2015-03-11 19:52:02 +01:00
Nicolas Grekas
ef410597a6 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback 2015-03-11 17:56:24 +01:00
Fabien Potencier
f86ad95683 [DependencyInjection] fixed service resolution for factories 2015-03-11 09:33:49 +01:00
Fabien Potencier
1af6a9ec5a fixed XSS in the exception handler 2015-03-10 14:08:39 +01:00
Fabien Potencier
de0bd91c83 minor #13866 [2.3] Remove most refs uses (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Remove most refs uses

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

Removes some references usages. They are error prone, and trigger too many copies-on-writes.

Commits
-------

8862705 [2.3] Remove most refs uses
2015-03-09 08:38:59 +01:00
Vladimir Reznichenko
968275624a Php Inspections (EA Extended) - static code analysis includes:
Reduce couple count calls in [Yaml]
Modernize type casting, fix several strict comparisons
Unsets merged
Elvis operator usage
Short syntax for applied operations
2015-03-07 20:12:23 +01:00
Nicolas Grekas
88627058c9 [2.3] Remove most refs uses 2015-03-07 13:18:29 +01:00
Fabien Potencier
6cd873447d Merge branch '2.3' into 2.6
* 2.3:
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [Validator] Added missing galician (gl) translations
  [travis] Tests Security sub-components
  [travis] Tests Security sub-components
  CS fixes
  [travis] test with php nightly

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-03-07 08:40:15 +01:00
Vladimir Reznichenko
1530c355d5 Php Inspections (EA Extended): squash all PR-13813 commits 2015-03-07 08:39:22 +01:00
Fabien Potencier
ca0cf15360 minor #13862 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13862).

Discussion
----------

[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup

| 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

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 1 - targeting v2.3

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Fixed couple of concatenation as array index warnings
- Unset calls can be merged inspection fixes
- array_search in in_array context inspection fixes
- Is null usage inspection fixes
- Prefixed increment/decrement inspection fixes
- Elvis operator can be used inspection fixes
- Alias functions usage inspection fixes
- Ternary operator simplification inspection fixes
- _ _ DIR _ _ equivalent inspection fixes

Commits
-------

f13b5f7 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
2015-03-07 08:38:03 +01:00
Vladimir Reznichenko
f13b5f7583 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup 2015-03-07 08:38:01 +01:00
Nicolas Grekas
32a81f79aa [VarDumper] Fix "next element is already occupied" 2015-03-06 17:45:31 +01:00
Ruben Gonzalez
ec11915895 [Validator] Added missing galician (gl) translations 2015-03-04 07:58:27 +01:00
Tobias Schultze
0cead0f17a bug #13835 [PropertyAccess] stop overwriting once a reference is reached (3rd) (bananer)
This PR was squashed before being merged into the 2.6 branch (closes #13835).

Discussion
----------

[PropertyAccess] stop overwriting once a reference is reached (3rd)

I commited with a different email address in [PR 13831](https://github.com/symfony/symfony/pull/13831), so here is the third attempt. Also removed unnecessary test as suggested by @Tobion

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [13731](https://github.com/symfony/symfony/issues/13731)
| License       | MIT
| Doc PR        | none

I added test cases for the scenario described in my issue. After looking through the PropertyAccessor source my conclusion was that there is no reason to overwrite parents of references, so I changed that. None of the previous test cases disagreed and my new tests also passed.

Or maybe I got it all wrong, I'm willing to learn.

Commits
-------

d733a88 [PropertyAccess] stop overwriting once a reference is reached (3rd)
2015-03-03 20:22:24 +01:00
Philip Frank
d733a887df [PropertyAccess] stop overwriting once a reference is reached (3rd) 2015-03-03 20:22:08 +01:00
Vadim Kharitonov
77f4dbfa10 [OptionsResolver] Remove Unused Variable from Foreach Cycles 2015-03-03 17:59:03 +03:00
Dariusz Ruminski
7fd6ba06b1 CS fixes 2015-03-02 15:15:25 +01:00
Tobias Schultze
cb37fbe707 [OptionsResolver] fix allowed values with null 2015-03-01 03:42:24 +01:00
Tobias Schultze
e3e9a4d269 [OptionsResolver] add missing deprecated phpdoc for setNormalizers 2015-03-01 03:08:17 +01:00
Nicolas Grekas
c9da1ae73f Merge branch '2.3' into 2.6
* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:23 +01:00
Fabien Potencier
e0ba4d65af bug #13744 minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource (bijibox)
This PR was merged into the 2.3 branch.

Discussion
----------

minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource

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

FileResource and tests update

Commits
-------

87800ae minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
2015-02-25 12:39:01 +01:00
Fabien Potencier
46d05ecad4 bug #13708 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping (phansys)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping

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

Inverted path and location directives for x-accel-mapping header (fixes #13502).

Before:
```proxy_set_header X-Accel-Mapping /internal/=/var/www/example.com/```

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```

It could be a BC break since the response will fail if someone sends this header
honoring the previous signature, thus I need some feedback in order to choose the right branch for this change.

Commits
-------

9f9f230 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 12:23:04 +01:00
Fabien Potencier
7d6c7a3cef bug #13767 [HttpKernel] Throw double-bounce exceptions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Throw double-bounce exceptions

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

Commits
-------

0ebcf63 [HttpKernel] Throw double-bounce exceptions
2015-02-25 12:22:04 +01:00
Fabien Potencier
ab7b3a8119 bug #13769 [Form] NativeRequestHandler file handling fix (mpajunen)
This PR was squashed before being merged into the 2.3 branch (closes #13769).

Discussion
----------

[Form] NativeRequestHandler file handling fix

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

`NativeRequestHandler` reused the local variable for the form name `$name` as a loop variable for processing the `$_FILES` array. A separate variable is now used.

Two new test cases are included:
- Handling a request with multiple files
- Handling a request with file upload and a nameless form

Both tests fail without the fix. The test cases could probably be better though.

Commits
-------

9b3421f [Form] NativeRequestHandler file handling fix
2015-02-25 09:33:53 +01:00
Mikael Pajunen
9b3421f18a [Form] NativeRequestHandler file handling fix 2015-02-25 09:33:49 +01:00
Nicolas Grekas
46bea3ab30 [VarDumper] Workaround stringy numeric keys 2015-02-25 09:21:12 +01:00
Nicolas Grekas
0ebcf639c3 [HttpKernel] Throw double-bounce exceptions 2015-02-24 20:09:42 +01:00
Nicolas Grekas
76e736eeb7 [minor] composer.json fix 2015-02-24 14:39:59 +01:00
Nicolas Grekas
decd82eef7 Merge branch '2.3' into 2.6
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:39:25 +01:00
Nicolas Grekas
4a638a4269 [minor] composer.json fix 2015-02-24 14:38:15 +01:00
Nicolas Grekas
2f3692aca7 Merge branch '2.3' into 2.6
* 2.3:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  Enforce UTF-8 charset for core controllers

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
4a63bde710 Minor hot fix 2015-02-24 12:41:28 +01:00
Fabien Potencier
98bf339673 minor #13772 [2.3] require-dev PHPUnit bridge (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] require-dev PHPUnit bridge

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

Commits
-------

8b02796 [2.3] require-dev PHPUnit bridge
2015-02-24 12:37:24 +01:00
Markus Staab
935afe650a [PROCESS] make sure /dev/tty is readable
When using Process from Web-SAPI it is likely that the webserver user
doesn't has rights to use /dev/tty
2015-02-24 12:07:24 +01:00
Nicolas Grekas
8b02796e9e [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00
Fabien Potencier
7fb03e0942 bug #13733 [2.3][Process] Fixed PhpProcess::getCommandLine() result (francisbesset)
This PR was squashed before being merged into the 2.3 branch (closes #13733).

Discussion
----------

[2.3][Process] Fixed PhpProcess::getCommandLine() result

The `PhpProcess::getCommandLine()` return `null` if `PhpProcess::start()` was not called.

```php
$process = new PhpProcess(<<<PHP
<?php echo "foobar";
PHP
);

$process->getCommandLine(); // return null
$process->start();
$process->getCommandLine(); // return the PHP binary path
```

This PR fix the problem.

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

Commits
-------

d0f1d32 [2.3][Process] Fixed PhpProcess::getCommandLine() result
2015-02-24 09:27:08 +01:00
Francis Besset
d0f1d3236c [2.3][Process] Fixed PhpProcess::getCommandLine() result 2015-02-24 09:27:06 +01:00
Arnaud Kleinpeter
11b2a9bfde [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments 2015-02-21 18:28:56 +01:00
Tobias Schultze
d1c8c5d22f [PropertyAccess] unify and fix doc 2015-02-21 16:36:02 +01:00
Tobias Schultze
f9ddaebe09 [PropertyAccess] use data provider for isReadable/isWritable tests 2015-02-21 13:54:33 +01:00
Tobias Schultze
eabad39dd5 Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
2015-02-21 13:49:08 +01:00
Nikita Starshinov
87800ae47e minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource 2015-02-19 17:18:47 +03:00
Tobias Schultze
9cacecbf79 [PropertyAccess] the property path constructor already implements the type check 2015-02-19 13:40:39 +01:00
Tobias Schultze
4e11c0710b [PropertyAccess] refactor type checks to remove duplicate logic
and thus improve performance
2015-02-19 13:30:42 +01:00
Jakub Zalas
8299a44c27 [Security] Fix expectation in a test. 2015-02-19 09:39:13 +00:00
Johnson Page
1ae9f9ca0f [HttpFoundation] Fix getHost and getPort functions in docblock 2015-02-19 09:08:04 +01:00
Dariusz Ruminski
5c9835f230 FilesLoader - fix git conflict 2015-02-18 08:07:05 +01:00
Grégoire Pineau
cbec76c099 [VarDumper] Ignore /vendor/ directory in git 2015-02-17 17:54:47 +01:00
Wouter J
e45d514bfc Small syntax fix 2015-02-17 14:25:32 +01:00
Arnaud Kleinpeter
06a42e12e2 [Console] fix assertion in testGetOptionDefaults
The default values expected n the test were not exactly the same as what is actually returned.
2015-02-17 14:04:06 +01:00
Javier Spagnoletti
9f9f2300d7 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | kinda
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #13502
| License       | MIT
| Doc PR        | n/a

fixes #13502

Inverted path and location directives for x-accel-redirect header

Before:
```proxy_set_header X-Accel-Mapping /internal/=/var/www/example.com/```

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```
2015-02-16 14:04:09 -03:00
Artur Eshenbrener
89ca585185 Changed return type definition for some methods of NodeDefinition 2015-02-16 10:51:32 +01:00
Fabien Potencier
e18d2ad80d minor #13645 fixed possible race condition when creating a directory (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed possible race condition when creating a directory

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

Commits
-------

8542866 fixed possible race condition when creating a directory
2015-02-16 10:48:41 +01:00
Fabien Potencier
ee47901456 bug #13618 [PropertyAccess] Fixed invalid feedback -> foodback singularization (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Fixed invalid feedback -> foodback singularization

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

Commits
-------

bc50125 Fixed invalid feedback -> foodback singularization
2015-02-16 10:25:34 +01:00
Fabien Potencier
90b028bea7 minor #13691 [Console] Added a little explaination about Command#interact() (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #13691).

Discussion
----------

[Console] Added a little explaination about Command#interact()

This has confused some long time Symfony users recently: https://twitter.com/jmolivas/status/566283453264850945

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

Commits
-------

38e7b72 [Console] Added a little explaination about Command#interact()
2015-02-16 10:09:41 +01:00
Wouter J
38e7b72371 [Console] Added a little explaination about Command#interact() 2015-02-16 10:09:39 +01:00
Thomas Schulz
9aece5a33e [Finder] Fixed typo in phpdoc comment 2015-02-15 15:36:33 +01:00
Thomas Schulz
a025dea06e Fix dump.name for Windows file paths
Wrong variables were used in line 118 ($file -> $name)
2015-02-14 23:44:52 +01:00
Fabien Potencier
2cca8617b9 fixed a test 2015-02-12 12:03:23 +01:00
Fabien Potencier
5f6d235a69 removed redundant phpdocs 2015-02-11 14:35:55 +01:00
Fabien Potencier
5ce1dc383c minor #12201 [Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading

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

Commits
-------

85d464a [Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading
2015-02-11 14:32:27 +01:00
ryunosuke
a642e4b9f1 [Console] fixed ArrayInput, if array contains 0 key. 2015-02-11 11:33:23 +01:00
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
Jakub Zalas
f82193db99 [FrameworkBundle] Fix title and placeholder rendering in php form templates. 2015-02-10 17:14:04 +00:00
Fabien Potencier
8542866dde fixed possible race condition when creating a directory 2015-02-10 16:07:19 +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
Дмитрий Пацура
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
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
Stefan Hüsges
1c62eb77e0 [Console] Fixed output bug, if escaped string in a formatted string. 2015-02-08 08:25:54 +01:00
Christian Schmidt
eabc5d8e92 “console help” ignores --raw option 2015-02-08 08:19:48 +01:00
WouterJ
bc501259d1 Fixed invalid feedback -> foodback singularization 2015-02-07 11:37:57 +01: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
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
Alex Pott
4d22bf7f72 [YAML] Fix one-liners to work with multiple new lines 2015-02-05 08:14:20 +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
Oskar Stark
d44ff2a135 fixxed order of usage 2015-02-05 07:29:49 +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
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
Adrian Philipp
7dbf61515b Fixes small typo. 2015-02-04 15:20:07 +01:00
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
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
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