Commit Graph

21246 Commits

Author SHA1 Message Date
ogizanagi
6a0308d752 [Console] Fix QuestionHelperTest
- When using the `InputInterface` mock with interactive option, asking a
  ChoiceQuestion without specifying max attempts nor a default value led
to an infinite loop when invalid values are submitted. In case there is
something wrong in tests, it wasn't obvious to understand what's
happening, as the process was constantly waiting for inputs.
- `testAmbiguousChoiceFromChoicelist` test was wrong as the
  autocompleter filled the value and the test was never triggered (+max
attempt issue).
2015-05-16 15:01:31 +02:00
Fabien Potencier
294cbb7521 fixed typo 2015-05-16 14:34:16 +02:00
Fabien Potencier
1b401b83eb minor #14601 [Security][Translation] fixes #14584 (MatTheCat)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security][Translation] fixes #14584

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

Some french translations are wrong  in the security component.
As #14587 has been closed here's my fix.

Commits
-------

34c780f [Security][Translation] fixes #14584
2015-05-16 14:17:29 +02:00
ogizanagi
03e4ab609b [Console] Fix first choice was invalid when using value
Using question helper and choices questions:
- first choice was not selectable by value.
- ChoiceList with associative choices with mixed string and int keys has same issue with first choice. Add test for all choices.
- Fix inconsistency by always returning values as strings
2015-05-15 16:46:10 +02:00
Fabien Potencier
87fa40ee54 bug #14644 [Bridge\Twig] Adding a space between the icon and the error message (zmikael, nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Bridge\Twig] Adding a space between the icon and the error message

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

Commits
-------

d0f6342 [Form] Test for space in AbstractBootstrap3LayoutTest::testErrors
7a1fac2 Adding a space between the icon and the error message
2015-05-15 16:18:15 +02:00
Fabien Potencier
5ea91e9ff2 minor #14646 Update README.md (94noni)
This PR was merged into the 2.3 branch.

Discussion
----------

Update README.md

See https://github.com/symfony/symfony/pull/14347
@ping @nicolas-grekas

Commits
-------

ec89cfd Update README.md
2015-05-15 16:16:38 +02:00
Fabien Potencier
0542a17b5b minor #14581 [Security] Removed unnecessary statement (MacDada)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Removed unnecessary statement

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

Removed unnecessary statement from `PersistentTokenBasedRememberMeServices.php`.

`$series` comes from `$cookieParts` and `$this->tokenProvider->loadTokenBySeries($series);` is supposed to find the token with that value. Doing `$persistentToken->getSeries();` should give us exactly the same value, so it is an unnecessary statement.

Why?

* We don't need it? We won't miss it when it's gone.
* It confuses a code reader who starts guessing why would that be needed (at least I did and lost time because of that).

Unless…

It actually is needed, as we want `TokenProviderInterface` implementations to have a possibility to give a `PersistentTokenInterface` with a different series value than asked… I can make a PR to the testing class so that such requirement is checked upon.

I don't believe that this is BC, as this behaviour isn't documented anywhere and no existing (known to me) implementations return different series than the asked ones (and current tests pass successfully).

Commits
-------

c7a91f1 Removed unnecessary statement from PersistentTokenBasedRememberMeServices.php
2015-05-15 16:12:58 +02:00
Antoine Makdessi
ec89cfd226 Update README.md 2015-05-15 16:06:52 +02:00
Fabien Potencier
0c613fbcea bug #14645 [WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7 (GromNaN)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7

The WebProfilerBundle version 2.7 is supposed to be compatible with HttpKernel 2.4, but the template of the config profile uses a property `symfonyState` that has been added in Symfony 2.7 by #13626.

> Twig_Error_Runtime: Method "symfonyState" for object "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" does not exist in "@WebProfiler/Collector/config.html.twig" at line 12

This fix makes the property optional.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/pull/63
| License       | MIT

Commits
-------

700fcf1 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
2015-05-15 16:03:58 +02:00
Fabien Potencier
d883ba0984 fixed CS 2015-05-15 16:02:48 +02:00
Fabien Potencier
c658fcdbca Merge branch '2.6' into 2.7
* 2.6:
  fixed CS
  fixed CS

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-05-15 15:53:44 +02:00
Fabien Potencier
0678b3e6f8 fixed CS 2015-05-15 15:53:19 +02:00
Fabien Potencier
e83db434a2 Merge branch '2.3' into 2.6
* 2.3:
  fixed CS
