Commit Graph

14991 Commits

Author SHA1 Message Date
Fabien Potencier
c60a8e962b Merge branch '2.2' into 2.3
* 2.2:
  Revert "merged branch fabpot/event-dispatcher-debug (PR #9068)"

Conflicts:
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
2013-09-23 17:56:30 +02:00
Fabien Potencier
c2f935593d Revert "merged branch fabpot/event-dispatcher-debug (PR #9068)"
This reverts commit 1843b82015, reversing
changes made to 510960ed31.
2013-09-23 17:54:49 +02:00
Fabien Potencier
775a39c5c3 Merge branch '2.2' into 2.3
* 2.2:
  [Locale] added support for the position argument to NumberFormatter::parse()
  [Locale] added some more stubs for the number formatter
  [Yaml] fixed typo
  [Yaml] fixed a test on PHP < 5.4
  [DomCrawler]Crawler guess charset from html
  fixed PHP 5.3 compatibility
  [Yaml] reverted previous merge partially (refs #8897)
  [Security] remove unused logger
  [Security] fix typo
  [Yaml] Fixed filename in the ParseException message

Conflicts:
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/Locale/Stub/StubNumberFormatter.php
	src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
2013-09-22 20:04:39 +02:00
Fabien Potencier
55560e0590 merged branch fabpot/locale-fix (PR #9098)
This PR was merged into the 2.2 branch.

Discussion
----------

[Locale] added some more stubs for the number formatter

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

I've used this snippet of code to populate the default values for the en locale:

```php
for ($style = 0; $style <= 8; $style++) {
    $f = new \NumberFormatter('en', $style);
    echo 'array(';
    for ($i = 0; $i <= 17; $i++) {
        echo "'".$f->getSymbol($i)."', ";
    }

    echo "),\n";
}
```

Commits
-------

3108c71 [Locale] added support for the position argument to NumberFormatter::parse()
0774c79 [Locale] added some more stubs for the number formatter
2013-09-22 19:46:20 +02:00
Fabien Potencier
3108c715db [Locale] added support for the position argument to NumberFormatter::parse() 2013-09-22 19:34:01 +02:00
Fabien Potencier
0774c79678 [Locale] added some more stubs for the number formatter 2013-09-22 19:34:01 +02:00
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
714d719383 merged branch stloyd/bugfix/use_statement (PR #9079)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix `use` statements in HttpKernel\Client

Commits
-------

5d5ea9a Fix `use` statements in HttpKernel\Client
2013-09-19 12:55:30 +02:00
Joseph Bielawski
5d5ea9a992 Fix use statements in HttpKernel\Client 2013-09-19 12:49:28 +02:00
Fabien Potencier
d502e32cb5 fixed Git conflict 2013-09-19 12:35:49 +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
a1cfdb421a fixed phpdoc 2013-09-19 11:47:13 +02:00
Fabien Potencier
88cef41560 Merge branch '2.2' into 2.3
* 2.2:
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
2013-09-19 11:45:20 +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
d1825030b4 Merge branch '2.2' into 2.3
* 2.2:
  fixes RequestDataCollector bug, visible when used on Drupal8
  [Console] fixed exception rendering when nested styles
  [Console] added some more information about OutputFormatter::replaceStyle()
  [Console] fixed the formatter for single-char tags
  [Console] Escape exception message during the rendering of an exception
  [BrowserKit] Fixed the handling of parameters when redirecting
  Typo fix
  HttpFoundation RequestTest - Fixed indentation and removed comments
  HttpFoundation Request test for #8619
  LICENSE files moved to meta folders
  added missing method in the UPGRADE file for 2.2 (closes #8941)
  [Translation] Removed an unneeded return annotation.
  [DomCrawler] Added missing docblocks and removed unneeded return annotation.

Conflicts:
	src/Symfony/Component/BrowserKit/Client.php
	src/Symfony/Component/DomCrawler/Crawler.php
2013-09-18 09:03:56 +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
Fabien Potencier
0ebb8bc8a2 merged branch kepten/ticket_6239 (PR #8197)
This PR was squashed before being merged into the 2.3 branch (closes #8197).

Discussion
----------

[DomCrawler] fixed HTML5 form attribute handling

Fixed HTML5 form attribute handling and improved a test case to test more thoroughly

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

Commits
-------

04e730e [DomCrawler] fixed HTML5 form attribute handling
2013-09-17 11:47:59 +02:00
Robert Kiss
04e730ec2e [DomCrawler] fixed HTML5 form attribute handling 2013-09-17 11:47:58 +02:00
Fabien Potencier
5e4b24aa8b merged branch ChristianGaertner/patch-2 (PR #9054)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9054).

Discussion
----------

[Config] Making tests pass on mac os x

without this change tests would fail under mac os x (at least in 10.8.2).

I think this change also removes inconstancy in the test (the `realpath()` is added in the other tests as well!).

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

Cheers,

Christian

Commits
-------

61a00a8 Making tests pass on mac os x without this change tests would fail under mac os x at least in 10.8.2
2013-09-16 21:56:35 +02:00
Christian Gärtner
f568e9919b Making tests pass on mac os x without this change tests would fail under mac os x at least in 10.8.2 2013-09-16 21:56:34 +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
8efd5cadc8 merged branch romainneutron/timeout-restart (PR #9050)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process][2.3] Properly close pipes after a Process::stop call

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

When calling `Process::stop`, if the process does not stop before the end of the method, pipes are not close, `proc_close` is not called.
I added a test that randomly fails without the patch :

```
phpunit --filter=testStartAfterATimeout --repeat 100 Tests/SimpleProcessTest.php
PHPUnit 3.8-g55a6dd0 by Sebastian Bergmann.

Configuration read from /Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/phpunit.xml.dist

....E.E......E.....E..........EE..............EEE..EE.......E..  63 / 100 ( 63%)
E.E................E....EE.......E...

Time: 29.55 seconds, Memory: 6.75Mb

There were 18 errors:

1) Symfony\Component\Process\Tests\SimpleProcessTest::testStartAfterATimeout
fclose(): 89 is not a valid stream resource

/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/ProcessPipes.php:95
/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/ProcessPipes.php:80
/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/ProcessPipes.php:62
/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/Process.php:938
/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/Process.php:229
/Users/romain/Documents/workspace/symfony/src/Symfony/Component/Process/Tests/AbstractProcessTest.php:490
```

And of course, I solved the issue, tests are now OK.

Commits
-------

d84df4c [Process] Properly close pipes after a Process::stop call
2013-09-16 13:54:08 +02:00
Romain Neutron
d84df4c2c5 [Process] Properly close pipes after a Process::stop call 2013-09-16 13:47:05 +02:00
Fabien Potencier
bb97f64cd1 merged branch fabpot/bytes-conversion-epic-fail (PR #9048)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed bytes conversion when used on 32-bits systems

| Q             | A
| ------------- | ---
| Bug fix?      | yes (on 32-bits systems)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8977
| License       | MIT
| Doc PR        | n/a

This PR reverts #7413 and #742, which does not work well when a number is big (3Go for instance) and the machine is 32bits.

Commits
-------

b3ae29d fixed bytes conversion when used on 32-bits systems
2013-09-16 13:23:31 +02:00
Fabien Potencier
b3ae29d4f8 fixed bytes conversion when used on 32-bits systems 2013-09-16 12:23:00 +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