Commit Graph

16640 Commits

Author SHA1 Message Date
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 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
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 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
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 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
Hugo Hamon 123e054087 [WebProfilerBundle] replaced pattern to path attribute in routes definitions. 2014-12-10 08:57:07 +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
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
Abdellatif Ait boudad 055129c1c2 [FrameworkBundle][Template name] avoid error message for the shortcut notation. 2014-12-08 10:32:45 +00: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
Fabien Potencier 250a8056d8 minor #12886 Minor phpcs fixes (acrobat)
This PR was merged into the 2.3 branch.

Discussion
----------

Minor phpcs fixes

| 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

Small phpcs fixes

Commits
-------

9a0d5c3 Minor phpcs fixes
2014-12-07 18:55:36 +01:00
Jeroen Thora 9a0d5c3e2e Minor phpcs fixes 2014-12-07 18:50:06 +01:00
Szijarto Tamas cfdb925c47 [ClassLoader] Fix undefined index in ClassCollectionLoader 2014-12-04 22:06:34 +01:00
Nicolas Grekas fcd8ff9b67 [DependencyInjection] perf optim: call dirname() at most 5x 2014-12-04 19:27:52 +01:00
Nicolas Grekas c11535bd6b [DependencyInjection] backport perf optim
Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-12-04 17:53:10 +01:00
Fabien Potencier 15551f2e85 minor #12840 [2.3] More cs fixes (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes #12840).

Discussion
----------

[2.3] More cs fixes

| 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 some more cs issues in symfony 2.3.

I should be done with cs fixes to the 2.3 branch now. Sorry I missed these in my last pull.

Commits
-------

b034b08 [2.3] More cs fixes
2014-12-04 06:06:19 +01:00
Graham Campbell b034b08506 [2.3] More cs fixes 2014-12-04 06:06:17 +01:00
Fabien Potencier cef9972484 minor #12837 [2.3] CS Fixes And Removed Unused Imports (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] CS Fixes And Removed Unused Imports

| 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 some cs issues in symfony 2.3.

As far as I understand, symfony's coding standards dictate that there should be no blank lines between imports and imports should not be prefixed with a slash. There are one or two other tiny fixes in here too.

Also, we should only import things that we actually *use*. :)

Commits
-------

0e4f0e7 Removed unused imports
0fc3369 CS fixes
2014-12-03 21:27:24 +01:00
Graham Campbell 0e4f0e7c9e Removed unused imports 2014-12-03 20:18:13 +00:00
Graham Campbell 0fc3369b35 CS fixes 2014-12-03 20:10:26 +00:00
Fabien Potencier 9b24d184c2 bumped Symfony version to 2.3.24 2014-12-03 15:07:19 +01:00
Fabien Potencier daf150374d updated VERSION for 2.3.23 2014-12-03 13:04:45 +01:00
Fabien Potencier c8010a7580 update CONTRIBUTORS for 2.3.23 2014-12-03 13:04:30 +01:00
Fabien Potencier 6b7c822126 updated CHANGELOG for 2.3.23 2014-12-03 13:03:49 +01:00
Fabien Potencier be81a1d11b minor #12772 PSR-2 Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

PSR-2 Fixes

| 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 brings symfony 2.3 back inline with PSR-2.

Commits
-------

eda746b PSR-2 fixes
2014-12-02 21:00:13 +01:00
Fabien Potencier 2e65c3fccf bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
This PR was squashed before being merged into the 2.3 branch (closes #12811).

Discussion
----------

Configure firewall's kernel exception listener with configured entry point or a default entry point

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | when relying on buggy behaviour
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12581 #12801
| License       | MIT
| Doc PR        | —

The #12296 PR introduced a bug where the firewall's exception listener was sometimes configured with the default entry point returned by `SecurityExtension#createAuthenticationListeners()`. These changes add a regression test and make the configured entry point (if any) always take precedence over a default entry point.

If someone can confirm this fix, it would have my preference merging this over reverting #12296 for Symfony 2.6.1.

Commits
-------

b122262 Configure firewall's kernel exception listener with configured entry point or a default entry point
2014-12-02 20:53:07 +01:00
Reinier Kip b1222624b2 Configure firewall's kernel exception listener with configured entry point or a default entry point 2014-12-02 20:53:05 +01:00