Commit Graph

20133 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
Fabien Potencier
15cac12fd7 minor #14076 CS: fixes (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

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

Update after releasing PHP CS Fixer 1.6.

To keep fabbot.io happy ;)

Commits
-------

11e3a9e CS: fixes
2015-03-27 11:13:01 +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
Fabien Potencier
8593b90465 minor #14041 Translator component has default domain for null implemented (Tobion)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14041).

Discussion
----------

Translator component has default domain for null implemented

no need to have default translation domain logic in 3 different places

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

Commits
-------

ccd32d5 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
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
d5673c2028 minor #14047 [travis] Kill tests when a new commit has been pushed (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Kill tests when a new commit has been pushed

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

Commits
-------

e29f74e [travis] Kill tests when a new commit has been pushed
2015-03-26 13:41:58 +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
c1c648e3d9 minor #14031 [2.3] [SecurityBundle] removed a duplicated service definition and simplified others. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [SecurityBundle] removed a duplicated service definition and simplified others.

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

Commits
-------

f24c8ab [SecurityBundle] removed a duplicated service definition and simplified others.
2015-03-25 20:42:31 +01:00
Nicolas Grekas
e29f74e114 [travis] Kill tests when a new commit has been pushed 2015-03-25 16:40:46 +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
Fabien Potencier
ec4e9d2fc7 minor #14028 [Security] [Core] String utils refactor (sarciszewski, ircmaxell)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #14028).

Discussion
----------

[Security] [Core] String utils refactor

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

This supersedes #13984 (it includes it, but also includes additional refactoring).

Since length information is leaked in any case, preventing unnecessary duplication of secrets is important. Since casting will *always* make a copy, we only cast if absolutely necessary. Additionally, appending will create a new copy of the secret, so we avoid doing that, but instead only iterate over the minimum of the two strings.

Commits
-------

45cfb44 Change behavior to mirror hash_equals() returning early if there is a length mismatch
8269589 CS fixing
bdea4ba Prevent modifying secrets as much as possible
76b36d3 Update StringUtils.php
7221efc Whitespace
56ed71c Update StringUtils.php
2015-03-25 10:28:01 +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
Fabien Potencier
7e2a8b7663 bug #14046 [Security] StringUtils::equals() arguments in RememberMe Cookie based implementation are confused (zerkms)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14046).

Discussion
----------

[Security] StringUtils::equals() arguments in RememberMe Cookie based implementation are confused

It must be the other way around

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

Reference:

https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Security/Core/Util/StringUtils.php#L34

Commits
-------

ea8da6e StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
2015-03-25 09:38:47 +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
Fabien Potencier
2f726ef95c minor #14037 CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline

| 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

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

Commits
-------

6a16d91 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:55:26 +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
Hugo Hamon
f24c8ab844 [SecurityBundle] removed a duplicated service definition and simplified others. 2015-03-23 23:38:21 +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
Fabien Potencier
e5e27afc99 bug #13991 [Dependency Injection] Improve PhpDumper Performance for huge Containers (BattleRattle)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13991).

Discussion
----------

[Dependency Injection] Improve PhpDumper Performance for huge Containers

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

After making public services private, the dumping of the DIC takes much longer. This is due to the reference lookup method. Using the visited lookup as reference speeds up the whole dump (in our case by a factor of ~40).

Some stats from our DIC:
before: 32 sec. for dumping
after: 0.9 sec.

Commits
-------

2cc5011 use visited lookup with reference to gain performance
2015-03-23 09:55:37 +01:00
Norman Soetbeer
2cc5011e2f use visited lookup with reference to gain performance 2015-03-23 09:55:31 +01:00
Fabien Potencier
39da732eb0 bug #13886 [FrameworkBundle][debug:config] added support for dynamic configurations... (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle][debug:config] added support for dynamic configurations...

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

Commits
-------

0f9eb7a [FrameworkBundle][debug:config] added support for dynamic configurations.
2015-03-23 09:38:04 +01:00
Fabien Potencier
eda1ab7841 minor #13971 [WebProfiler] Fix partial search on url in list (zerrvox)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfiler] Fix partial search on url in list

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

Removed the url type from the url form field as browser validation makes it impossible to do partial text search on the url as the browser will not submit the form because it does not validate as a url.

Commits
-------

c5f1f60 [WebProfiler] Fix partial search on url in list
2015-03-23 09:31:13 +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
Fabien Potencier
3b9127e55b minor #14019 [Process] Remove outdated docblock @return on Process->start() (johnkary)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14019).

Discussion
----------

[Process] Remove outdated docblock @return on Process->start()

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

The original commit that introduced fluent interface for `Process->start()` was https://github.com/symfony/symfony/pull/8723 before Symfony 2.4. I couldn't find exactly where in history the start() `return $this` line was removed but it's not in v2.4.0 or any other stable branch.

Docs do not show start() as having a fluent interface: http://symfony.com/doc/current/components/process.html

Targeting 2.6 as currently maintained version.

🚀

Commits
-------

02a1413 [Process] Fix outdated Process->start() docblock
2015-03-23 08:56:13 +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
Abdellatif Ait boudad
0f9eb7a79d [FrameworkBundle][debug:config] added support for dynamic configurations. 2015-03-22 10:17:36 +00: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
Fabien Potencier
9f77776345 bug #13997 [2.3+][Form][DoctrineBridge] Improved loading of entities and documents (guilhermeblanco)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3+][Form][DoctrineBridge] Improved loading of entities and documents

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

Commits
-------

529d99c Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
2015-03-21 18:54:04 +01:00
Fabien Potencier
6ef3b54ad3 minor #13999 Fix small coding style (nunorafaelrocha)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13999).

Discussion
----------

Fix small coding style

[Component] [Translation] [Tests] [PluralizationRulesTest.php] Remove extra space from `PluralizationRulesTest` class declaration.

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

Commits
-------

7d0bd63 Fix small coding style
2015-03-21 18:53:24 +01: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
Fabien Potencier
c73c34acaf minor #13993 [Form] fixed doc (issei-m)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13993).

Discussion
----------

[Form] fixed doc

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

Commits
-------

9c55731 [Form] fixed phpdoc
2015-03-21 18:46:19 +01:00