Commit Graph

19054 Commits

Author SHA1 Message Date
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
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
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
Fabien Potencier c7ea7819aa minor #12953 [DependencyInjection] Remove duplicate $parameters declaration in PhpDumper (sjagr)
This PR was squashed before being merged into the 2.5 branch (closes #12953).

Discussion
----------

[DependencyInjection] Remove duplicate $parameters declaration in PhpDumper

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

2.5 breaks on the latest `composer update` without this fix - after applying and manually deleting `app/cache/*`, everything is hunky-dory

Commits
-------

e3a4cdc [DependencyInjection] Remove duplicate  declaration in PhpDumper
2014-12-12 07:02:15 +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
Fabien Potencier 6989d0a66a minor #12929 [2.3] [WebProfilerBundle] replaced pattern to path attribute in routes definitions (hhamon)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [WebProfilerBundle] replaced pattern to path attribute in routes definitions

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

Commits
-------

123e054 [WebProfilerBundle] replaced pattern to path attribute in routes definitions.
2014-12-11 19:14:48 +01:00
Fabien Potencier 4d3d1977b5 bug #12899 [WebProfiler] Tweaked ajax requests toolbar css reset (1ed)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #12899).

Discussion
----------

[WebProfiler] Tweaked ajax requests toolbar css reset

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12139 (not sure)
| License       | MIT
| Doc PR        | -

Before:
![screenshot from 2014-12-08 14 52 42](https://cloud.githubusercontent.com/assets/162986/5340221/7b3f1716-7eea-11e4-81c7-f46768736289.png)

After:
![screenshot from 2014-12-08 15 14 35](https://cloud.githubusercontent.com/assets/162986/5340443/fbfb3d1a-7eec-11e4-8960-9990937a49a1.png)

Commits
-------

16a51e7 [WebProfiler] Tweaked ajax requests toolbar css reset
2014-12-11 16:04:48 +01:00
Gábor Egyed 16a51e7ca3 [WebProfiler] Tweaked ajax requests toolbar css reset 2014-12-11 16:04:48 +01:00
Fabien Potencier b72875d0d1 minor #12905 fix phpdoc's alignment (keradus)
This PR was merged into the 2.5 branch.

Discussion
----------

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

2.3 fixed by #12887
let fix 2.5 now ;)

Commits
-------

e9ea4c1 fix phpdoc's alignment
2014-12-11 15:59:22 +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
Fabien Potencier 144c19d292 bug #12913 Fix missing space in label_attr (garak)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix missing space in label_attr

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

``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``

Commits
-------

90b3f3b Fix missing space in label_attr
2014-12-11 15:51:16 +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
Fabien Potencier a835b18203 bug #12894 [FrameworkBundle][Template name] avoid error message for the shortcut n... (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle][Template name] avoid  error message for the shortcut n...

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

Commits
-------

055129c [FrameworkBundle][Template name] avoid  error message for the shortcut notation.
2014-12-08 15:53:01 +01:00
Fabien Potencier 0a09eaf609 minor #12895 [Security] Fixed typo in SecurityContext PHPDoc (althaus)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security] Fixed typo in SecurityContext PHPDoc

Fixes a simple typo.

Commits
-------

8d7581a Fixed typo in SecurityContext PHPDoc
2014-12-08 12:33:14 +01: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
Fabien Potencier 51509be663 minor #12890 Adding note about the PdoSessionHandler BC break (weaverryan)
This PR was merged into the 2.6 branch.

Discussion
----------

Adding note about the PdoSessionHandler BC break

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12833
| License       | MIT
| Doc PR        | symfony/symfony-docs#4609

Hi guys!

This adds an UPGRADE note about the PdoSessionHandler BC break in 2.6. I also added a section on top, which might be more controversial that highlights the BC breaks. That's because this document is long, and much of it is telling you about deprecated features. But what I first want to know is - what will break?

I'm also still interested in maybe adding the old PdoSessionHandler to 2.6 and allowing you to use that one to keep BC (still a BC break, but you could choose to use the old one).

Thanks!

Commits
-------

adfdad9 Adding note about known BC issues
42950e9 Adding note about the PdoSessionHandler BC break
2014-12-08 09:37:20 +01:00
Fabien Potencier 99369a2b49 bug #12806 [Console] Removed the use of $this->getHelperSet() as it is null by default (saro0h)
This PR was submitted for the 2.6 branch but it was merged into the 2.5 branch instead (closes #12806).

Discussion
----------

[Console] Removed the use of $this->getHelperSet() as it is null by default

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

Before:
![capture d ecran 2014-12-02 a 15 51 38](https://cloud.githubusercontent.com/assets/667519/5264798/303bf87a-7a3e-11e4-9b45-68e8a86bab60.png)

After:
![capture d ecran 2014-12-02 a 16 36 25](https://cloud.githubusercontent.com/assets/667519/5265299/b13190d6-7a41-11e4-9e68-d889ea290cae.png)

Commits
-------

111b194 Added information when an error occured during validation of an answer of a question
2014-12-08 09:28:22 +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
Fabien Potencier 6104fe0234 minor #12884 [Console] fixes some typos and phpdoc. (hhamon)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] fixes some typos and phpdoc.

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

Commits
-------

86840df [Console] fixes some typos and phpdoc.
2014-12-08 09:25:46 +01:00
Ryan Weaver adfdad9c38 Adding note about known BC issues 2014-12-07 19:23:51 -05:00