Commit Graph

15814 Commits

Author SHA1 Message Date
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
13495c21a5 bug #13047 [FrameworkBundle][Logging Translator] skip if param "translator.logging" doesn't exist. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle][Logging Translator] skip if param "translator.logging" doesn't exist.

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

Commits
-------

1008991 skip if param "translator.logging" doesn't exist.
2014-12-20 16:31:58 +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
Abdellatif AitBoudad
10089914c6 skip if param "translator.logging" doesn't exist. 2014-12-20 00:51:43 +00: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
Christophe Coevoet
513ebffb7b Added the function providers as container resources
Changing the way an expression is compiled should invalidate the
container, so that the change is taken into account.
2014-12-19 12:14:17 +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
acb1b85b98 minor #13022 [DebugBundle] enable the DumpDataCollectorPass (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] enable the DumpDataCollectorPass

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

I forget to activate the `DumpDataCollectorPass` in #13009.

Commits
-------

cdb6c43 [DebugBundle] enable the DumpDataCollectorPass
2014-12-17 22:50:48 +01:00
Fabien Potencier
0a61aee21e bug #13021 [FrameworkBundle] skip compiler pass if interface doesn't exist (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] skip compiler pass if interface doesn't exist

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

The FrameworkBundle doesn't depend on the `symfony/translation`
component and therefore does not enforce a high enough version of this
package. Thus, with `symfony/translation` versions before `2.6`, the
`translator` service does exist, but the `TranslatorBagInterface` is
not present.

Commits
-------

beff6fa skip compiler pass if interface doesn't exist
2014-12-17 22:49:13 +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
6f81982ce9 bug #13013 Unify the way to provide expression functions for the DI container (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Unify the way to provide expression functions for the DI container

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

Function providers registered on the ContainerBuilder are now reused by the PhpDumper when dumping the container instead of forcing to register them again.
I consider it as a bugfix, because the hook introduced in 2.6 is currently unusable.

Commits
-------

8425e4d Unify the way to provide expression functions for the DI container
2014-12-17 22:33:39 +01:00
Christian Flothmann
cdb6c43565 [DebugBundle] enable the DumpDataCollectorPass 2014-12-17 21:23:23 +01:00
Abdellatif AitBoudad
c0925e4b39 [FrameworkBundle] Use debug namespace. 2014-12-17 21:16:04 +01:00
Christian Flothmann
584777102e [FrameworkBundle] update debug commands references
With #11627, both the `ContainerDebugCommand` name and the
`ConfigDebugCommand` name have been moved to the `debug` namespace.
Thus, references should be updated accordingly.
2014-12-17 21:15:32 +01:00
Christian Flothmann
beff6fa3e6 skip compiler pass if interface doesn't exist
The FrameworkBundle doesn't depend on the `symfony/translation`
component and therefore does not enforce a high enough version of this
package. Thus, with `symfony/translation` versions before `2.6`, the
`translator` service does exist, but the `TranslatorBagInterface` is
not present.
2014-12-17 21:06:22 +01:00
Christophe Coevoet
8425e4d9d0 Unify the way to provide expression functions for the DI container
Function providers registered on the ContainerBuilder are now reused by
the PhpDumper when dumping the container instead of forcing to register
them again.
Closes #13012
2014-12-17 10:56:43 +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
Fabien Potencier
c18cb4c7b2 bug #13009 [DebugBundle] fix link format handling with disabled templating (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] fix link format handling with disabled templating

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

Commits
-------

91b4d1d fix link format handling with disabled templating
2014-12-17 07:20:33 +01:00
Dariusz Rumiński
143f900a52 CS: There should be no empty lines following phpdocs 2014-12-16 23:59:16 +01:00
Christian Flothmann
91b4d1d3af fix link format handling with disabled templating 2014-12-16 20:07:50 +01:00
Nicolas Grekas
a29ffa82d6 [2.6] Test lowest versions of dependencies 2014-12-16 19:41:39 +01:00
Nicolas Grekas
5e6959b39e Merge remote-tracking branch 'symfony/2.5' into lowest-26
* symfony/2.5:
  Test lowest versions of dependencies
  Test components using their lowest possible deps

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Security/composer.json
2014-12-16 16:44:55 +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
Mantas Varatiejus
9a44aa85ac Fix placeholder date format 2014-12-15 20:18:43 +02: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
Jakub Zalas
4cdcf109d3 [FrameworkBundle] Allow custom services for validator mapping cache. 2014-12-13 20:05:40 +00:00
Fabien Potencier
08a024230e Merge branch '2.5' into 2.6
* 2.5:
  Fix failing tests after merge
  fix ocramius/proxy-manager dependency version
