Commit Graph

10187 Commits

Author SHA1 Message Date
Fabien Potencier
442c633af4 Merge branch '2.3' into 2.5
* 2.3:
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Component/Console/Helper/TableHelper.php
2014-12-22 17:16:14 +01:00
Fabien Potencier
3892389c6d minor #13059 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.

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

Commits
-------

e22c887 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class.
2014-12-21 15:48:15 +01:00
Saro0h
5aa3ef465e [Security] Fixed tests 2014-12-21 13:39:03 +01:00
Hugo Hamon
e22c887799 [Debug] use ternary operator to simplify the getClassLoader() method in DebugClassLoader class. 2014-12-21 12:42:01 +01:00
Saro0h
2ca438deb6 [FrameworkBundle] Fixed Translation loader and update translation command. 2014-12-21 12:33:47 +01:00
Hugo Hamon
cdc5c5bb11 [Console] remove « use » statement for PHP built-in exception classes. 2014-12-21 11:19:40 +01:00
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
Alexander Schwenn
5dd11e67a4 [Security] Delete old session on auth strategy migrate 2014-12-20 02:42:01 +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
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
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
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
Nicolas Grekas
25fef27753 Test components using their lowest possible deps 2014-12-15 11:45:17 +01:00
Nicolas Grekas
9b96373d10 Fix failing tests after merge 2014-12-13 10:17:07 +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
Arnout Boks
45651c6e54 [PropertyAccess] Added test to verify #5775 is fixed 2014-12-12 23:14:04 +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
Martin Hasoň
db8a3ae1a7 [Debug] Show only unique class candidates 2014-12-12 08:45:04 +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
Fabien Potencier
122e117264 bug #12761 [Filesystem] symlink use RealPath instead LinkTarget (aitboudad)
This PR was squashed before being merged into the 2.3 branch (closes #12761).

Discussion
----------

[Filesystem] symlink use RealPath instead LinkTarget

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

Commits
-------

a8b8d33 [Filesystem] symlink use RealPath instead LinkTarget
2014-12-12 08:08:40 +01:00
Abdellatif Ait boudad
a8b8d33e94 [Filesystem] symlink use RealPath instead LinkTarget 2014-12-12 08:08:37 +01:00
Fabien Potencier
e1e4cfcc7b bug #12848 [EventDispatcher] Fixed #12845 adding a listener to an event that is currently being dispatched (Pieter Jordaan)
This PR was merged into the 2.5 branch.

Discussion
----------

[EventDispatcher] Fixed #12845 adding a listener to an event that is currently being dispatched

[EventDispatcher] Fixed adding listener when event is currently being dispatched

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

Commits
-------

0cbc2b0 Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
2014-12-12 08:00:19 +01:00
Fabien Potencier
b9f0dd1254 minor #12951 [Console] terminals are not interactive on Travis (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] terminals are not interactive on Travis

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

You cannot assume that the input is always interactive when the tests
for the `Application` class are executed. The expected value depends
on the terminal being interactive.

Commits
-------

d58ac9e terminals are not interactive on Travis
2014-12-12 07:55:42 +01:00
Schuyler Jager
e3a4cdca48 [DependencyInjection] Remove duplicate declaration in PhpDumper 2014-12-12 07:02:03 +01:00
Christian Flothmann
d58ac9ec08 terminals are not interactive on Travis
You cannot assume that the input is always interactive when the tests
for the `Application` class are executed. The expected value depends
on the terminal being interactive.
2014-12-11 21:21:50 +01:00
Fabien Potencier
7e573f4f8a Merge branch '2.3' into 2.5
* 2.3:
  Revert "[DependencyInjection] backport perf optim"
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  [2.3] Remove possible call_user_func()

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-12-11 20:53:06 +01:00
Fabien Potencier
b9512b6993 minor #12531 [2.5] Remove possible call_user_func() (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] Remove possible call_user_func()

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

Remove possible call_user_func() introduced in 2.5

Commits
-------

94a04cb [2.5] Remove possible call_user_func()
2014-12-11 19:59:58 +01:00
Fabien Potencier
c87a661e83 minor #12529 [2.3] Remove possible call_user_func() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Remove possible call_user_func()

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

Merging this in 2.3 enhances performance a bit, but more importantly will ease future merges into 3.0.

Commits
-------

fad7aba [2.3] Remove possible call_user_func()
2014-12-11 19:57:00 +01:00