2015-05-15 15:45:20 +02:00
Fabien Potencier
34d83a70b3 fixed CS 2015-05-15 15:45:10 +02:00
Fabien Potencier
c5fe926f40 minor #14591 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands

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

Min dependency on `symfony/console` is changed to `~2.7` in the FrameworkBundle, as it will be a requirement in order to update each command provided in this bundle.

Commits
-------

e56a619 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
2015-05-15 15:35:53 +02:00
Fabien Potencier
e13373ec11 Merge branch '2.6' into 2.7
* 2.6:
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Component/Finder/Expression/Glob.php
2015-05-15 15:33:16 +02:00
Fabien Potencier
fcfc876c5b Merge branch '2.3' into 2.6
* 2.3:
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
2015-05-15 15:32:45 +02:00
Nicolas Grekas
d0f63429b0 [Form] Test for space in AbstractBootstrap3LayoutTest::testErrors 2015-05-15 15:29:32 +02:00
Jérôme Tamarelle
700fcf1871 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7 2015-05-15 15:29:11 +02:00
Fabien Potencier
984d82cbe5 minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Pre incrementation/decrementation should be used if possible

| 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

Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1113

If this pr is merged I would change the level of the fixer to `symfony`.

Commits
-------

c5123d6 CS: Pre incrementation/decrementation should be used if possible
2015-05-15 15:28:34 +02:00
Fabien Potencier
fcebef3f8a minor #14642 [Validator] Deprecated PHP7-incompatible constraints and related validators (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Deprecated PHP7-incompatible constraints and related validators

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

Commits
-------

a3fc6b9 [Validator] Deprecated PHP7-incompatible constraints and related validators
2015-05-15 15:21:56 +02:00
Fabien Potencier
525c149f92 bug #14640 [DebugBundle] Allow alternative destination for dumps (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] Allow alternative destination for dumps

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

This PR fixes #14608 by adding a new `debug.dump_destination` configuration option to give users control over a stream destination where dumps will be written to.
In HTTP mode, dumps are still/also collected in the toolbar.
This supersedes #14627, #14631 and #14373

Commits
-------

5f255e5 [DebugBundle] Allow alternative destination for dumps
5368483 [DebugBundle] Use output mechanism of dumpers instead of echoing
8cb2abb [DebugBundle] Always collect dumps
2015-05-15 15:19:37 +02:00
Fabien Potencier
ebe78bb9ef minor #14598 [Security] Fix tests in HHVM (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix tests in HHVM

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

This PR fixes the tests in the Security components when run in HHVM. The failing tests are related to sebastianbergmann/phpunit-mock-objects#207

Commits
-------

139bae7 Fix tests in HHVM
2015-05-15 15:13:27 +02:00
Nicolas Grekas
c477c5b395 bug #14600 [Console] SymfonyStyle: fix block rpadding when escaping '<' (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] SymfonyStyle: fix block rpadding when escaping '<'

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

![screenshot 2015-05-10 a 20 37 46](https://cloud.githubusercontent.com/assets/2211145/7555745/4dfbfd58-f755-11e4-98c4-3c42bb71abd3.PNG)

Commits
-------

80fc341 [Console] SymfonyStyle: fix block rpadding when escaping '<'
2015-05-15 12:18:14 +02:00
Nicolas Grekas
a88103b6e2 minor #14620 [Console] fix code style (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] fix code style

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

Prevent fabbot from complaining when the `SymfonyStyle` class or the `StyleInterface` are modified (like, for example, [here](a144667d5f)).

Commits
-------

314901e [Console] fix code style
2015-05-15 12:15:13 +02:00
Nicolas Grekas
a3fc6b9fa9 [Validator] Deprecated PHP7-incompatible constraints and related validators 2015-05-15 12:10:43 +02:00
Nicolas Grekas
8622a7b22a Merge branch '2.6' into 2.7
* 2.6:
  [EventDispatcher] make listeners removable from an executed listener
  [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
  Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)

Conflicts:
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
2015-05-15 11:56:16 +02:00
Nicolas Grekas
1688b2ef4f Merge branch '2.3' into 2.6
* 2.3:
  Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)

Conflicts:
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Validator/CHANGELOG.md
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
2015-05-15 11:48:50 +02:00
Christophe Coevoet
da58ad74d5 minor #14228 Add PHP7 compatible versions for the Null/True/False constraints as they are reserved words in PHP7 (stefan.r)
This PR was merged into the 2.3 branch.