2014-12-13 10:20:08 +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
f691ab35e8 Merge branch '2.5' into 2.6
* 2.5:
  remove short array syntax
  fix session restart on PHP 5.3
2014-12-13 09:38:45 +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
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
7e33b32ccf minor #12958 [WebProfilerBundle] Avoid missing method when using __invoke on a controller (thewilkybarkid)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Avoid missing method when using __invoke on a controller

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

2.6 added support for using `__invoke` on controllers, but the profiler toolbar still expects a method name, leading to:

![image](https://cloud.githubusercontent.com/assets/1784740/5412993/4553c4da-820a-11e4-899c-50ef9f330cdd.png)

This PR changes it to only include the method section/double dots if the method name is included (and the `link` is moved to the class name).

Commits
-------

fb87558 Avoid missing method when using __invoke
2014-12-12 19:19:01 +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
ea17bc78a8 Merge branch '2.5' into 2.6
* 2.5:
  [Form] fixed a maxlength overring on a guessing
  [Debug] Show only unique class candidates
  [SecurityBundle] Firewall providers building - code cleaning
  [Filesystem] symlink use RealPath instead LinkTarget
  [DependencyInjection] Remove duplicate  declaration in PhpDumper
  terminals are not interactive on Travis
  Revert "[DependencyInjection] backport perf optim"
  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
  fix phpdoc's alignment
  Fixed the AuthenticationProviderInterface alignment
  Fixed the proxy-manager version constraint
  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
  [DependencyInjection] perf optim: call dirname() at most 5x
  [DependencyInjection] backport perf optim
  Fixed #12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]
  [2.5] Remove possible call_user_func()
  [2.3] Remove possible call_user_func()

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
2014-12-12 17:21:40 +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
thewilkybarkid
fb87558881 Avoid missing method when using __invoke 2014-12-12 14:38:45 +00: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
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
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
bfdf04b9e9 minor #12776 [2.3] Fixed the proxy-manager version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fixed the proxy-manager version constraint

| 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 `ocramius/proxy-manager` version constraint in the 2.3 branch.

`"~0.3.1"` is far cleaner than `">=0.3.1,<0.4-dev"`, and does the same thing.

Commits
-------

ed6c50f Fixed the proxy-manager version constraint
2014-12-12 08:04:42 +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
7d981e0dba minor #12904 [HttpKernel] fix DumpDataCollectorTest after CS changes (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] fix DumpDataCollectorTest after CS changes

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

Modify the expected line value which was affected by the move of the
`__LINE__` constant in #12872 to make tests pass again.

Commits
-------

1917b70 fix DumpDataCollectorTest after CS changes
2014-12-12 07:57:37 +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
Fabien Potencier
c9f4139850 bug #12935 [2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider (Luca Genuzio)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider

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

Fix missing addExpressionLanguageProvider in [ExpressionVoter](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php), used by [AddExpressionLanguageProvidersPass](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php) to add expression providers.

Commits
-------

6c70bc5 Fix missing addExpressionLanguageProvider (used by service container to add expression providers)
2014-12-12 07:54:58 +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
b1c4068cdf minor #12532 [2.6] Remove possible call_user_func() (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] 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.6

Commits
-------

1de4920 [2.6] Remove possible call_user_func()
2014-12-11 20:01:13 +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
Fabien Potencier
6043544a37 bug #12855 [DependencyInjection] Perf php dumper (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Perf php dumper

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

This PR came up after this comment to reduce the number of calls to dirname():
https://github.com/symfony/symfony/pull/12784#issuecomment-65619179

Commits
-------

375f83e Revert "[DependencyInjection] backport perf optim"
fcd8ff9 [DependencyInjection] perf optim: call dirname() at most 5x
c11535b [DependencyInjection] backport perf optim
2014-12-11 19:39:10 +01:00
Nicolas Grekas
375f83ece4 Revert "[DependencyInjection] backport perf optim"
This reverts commit c11535bd6b.

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-12-11 19:19:56 +01:00
Gábor Egyed
16a51e7ca3 [WebProfiler] Tweaked ajax requests toolbar css reset 2014-12-11 16:04:48 +01:00
Fabien Potencier
c2fc7c959d minor #12903 [TwigBundle] avoid risky tests (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBundle] avoid risky tests

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

Commits
-------

e7b0b89 avoid risky tests
2014-12-11 15:53:32 +01:00
Hugo Hamon
123e054087 [WebProfilerBundle] replaced pattern to path attribute in routes definitions. 2014-12-10 08:57:07 +01:00
Dariusz Rumiński
e9ea4c1c9a fix phpdoc's alignment 2014-12-09 19:18:22 +01:00
Luca Genuzio
6c70bc5211 Fix missing addExpressionLanguageProvider (used by service container to add expression providers) 2014-12-09 13:45:31 +01:00
Graham Campbell
1270327d83 Fixed the AuthenticationProviderInterface alignment 2014-12-09 12:18:23 +00:00
Graham Campbell
ed6c50f4fd Fixed the proxy-manager version constraint 2014-12-09 11:07:51 +00:00
Massimiliano Arione
90b3f3b040 Fix missing space in label_attr
``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``
2014-12-09 10:58:23 +01:00
Christian Flothmann
1917b703c6 fix DumpDataCollectorTest after CS changes
Modify the expected line value which was affected by the move of the
`__LINE__` constant in #12872 to make tests pass again.
2014-12-08 18:03:34 +01:00
Christian Flothmann
e7b0b899e0 avoid risky tests 2014-12-08 17:47:47 +01:00
Dmitry Korotovsky
a6dd6c9b6a [WebProfilerBundle] Fixed IE8 support 2014-12-08 18:46:30 +03:00
Matthias Althaus
8d7581af3a Fixed typo in SecurityContext PHPDoc
Fixed typo in PHPDoc
2014-12-08 12:17:16 +01:00
Abdellatif Ait boudad
055129c1c2 [FrameworkBundle][Template name] avoid error message for the shortcut notation. 2014-12-08 10:32:45 +00:00
Fabien Potencier
23eafccd4a Merge branch '2.5' into 2.6
* 2.5:
  Added information when an error occured during validation of an answer of a question
  [Console] fixes some typos and phpdoc.
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader
2014-12-08 09:43:24 +01:00
Fabien Potencier
7bb6f4445c Merge branch '2.3' into 2.5
* 2.3:
  fix phpdoc's alignment
  Minor phpcs fixes
  [ClassLoader] Fix undefined index in ClassCollectionLoader

Conflicts:
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
2014-12-08 09:43:12 +01:00
Saro0h
111b1948f2 Added information when an error occured during validation of an answer of a question 2014-12-08 09:28:21 +01:00
Hugo Hamon
86840df972 [Console] fixes some typos and phpdoc. 2014-12-07 21:49:32 +01:00
Fabien Potencier
f031154fa7 bug #12858 [ClassLoader] Fix undefined index in ClassCollectionLoader (szicsu)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Fix undefined index in ClassCollectionLoader

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

Commits
-------

cfdb925 [ClassLoader] Fix undefined index in ClassCollectionLoader
2014-12-07 19:38:12 +01:00
Fabien Potencier
9f76f1c10f minor #12887 [2.3] CS Fixes: fix phpdoc's alignment (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] CS Fixes: fix phpdoc's alignment

| 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

Fix phpdoc's alignment

Commits
-------

f588610 fix phpdoc's alignment
2014-12-07 19:28:24 +01:00
Dariusz Rumiński
f588610722 fix phpdoc's alignment 2014-12-07 19:24:30 +01:00
Graham Campbell
2f10a0a704 [2.6] CS Fixes And Removed An Unused Import 2014-12-07 19:23:39 +01:00
Jeroen Thora
9a0d5c3e2e Minor phpcs fixes 2014-12-07 18:50:06 +01:00
Fabien Potencier
c4a80412b8 Merge branch '2.5' into 2.6
* 2.5:
  CS fixes
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.5.9
  updated VERSION for 2.5.8
  update CONTRIBUTORS for 2.5.8
  updated CHANGELOG for 2.5.8
  bumped Symfony version to 2.3.24
  updated VERSION for 2.3.23
  update CONTRIBUTORS for 2.3.23
  updated CHANGELOG for 2.3.23

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressBar.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
	src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
2014-12-05 13:00:15 +01:00
Szijarto Tamas
cfdb925c47 [ClassLoader] Fix undefined index in ClassCollectionLoader 2014-12-04 22:06:34 +01:00