Commit Graph

18421 Commits

Author SHA1 Message Date
Fabien Potencier
51aa13ad6d Merge branch '2.3' into 2.5
* 2.3:
  [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
  [Config] fixes broken unit test on ArrayNode class.
  fixed CS
  [Security] Delete old session on auth strategy migrate
  update required minimum TwigBridge version
  Very minor grammar fix in error message
  [Tests] Silenced all deprecations in tests for 2.3
  BinaryFileResponse - add missing newline
  fixed CS
  add a limit and a test to FlattenExceptionTest.
  CS: There should be no empty lines following phpdocs
  [FrameworkBundle] fix cache:clear command
  [2.3] Docblocks should not be followed by a blank line
  Fix return phpdoc
  [PropertyAccess] Added test to verify #5775 is fixed

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
2014-12-20 17:01:23 +01:00
Fabien Potencier
405b881d86 minor #12964 [PropertyAccess] Added test to verify #5775 is fixed (aboks)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Added test to verify #5775 is fixed

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

Added regression test to verify #5775 has been fixed some time ago, so that it can be closed.

Commits
-------

45651c6 [PropertyAccess] Added test to verify #5775 is fixed
2014-12-20 16:49:05 +01:00
Fabien Potencier
1bb837e476 minor #13050 [Config] fixes broken unit test on ArrayNode class. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] fixes broken unit test on ArrayNode class.

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

Commits
-------

a7ee58a [Config] fixes broken unit test on ArrayNode class.
2014-12-20 13:59:28 +01:00
Fabien Potencier
6712a4ab30 minor #13051 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] adds missing « use » statement for InvalidTypeException type hint in documentation.

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

Commits
-------

e855424 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
2014-12-20 13:58:29 +01:00
Hugo Hamon
e855424768 [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. 2014-12-20 13:26:26 +01:00
Hugo Hamon
a7ee58a95a [Config] fixes broken unit test on ArrayNode class. 2014-12-20 13:23:01 +01:00
Fabien Potencier
901d1de344 bug #13048 [Security] Delete old session on auth strategy migrate (xelaris)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Delete old session on auth strategy migrate

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

As identified by @austinh in #13026 there are two sessions after authentication, since the previous session is migrated to a new one by ``session_regenerate_id``. This PR ensures the old session is been deleted immediately on migration.
I can't see any drawbacks, but if the change would break BC, another approach would be to add a new strategy like ``switch`` to enable instant deletion of the old session.

Commits
-------

5dd11e6 [Security] Delete old session on auth strategy migrate
2014-12-20 13:20:33 +01:00
Fabien Potencier
c5b906918d fixed CS 2014-12-20 12:33:01 +01:00
Fabien Potencier
b1ee67fb67 minor #13036 [Config] Very minor grammar fix in error message (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Very minor grammar fix in error message

It's just a tiny detail, but I found it important enough to submit a fix.

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

Commits
-------

1c65f36 Very minor grammar fix in error message
2014-12-20 12:32:34 +01:00
Fabien Potencier
3bfa40513f minor #13033 [Tests] Silenced all deprecations in tests for 2.3 (saro0h)
This PR was merged into the 2.3 branch.

Discussion
----------

[Tests] Silenced all deprecations in tests for 2.3

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

Also removed src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php as it was not running at all.

Commits
-------

ef4ae63 [Tests] Silenced all deprecations in tests for 2.3
2014-12-20 10:04:46 +01:00
Alexander Schwenn
5dd11e67a4 [Security] Delete old session on auth strategy migrate 2014-12-20 02:42:01 +01:00
Fabien Potencier
f79aa948e0 minor #13030 [TwigBundle] update required minimum TwigBridge version (xabbuh)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13030).

Discussion
----------

[TwigBundle] update required minimum TwigBridge version

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

To be able to use `Twig_SimpleFunction` in `AssetsExtension`, Twig has
to be present in version 1.12 or higher. The TwigBridge only enforces
this Twig version as of version 2.3.10.

Commits
-------

cb351a6 update required minimum TwigBridge version
2014-12-19 16:27:51 +01:00
Christian Flothmann
cb351a6c1a update required minimum TwigBridge version
To be able to use `Twig_SimpleFunction` in `AssetsExtension`, Twig has
to be present in version 1.12 or higher. The TwigBridge only enforces
this Twig version as of version 2.3.10.
2014-12-19 16:27:51 +01:00
Wouter J
1c65f36254 Very minor grammar fix in error message 2014-12-19 12:33:33 +01:00
sarah khalil
ef4ae63e8a [Tests] Silenced all deprecations in tests for 2.3 2014-12-18 20:00:19 +01:00
Fabien Potencier
2f53d69fa4 minor #13024 CS: BinaryFileResponse - add missing newline (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: BinaryFileResponse - add missing newline

Commits
-------

9bbf803 BinaryFileResponse - add missing newline
2014-12-18 02:56:38 +01:00
Dariusz Rumiński
9bbf803a5c BinaryFileResponse - add missing newline 2014-12-18 00:15:53 +01:00
Fabien Potencier
980c124c99 fixed CS 2014-12-17 22:41:08 +01:00
Fabien Potencier
aace2c6ee5 bug #12999 [FrameworkBundle] fix cache:clear command (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] fix cache:clear command

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

Reading comment on #12893 stating that using absolute paths works around the pb, I tried using realpath(),
and it works!
Pending work on #12955 can be done quietly now.

Commits
-------

a14153a [FrameworkBundle] fix cache:clear command
2014-12-17 22:38:55 +01:00
Fabien Potencier
ba9266f3f2 bug #13004 add a limit and a test to FlattenExceptionTest. (Daniel Wehner)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13004).

Discussion
----------

add a limit and a test to FlattenExceptionTest.

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

Commits
-------

c6bcf05 add a limit and a test to FlattenExceptionTest.
2014-12-17 22:36:26 +01:00
Daniel Wehner
c6bcf05287 add a limit and a test to FlattenExceptionTest. 2014-12-17 22:36:26 +01:00
Fabien Potencier
3a35beca0b minor #13011 CS: There should be no empty lines following phpdocs (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: There should be no empty lines following phpdocs

Commits
-------

143f900 CS: There should be no empty lines following phpdocs
2014-12-17 07:25:30 +01:00
Dariusz Rumiński
143f900a52 CS: There should be no empty lines following phpdocs 2014-12-16 23:59:16 +01:00
Fabien Potencier
b2e0a803a6 minor #12998 [2.5] Test components using their lowest possible deps (nicolas-grekas, fabpot)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Test components using their lowest possible deps

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

Follow up of #12542

Commits
-------

b1b5cca Test lowest versions of dependencies
88d524e Merge remote-tracking branch 'symfony/2.3' into lowest-25
206ebc7 minor #12542 Test components using their lowest possible deps (nicolas-grekas)
25fef27 Test components using their lowest possible deps
2014-12-16 16:30:07 +01:00
Nicolas Grekas
b1b5cca41c Test lowest versions of dependencies 2014-12-16 16:17:56 +01:00
Nicolas Grekas
a14153a4fd [FrameworkBundle] fix cache:clear command 2014-12-16 12:29:05 +01:00
Fabien Potencier
dbfe5caf1c minor #12985 [HttpFoundation] Fix return phpdoc (Koc)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix return phpdoc

| Q             | A
| ------------- | ---
| Bug fix?      | tiny (for IDE autocompletion)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

What about using `self` or `static` keyword for this?

Commits
-------

9af2d81 Fix return phpdoc
2014-12-16 05:04:11 +01:00
Fabien Potencier
5c54b69323 minor #12993 [2.3] Docblocks should not be followed by a blank line (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #12993).

Discussion
----------

[2.3] Docblocks should not be followed by a blank line

| 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

There should be no blank line(s) between phpdocs that document properties, interfaces, classes, functions, or traits. This pull request was a test run of a new php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/864.

Commits
-------

4e7ba1b [2.3] Docblocks should not be followed by a blank line
2014-12-16 05:02:47 +01:00
Graham Campbell
4e7ba1bd72 [2.3] Docblocks should not be followed by a blank line 2014-12-16 05:02:46 +01:00
Nicolas Grekas
88d524e541 Merge remote-tracking branch 'symfony/2.3' into lowest-25
* symfony/2.3:
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
2014-12-15 19:38:14 +01:00
Konstantin.Myakshin
9af2d8113e Fix return phpdoc 2014-12-15 14:01:09 +02:00
Fabien Potencier
206ebc7844 minor #12542 Test components using their lowest possible deps (nicolas-grekas)
This PR was squashed before being merged into the 2.3 branch (closes #12542).

Discussion
----------

Test components using their lowest possible deps

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

Once https://github.com/composer/composer/pull/3450 is merged, we'll see if our deps are correct, and ensure that is kept over time by testing each component with its lowest possible deps.

Commits
-------

25fef27 Test components using their lowest possible deps
2014-12-15 11:45:20 +01:00
Nicolas Grekas
25fef27753 Test components using their lowest possible deps 2014-12-15 11:45:17 +01:00
Fabien Potencier
98c8ec1cbc minor #12967 Fix failing tests after merge (xabbuh, nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

Fix failing tests after merge

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

https://github.com/symfony/symfony/pull/12967/files?w=1

Commits
-------

9b96373 Fix failing tests after merge
6638535 fix ocramius/proxy-manager dependency version
2014-12-13 10:19:48 +01:00
Nicolas Grekas
9b96373d10 Fix failing tests after merge 2014-12-13 10:17:07 +01:00
Christian Flothmann
6638535977 fix ocramius/proxy-manager dependency version
Symfony 2.5 and higher requires ocramius/proxy-manager 0.4.0 or
higher.
2014-12-13 10:17:04 +01:00
Fabien Potencier
2874a429b0 Merge branch '2.3' into 2.5
* 2.3:
  remove short array syntax
  fix session restart on PHP 5.3
2014-12-13 09:38:28 +01:00
Fabien Potencier
503c7608ab minor #12962 [SecurityBundle] remove short array syntax (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[SecurityBundle] remove short array syntax

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

The short array syntax was introduced in PHP 5.4 and therefore leads
to failing tests when executed in PHP 5.3 environments.

Commits
-------

697ce4d remove short array syntax
2014-12-13 09:38:09 +01:00
Arnout Boks
45651c6e54 [PropertyAccess] Added test to verify #5775 is fixed 2014-12-12 23:14:04 +01:00
Christian Flothmann
697ce4d794 remove short array syntax
The short array syntax was introduced in PHP 5.4 and therefore leads
to failing tests when executed in PHP 5.3 environments.
2014-12-12 19:44:55 +01:00
Fabien Potencier
e38b8e68bb bug #12961 fix session restart on PHP 5.3 (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

fix session restart on PHP 5.3

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

this also removes some useless code

Commits
-------

b9d3c92 fix session restart on PHP 5.3
2014-12-12 19:12:22 +01:00
Tobias Schultze
b9d3c92ca9 fix session restart on PHP 5.3
this also removes some useless code
2014-12-12 18:30:52 +01:00
Nicolas Grekas
76c35089c5 Merge branch '2.3' into 2.5
* 2.3:
  [SecurityBundle] Firewall providers building - code cleaning
  [Filesystem] symlink use RealPath instead LinkTarget
  Fixed the AuthenticationProviderInterface alignment
  Fixed the proxy-manager version constraint

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2014-12-12 16:58:22 +01:00
Fabien Potencier
1cd4d4804e bug #12548 [Form] fixed a maxlength overring on a guessing (origaminal)
This PR was squashed before being merged into the 2.5 branch (closes #12548).

Discussion
----------

[Form] fixed a maxlength overring on a guessing

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

Commits
-------

7248680 [Form] fixed a maxlength overring on a guessing
2014-12-12 08:47:05 +01:00
origaminal
7248680eba [Form] fixed a maxlength overring on a guessing 2014-12-12 08:47:01 +01:00
Fabien Potencier
2a46e31a3b minor #12453 [Debug] Show only unique class candidates (hason)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #12453).

Discussion
----------

[Debug] Show only unique class candidates

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

```
PHPUnit 4.3.5 by Sebastian Bergmann.

Configuration read from .../symfony/phpunit.xml.dist

S....S.............................FFFS.......

Time: 2.29 seconds, Memory: 8.50Mb

There were 3 failures:

1) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #2 (array(1, 12, 'foo.php', 'Class \'UndefinedFunctionException\' not found'), 'Attempted to load class "UndefinedFunctionException" from the global namespace.
Did you forget a "use" statement for "Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "UndefinedFunctionException" from the global namespace.
-Did you forget a "use" statement for "Symfony\Component\Debug\Exception\UndefinedFunctionException"?
+Did you forget a "use" statement for e.g. "Symfony\Component\Debug\Exception\UndefinedFunctionException" or "Symfony\Component\Debug\Exception\UndefinedFunctionException"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28

2) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #3 (array(1, 12, 'foo.php', 'Class \'PEARClass\' not found'), 'Attempted to load class "PEARClass" from the global namespace.
Did you forget a "use" statement for "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "PEARClass" from the global namespace.
-Did you forget a "use" statement for "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?
+Did you forget a "use" statement for e.g. "Symfony_Component_Debug_Tests_Fixtures_PEARClass" or "Symfony_Component_Debug_Tests_Fixtures_PEARClass"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28

3) Symfony\Component\Debug\Tests\FatalErrorHandler\ClassNotFoundFatalErrorHandlerTest::testClassNotFound with data set #4 (array(1, 12, 'foo.php', 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found'), 'Attempted to load class "UndefinedFunctionException" from namespace "Foo\\Bar".
Did you forget a "use" statement for "Symfony\\Component\\Debug\\Exception\\UndefinedFunctionException"?')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
 Attempted to load class "UndefinedFunctionException" from namespace "Foo\Bar".
-Did you forget a "use" statement for "Symfony\Component\Debug\Exception\UndefinedFunctionException"?
+Did you forget a "use" statement for e.g. "Symfony\Component\Debug\Exception\UndefinedFunctionException" or "Symfony\Component\Debug\Exception\UndefinedFunctionException"?

.../symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php:28
```

Commits
-------

db8a3ae [Debug] Show only unique class candidates
2014-12-12 08:45:04 +01:00
Martin Hasoň
db8a3ae1a7 [Debug] Show only unique class candidates 2014-12-12 08:45:04 +01:00
Fabien Potencier
39a3379842 minor #12400 [SecurityBundle] Firewall providers building - code cleaning (blanchonvincent)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12400).

Discussion
----------

[SecurityBundle] Firewall providers building - code cleaning

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | https://github.com/symfony-fr/symfony-docs-fr/pull/609

It seems old code to build firewall provider still exist in the SecurityExtension. The `In-Memory` and `Entity` providers are handled in their own factories.

Commits
-------

c3c904d [SecurityBundle] Firewall providers building - code cleaning
2014-12-12 08:32:09 +01:00
blanchonvincent
c3c904d01f [SecurityBundle] Firewall providers building - code cleaning 2014-12-12 08:32:08 +01:00
Fabien Potencier
b0ab6878ed minor #12917 [2.3] [Security] Fixed The AuthenticationProviderInterface Alignment (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [Security] Fixed The AuthenticationProviderInterface Alignment

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

##### This pull request fixes the AuthenticationProviderInterface alignment.

Everything was indented by one too many spaces.

Commits
-------

1270327 Fixed the AuthenticationProviderInterface alignment
2014-12-12 08:20:57 +01:00