Discussion
----------

Add PHP7 compatible versions for the Null/True/False constraints as they are reserved words in PHP7

| Q             | A
| ------------- | ---
| Bug fix?      |  PHP7 compatibility
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | N/A
| Fixed tickets | N/A - helps towards https://github.com/symfony/symfony/issues/14086
| License       | MIT

Null, True and False are reserved words in PHP7:

https://wiki.php.net/rfc/reserve_more_types_in_php_7

Commits
-------

44edbdf Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
2015-05-15 11:24:48 +02:00
Nicolas Grekas
5f255e5059 [DebugBundle] Allow alternative destination for dumps 2015-05-15 10:09:58 +02:00
Nicolas Grekas
5368483d9a [DebugBundle] Use output mechanism of dumpers instead of echoing 2015-05-15 10:09:57 +02:00
Nicolas Grekas
8cb2abbd26 [DebugBundle] Always collect dumps 2015-05-15 09:50:22 +02:00
Fabien Potencier
ba719d18dd minor #14637 [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Lo… (vincentaubert)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Lo…

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

Commits
-------

5e8864d [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface"
2015-05-14 19:44:26 +02:00
Fabien Potencier
a7019ced63 Merge branch '2.3' into 2.6
* 2.3:
  [EventDispatcher] make listeners removable from an executed listener
  [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
2015-05-14 19:42:48 +02:00
Fabien Potencier
291cf61616 bug #14633 [2.3][EventDispatcher] make listeners removable from an executed listener (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][EventDispatcher] make listeners removable from an executed listener

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

This fixes #13972 for Symfony 2.3. On Symfony 2.6 and higher, this has already been fixed with #14355.

Commits
-------

54bb399 [EventDispatcher] make listeners removable from an executed listener
2015-05-14 19:40:02 +02:00
Christian Flothmann
030731aa1d [HttpKernel] trigger a deprecation warning when using the ContainerAwareHttpKernel 2015-05-14 17:55:34 +02:00
Christian Flothmann
54bb3995ab [EventDispatcher] make listeners removable from an executed listener 2015-05-14 17:38:12 +02:00
Vincent AUBERT
5e8864d44a [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface" 2015-05-14 17:18:08 +02:00
Fabien Potencier
52c78b9cb4 minor #14632 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()

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

Commits
-------

57571a9 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
2015-05-14 17:09:07 +02:00
Jakub Zalas
5930800cfd [HttpKernel] Handle an array vary header in the http cache store 2015-05-14 16:01:09 +01:00
Nicolas Grekas
57571a9612 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead() 2015-05-14 10:16:30 +02:00
Fabien Potencier
ec2df34115 bumped Symfony version to 2.7.0 2015-05-14 00:19:47 +02:00
Fabien Potencier
5cfcce37fa updated VERSION for 2.7.0-BETA2 2015-05-13 22:25:22 +02:00
Fabien Potencier
d0c07f3b7d updated CHANGELOG for 2.7.0-BETA2 2015-05-13 22:25:11 +02:00
Nicolas Grekas
b47b51187e Merge branch '2.6' into 2.7
* 2.6:
  fix missing links to https://symfony.com
  fix missing links to https://symfony.com
  [travis] Don't use the cache
  [DebugBundle] Remove inlined dumps on XHR

Conflicts:
	src/Symfony/Component/Security/Acl/README.md
	src/Symfony/Component/Security/Core/README.md
	src/Symfony/Component/Security/Csrf/README.md
	src/Symfony/Component/Security/Http/README.md
2015-05-13 13:34:46 +02:00
Nicolas Grekas
70e6a145c8 fix missing links to https://symfony.com 2015-05-13 13:33:56 +02:00
Nicolas Grekas
c70874d517 Merge branch '2.3' into 2.6
* 2.3:
  fix missing links to https://symfony.com
  [travis] Don't use the cache
2015-05-13 13:31:10 +02:00
Nicolas Grekas
b403edd1bc fix missing links to https://symfony.com 2015-05-13 13:31:01 +02:00
Nicolas Grekas
b25b11b842 minor #14626 [travis] Don't use the cache (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Don't use the cache

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

The composer cache breaks per components builds (deps=low/high)

Commits
-------

103c0df [travis] Don't use the cache
2015-05-13 13:22:46 +02:00
Nicolas Grekas
103c0dfeba [travis] Don't use the cache 2015-05-13 12:15:38 +02:00