Commit Graph

20691 Commits

Author SHA1 Message Date
Nicolas Grekas af6dcb233a Merge branch '2.7'
* 2.7: (29 commits)
  [Validator] Added missing Hungarian translation
  remove usage of deprecated class
  Fix merge
  Fix merge
  CS: fixes
  [Translation][Extractor] Allow extracting an array of files besides extracting a directory
  [VarDumper] Fix dumping ThrowingCasterException
  [Console][Table] Add support for colspan/rowspan + multiple header lines
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  Displays friendly message if the event does not have any registered listeners
  [VarDumper] Ctrl+click toggles-all and fix IE8 support
  Implemented check on interface implementation
  [Form] [TwigBridge] Bootstrap layout whitespace control
  |Validator] Add PHPUnit hint in AbstractConstraintValidatorTest
  [VarDumper] implement expand all on ALT+click
  [WebProfilerBundle] Fixed collapsed profiler menu icons
  [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
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
2015-03-30 10:41:59 +02:00
Nicolas Grekas 007386c5f2 Merge branch '2.6' into 2.7
* 2.6:
  remove usage of deprecated class

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
2015-03-30 10:18:42 +02:00
Fabien Potencier 89c82e5b63 minor #14095 [TwigBridge] don't mock a deprecated class (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] don't mock a deprecated class

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

Commits
-------

24a9d66 remove usage of deprecated class
2015-03-29 20:00:22 +02:00
Fabien Potencier 6ce03d3942 minor #14100 [Validator] Added missing Hungarian translation (1ed)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Added missing Hungarian translation

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

Commits
-------

c89b419 [Validator] Added missing Hungarian translation
2015-03-29 11:44:52 +02:00
Gábor Egyed c89b41908f [Validator] Added missing Hungarian translation 2015-03-28 19:44:20 +01:00
Christian Flothmann 24a9d66d87 remove usage of deprecated class 2015-03-28 17:22:38 +01:00
Nicolas Grekas d23b38ae7f Fix merge 2015-03-27 19:18:01 +01:00
Nicolas Grekas a41abf3d8f Merge branch '2.6' into 2.7
* 2.6:
  Fix merge
  [VarDumper] Fix dumping ThrowingCasterException

Conflicts:
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
2015-03-27 19:07:56 +01:00
Nicolas Grekas e5611d25dd Fix merge 2015-03-27 19:02:17 +01:00
Fabien Potencier aea7b93a94 bug #14074 [VarDumper] Fix dumping ThrowingCasterException (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix dumping ThrowingCasterException

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

This cleans up dumping ThrowingCasterException to what I really intended to dump since the beginning.

Commits
-------

9944589 [VarDumper] Fix dumping ThrowingCasterException
2015-03-27 13:12:20 +01:00
Fabien Potencier 8bee26f27a bug #14061 [WebProfilerBundle] Fixed collapsed profiler menu icons (1ed)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Fixed collapsed profiler menu icons

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

Added missing CSS and JS modifications from #13463

Commits
-------

51223d2 [WebProfilerBundle] Fixed collapsed profiler menu icons
2015-03-27 13:08:23 +01:00
Fabien Potencier eccfbe35a4 Merge branch '2.6' into 2.7
* 2.6:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [Form] [TwigBridge] Bootstrap layout whitespace control
  [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
  StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
2015-03-27 11:22:45 +01:00
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
Fabien Potencier b910e0621a feature #14002 [Translation][Extractor] Allow extracting an array of files besides extracting a directory (marcosdsanchez)
This PR was squashed before being merged into the 2.7 branch (closes #14002).

Discussion
----------

[Translation][Extractor] Allow extracting an array of files besides extracting a directory

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

Give ability to extractors to extract from an array of files a file, or a Traversable besides a directory.

The following commit adds the new feature to the following extractors:
PhpExtractor and TwigExtractor.
It also corrects the interface documentation to show the new options allowed as a parameter.

I found this change useful as I've got a custom translation:update command that instead of extracting from $rootPath. '/Resources/views/' it extracts from the files that git is showing as modified. The command usually runs much faster than the default as it only parses the needed files.

Commits
-------

9d6596c [Translation][Extractor] Allow extracting an array of files besides extracting a directory
2015-03-27 07:53:17 +01:00
Marcos Sánchez 9d6596c69b [Translation][Extractor] Allow extracting an array of files besides extracting a directory 2015-03-27 07:53:09 +01:00
Nicolas Grekas 9944589068 [VarDumper] Fix dumping ThrowingCasterException 2015-03-26 18:20:25 +01:00
Fabien Potencier 350f30b0e1 feature #13438 [Console][Table] Add support for colspan/rowspan + multiple header lines (aitboudad)
This PR was squashed before being merged into the 2.7 branch (closes #13438).

Discussion
----------

[Console][Table] Add support for colspan/rowspan + multiple header lines

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

This PR introduce a new feature described in #13368 and #13369,
I created a new class ```TableCell``` which can allow us to specify colspan/rowspan for each cell.
```php
$table->addRow([new TableCell("data", array('rowspan' => 1, 'colspan' => 2)), 'data']);
```

- [x] #13368 Add support for colspan/rowspan
- [x] #13369 Add support for multiple header lines
- [ ] add doc

Commits
-------

ed18767 [Console][Table] Add support for colspan/rowspan + multiple header lines
2015-03-26 17:59:59 +01:00
Abdellatif Ait boudad ed18767fbe [Console][Table] Add support for colspan/rowspan + multiple header lines 2015-03-26 17:59:57 +01:00
Fabien Potencier 156c4a254d feature #14070 removed all *.class parameters (fabpot)
This PR was merged into the 3.0-dev branch.

Discussion
----------

removed all *.class parameters

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

Commits
-------

8835d1a removed all *.class parameters
2015-03-26 17:50:21 +01:00
Fabien Potencier 8835d1af45 removed all *.class parameters 2015-03-26 16:34:43 +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 433f640247 minor #12216 [FrameworkBundle] [DX] Displays friendly message if the event does not have any registered listeners (matthieuauger)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #12216).

Discussion
----------

[FrameworkBundle] [DX] Displays friendly message if the event does not have any registered listeners

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

Currently if you run debug:event-dispatcher on an event without registered listeners, the output looks like this

![capture d ecran de 2014-10-13 00 43 26](https://cloud.githubusercontent.com/assets/1172099/4607814/486213e4-5261-11e4-93b3-6ef009c19a05.png)

This PR just add a friendly message like debug:container or debug:router :

![capture d ecran de 2014-10-13 00 44 38](https://cloud.githubusercontent.com/assets/1172099/4607819/7a28a01e-5261-11e4-9b07-d0ca36725da2.png)

Commits
-------

a5628bd Displays friendly message if the event does not have any registered listeners
2015-03-26 13:59:20 +01:00
Matthieu Auger a5628bdbe2 Displays friendly message if the event does not have any registered listeners 2015-03-26 13:59:20 +01:00
Fabien Potencier 8f1b757559 feature #14071 [VarDumper] Ctrl+click toggles-all and fix IE8 support (larsborn, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

 	[VarDumper] Ctrl+click toggles-all and fix IE8 support

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

I choose Ctrl+click instead of the initial Alt+click because after testing both on Windows and Ubuntu, Alt+click is bound by the Browser/OS for other things. Ctrl+click is OK.

Commits
-------

70f1f24 [VarDumper] Ctrl+click toggles-all and fix IE8 support
12c1feb [VarDumper] implement expand all on ALT+click
2015-03-26 13:55:48 +01:00
Nicolas Grekas 70f1f24fd0 [VarDumper] Ctrl+click toggles-all and fix IE8 support 2015-03-26 13:50:53 +01:00
Fabien Potencier 1ba939f2e6 minor #13482 Implemented check on interface implementation (jaytaph)
This PR was squashed before being merged into the 2.7 branch (closes #13482).

Discussion
----------

Implemented check on interface implementation

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

Commits
-------

2a79ace Implemented check on interface implementation
2015-03-26 13:47:28 +01:00
Joshua Thijssen 2a79ace826 Implemented check on interface implementation 2015-03-26 13:47:14 +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 b9836b20dd minor #14059 [DX]|Validator] Add PHPUnit hint in AbstractConstraintValidatorTest (lyrixx)
This PR was merged into the 2.7 branch.

Discussion
----------

[DX]|Validator] Add PHPUnit hint in AbstractConstraintValidatorTest

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

When one extends AbstractConstraintValidatorTest, If test fails
the output is not very easy to understand because all "magic"
is done in the parent class. So we have to read the code of the
parent class to understand what happened.

Commits
-------

bebca0b |Validator] Add PHPUnit hint in AbstractConstraintValidatorTest
2015-03-26 13:40:19 +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
Grégoire Pineau bebca0b1b1 |Validator] Add PHPUnit hint in AbstractConstraintValidatorTest
When one extends AbstractConstraintValidatorTest, If test fails
the output is not very easy to understand because all "magic"
is done in the parent class. So we have to read the code of the
parent class to understand what happened.
2015-03-26 10:49:35 +01:00
larsborn 12c1febd11 [VarDumper] implement expand all on ALT+click 2015-03-26 08:47:01 +01:00
Gábor Egyed 51223d28c6 [WebProfilerBundle] Fixed collapsed profiler menu icons 2015-03-25 22:46:51 +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 37c137acdd feature #13981 [Translation] merge all fallback catalogues messages into current catalo... (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation] merge all fallback catalogues messages into current catalo...

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

The amount of reduced memory depend on number of defined fallbacks and the size of messages.
For example if we defined 2 fallbacks and we have a large file like ~20 mb we save (~40 mb)
![selection_004](https://cloud.githubusercontent.com/assets/1753742/6737082/3af85be2-ce61-11e4-8104-4330944070cc.png)

Commits
-------

6eb5e73 [Translation] merge all fallback catalogues messages into current catalogue.
2015-03-25 11:10: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