Commit Graph

13938 Commits

Author SHA1 Message Date
Fabien Potencier 2e87d1d3f9 [Yaml] fixed typo 2013-09-22 19:30:19 +02:00
Fabien Potencier 213b888ea4 [Yaml] fixed a test on PHP < 5.4 2013-09-22 19:26:55 +02:00
Fabien Potencier f73aa37064 merged branch bronze1man/pr-2.2-crawler (PR #9074)
This PR was squashed before being merged into the 2.2 branch (closes #9074).

Discussion
----------

[DomCrawler]Crawler guess charset from html

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

Commits
-------

e5282e8 [DomCrawler]Crawler guess charset from html
2013-09-19 18:37:12 +02:00
bronze1man e5282e8ec0 [DomCrawler]Crawler guess charset from html 2013-09-19 18:37:12 +02:00
Fabien Potencier 8552aa4834 fixed PHP 5.3 compatibility 2013-09-19 18:27:31 +02:00
Fabien Potencier 38f7ef0539 [Yaml] reverted previous merge partially (refs #8897) 2013-09-19 18:24:31 +02:00
Fabien Potencier 1b789d2d16 merged branch unkind/bugfix-yaml-parse-exception (PR #8897)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] Fixed filename in the ParseException message

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

Yaml component throws an exception with corrupt filename because of `json_encode`:

```
[Symfony\Component\Yaml\Exception\ParseException]
A YAML file cannot contain tabs as indentation in "\/var\/www\/app\/config.yml" at line 42 (near "	foo: bar").
```

Commits
-------

da44651 [Yaml] Fixed filename in the ParseException message
2013-09-19 18:22:28 +02:00
Fabien Potencier 6a36fb6311 merged branch Tobion/security-fix-typo (PR #9069)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] fix typo and remove unused logger

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

Commits
-------

a33cc51 [Security] remove unused logger
62de9c1 [Security] fix typo
2013-09-19 11:48:50 +02:00
Fabien Potencier 7597f7ea55 merged branch bronze1man/pr-2.2-annotate (PR #9067)
This PR was squashed before being merged into the 2.2 branch (closes #9067).

Discussion
----------

Fix some annotates

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

send those fixes in branch 2.2
This pr includes #9065

Commits
-------

de39bd5 Fix some annotates
2013-09-19 11:36:06 +02:00
bronze1man de39bd5433 Fix some annotates 2013-09-19 11:36:05 +02:00
Fabien Potencier 1843b82015 merged branch fabpot/event-dispatcher-debug (PR #9068)
This PR was merged into the 2.2 branch.

Discussion
----------

[FrameworkBundle] made sure that the debug event dispatcher is used everywhere

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

Commits
-------

f65a526 [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
2013-09-19 11:03:30 +02:00
Tobias Schultze a33cc51648 [Security] remove unused logger 2013-09-18 18:54:35 +02:00
Fabien Potencier 510960ed31 merged branch Tobion/routerlistener-strtoupper (PR #9070)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] remove unneeded strtoupper

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

It is already uppercased by the exception itself: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Component/Routing/Exception/MethodNotAllowedException.php#L32

Commits
-------

0b6519f [HttpKernel] remove unneeded strtoupper
2013-09-18 18:04:45 +02:00
Fabien Potencier f65a526e7d [FrameworkBundle] made sure that the debug event dispatcher is used everywhere 2013-09-18 17:45:40 +02:00
Tobias Schultze 62de9c1f19 [Security] fix typo 2013-09-18 17:42:47 +02:00
Tobias Schultze 0b6519fc0e [HttpKernel] remove unneeded strtoupper 2013-09-18 17:29:46 +02:00
Fabien Potencier 4bb14419a3 merged branch fabpot/composer-install-fix (PR #9063)
This PR was merged into the 2.2 branch.

Discussion
----------

updated the composer install command to reflect changes in Composer

Commits
-------

c2144df updated the composer install command to reflect changes in Composer
2013-09-18 13:09:22 +02:00
Fabien Potencier c2144df888 updated the composer install command to reflect changes in Composer 2013-09-18 09:27:26 +02:00
Fabien Potencier 5ffe1bc0e0 merged branch fabriceb/master (PR #9060)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9060).

Discussion
----------

[HttpKernel] fixes RequestDataCollector bug, visible on Drupal8

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

In Drupal8 ```$request->attributes->all()``` returns an array with a 0 key whose value is the ```Drupal\user\Entity\User```

```php
array(
 0 => Drupal\user\Entity\User,
 ...
)
```

```('_route' == $key && is_object($value))``` is therefore true which provokes an exception:

```php
FatalErrorException: Error: Call to undefined method Drupal\user\Entity\User::getPath() in [...]/RequestDataCollector.php line 54
```

This patch corrects this with a simple replacement of == by ===

Commits
-------

ba85279 [HttpKernel] fixes RequestDataCollector bug, visible when used on Drupal8
2013-09-17 21:54:49 +02:00
Fabrice Bernhard 0e80d88015 fixes RequestDataCollector bug, visible when used on Drupal8
In Drupal8 ```$request->attributes->all()``` returns an array with a 0 key whose value is the ```Drupal\user\Entity\User```

```php
array(
 0 => Drupal\user\Entity\User,
 ...
)
```

```('_route' == $key && is_object($value))``` is therefore true which provokes an exception:

```php
FatalErrorException: Error: Call to undefined method Drupal\user\Entity\User::getPath() in [...]/RequestDataCollector.php line 54
```

This patch corrects this with a simple replacement of == by ===
2013-09-17 21:54:49 +02:00
Fabien Potencier 6f5de6315b merged branch fabpot/console-render-exception (PR #9055)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fixed exception rendering

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

When an exception message contains styles, the output is not the expected one. This PR addresses this issue.

Commits
-------

c8d0342 [Console] fixed exception rendering when nested styles
1f88a28 [Console] added some more information about OutputFormatter::replaceStyle()
a47d663 [Console] fixed the formatter for single-char tags
c6c35b3 [Console] Escape exception message during the rendering of an exception
2013-09-17 15:57:05 +02:00
Fabien Potencier c8d0342887 [Console] fixed exception rendering when nested styles 2013-09-17 14:55:19 +02:00
Fabien Potencier 1f88a28d54 [Console] added some more information about OutputFormatter::replaceStyle() 2013-09-17 14:55:19 +02:00
Fabien Potencier a47d663f25 [Console] fixed the formatter for single-char tags 2013-09-17 14:55:19 +02:00
Grégoire Pineau c6c35b3db9 [Console] Escape exception message during the rendering of an exception 2013-09-17 14:55:19 +02:00
Fabien Potencier 42045e941e merged branch stof/fix_redirect_url (PR #9052)
This PR was merged into the 2.2 branch.

Discussion
----------

[BrowserKit] Fixed the handling of parameters when redirecting

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

This fixes the handling of request parameters after 2d34e78aaf to avoid sending POST parameters as GET parameters in the next request.

In case of a 307 redirect on a GET request, I'm not sure of the expected behavior. Should we re-add the GET parameters in the URI ? I would make things inconsistent between ``$client->request('GET', 'http://www.example.com/?foo=bar')`` and ``$client->request('GET', 'http://www.example.com/', array('foo' => 'bar')``

Commits
-------

0e437c5 [BrowserKit] Fixed the handling of parameters when redirecting
2013-09-17 13:18:22 +02:00
Christophe Coevoet 0e437c5978 [BrowserKit] Fixed the handling of parameters when redirecting
POST parameters should not be transmitted as GET parameters after the
redirection when changing the method.
2013-09-16 19:28:51 +02:00
Fabien Potencier 1fd8652d8a merged branch sarcasme/patch-1 (PR #9037)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9037).

Discussion
----------

Typo fix

Small typo/grammar fix in class' comment

Commits
-------

16f455e Typo fix
2013-09-16 10:02:49 +02:00
Cas 568113f64a Typo fix
Small typo/grammar fix in class' comment
2013-09-16 10:02:49 +02:00
Fabien Potencier 6a17a39fcb merged branch fturmel/patch-1 (PR #9038)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #9038).

Discussion
----------

HttpFoundation Request : unit test to confirm #8619 issue fix

Commits
-------

ae4925b HttpFoundation RequestTest - Fixed indentation and removed comments
94ea510 HttpFoundation Request test for #8619
2013-09-16 10:00:14 +02:00
fturmel 32fc4d8758 HttpFoundation RequestTest - Fixed indentation and removed comments 2013-09-16 10:00:14 +02:00
fturmel 48582402c0 HttpFoundation Request test for #8619 2013-09-16 10:00:13 +02:00
Fabien Potencier a94c0fd40a merged branch peterkokot/patch-license (PR #9041)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #9041).

Discussion
----------

Patch license

According to the documentation: http://symfony.com/doc/current/cookbook/bundles/best_practices.html#directory-structure I think LICENSE files should be in meta folders in Symfony core bundles as well. If I'm mistaken you can close this pull request. Thanks.

Commits
-------

66bafd2 LICENSE files moved to meta folders
2013-09-16 09:53:15 +02:00
Peter Kokot b1242ef143 LICENSE files moved to meta folders 2013-09-16 09:53:14 +02:00
Fabien Potencier c27cd0959f added missing method in the UPGRADE file for 2.2 (closes #8941) 2013-09-13 17:27:28 +02:00
Fabien Potencier 454fbff3bd merged branch jakzal/domcrawler-missing-docblocks (PR #9025)
This PR was merged into the 2.2 branch.

Discussion
----------

[DomCrawler] Added missing docblocks and removed redundant type in a return annotation

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

Commits
-------

d414213 [DomCrawler] Added missing docblocks and removed unneeded return annotation.
2013-09-13 15:28:25 +02:00
Fabien Potencier e6c1eefbe3 merged branch jakzal/docblock-cleanup (PR #9028)
This PR was merged into the 2.2 branch.

Discussion
----------

[Translation] Removed a @return annotation

This is the only `@return null` left...

Commits
-------

d6f4def [Translation] Removed an unneeded return annotation.
2013-09-13 14:22:12 +02:00
Jakub Zalas d6f4def1a3 [Translation] Removed an unneeded return annotation. 2013-09-13 13:15:01 +01:00
Jakub Zalas d414213740 [DomCrawler] Added missing docblocks and removed unneeded return annotation. 2013-09-13 13:11:47 +01:00
Fabien Potencier 96165bc404 merged branch jakzal/dockblock-void-null-fix (PR #9026)
This PR was squashed before being merged into the 2.2 branch (closes #9026).

Discussion
----------

[FrameworkBundle][Security] Replaced void return type with null for consistency

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

We're using `null` everywhere else.

Commits
-------

e4100ac [FrameworkBundle][Security] Replaced void return type with null for consistency
2013-09-13 14:06:45 +02:00
Jakub Zalas e4100ac2fa [FrameworkBundle][Security] Replaced void return type with null for consistency 2013-09-13 14:06:44 +02:00
Fabien Potencier b96c40e570 fixed CS 2013-09-13 12:12:19 +02:00
Fabien Potencier 1271a4cdee merged branch lancergr/ticket_8460 (PR #8969)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8969).

Discussion
----------

[HttpFoundation] NativeSessionStorage regenerate

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

Since session_start is called by the regenerate function, then the 'started' flag of NativeSessionStorage have to be set to true. Otherwise, the variable $_SESSION is initiated and the exception "Failed to start the session: already started by PHP ($_SESSION is set)." is thrown.

This can be reproduced by clearing the session data (cookies) before authenticating with a method that does not require csrf (eg. using the confirmation link of FOSUserBundle).

Commits
-------

7a0eeb3 [HttpFoundation] NativeSessionStorage regenerate
2013-09-13 12:11:19 +02:00
lancergr 958ec09285 NativeSessionStorage regenerate 2013-09-13 12:11:17 +02:00
Fabien Potencier 68c9c86652 removed unneeded comment 2013-09-13 10:55:12 +02:00
Fabien Potencier bce839e937 merged branch dropfen/master (PR #9015)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9015).

Discussion
----------

Fix #6029 : Use setTimeZone if this method exists.

The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.

Commits
-------

7d84cd7 Use setTimeZone if this method exists.
2013-09-13 10:52:43 +02:00
dropfen 0d6af5cd90 Use setTimeZone if this method exists.
The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.
2013-09-13 10:52:42 +02:00
Fabien Potencier 7d7b583851 merged branch jakzal/console-single-dash-argument (PR #9014)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fixed argument parsing when a single dash is passed.

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

Commits
-------

42019f6 [Console] Fixed argument parsing when a single dash is passed.
2013-09-13 07:13:53 +02:00
Fabien Potencier 27423104aa merged branch adrienbrault/patch-1 (PR #9016)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9016).

Discussion
----------

[Config] Fix FileResource test

I had the following test failing on OS X before:

```
There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml
+/private/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml

symfony/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php:56
```

Commits
-------

76a5b50 [Config] Fix FileResource test
2013-09-13 07:11:26 +02:00
Adrien Brault 124cb17625 Fix FileResource test
I had the following test failing on OS X before:

There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
2013-09-13 07:11:26 +02:00