Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Dec 20, 2012
@fabpot fabpot bumped Symfony version to 2.0.21-DEV 369e4a6
@fabpot fabpot [FrameworkBundle] fixed ESI calls b8e5689
@fabpot fabpot fixed typo bc09ac9
Commits on Dec 21, 2012
@fabpot fabpot updated CHANGELOG for 2.0.21 c439df2
@fabpot fabpot updated VERSION for 2.0.21 792e602
@fabpot fabpot bumped Symfony version to 2.0.21-DEV 6aeb546
Commits on Dec 29, 2012
@hhamon hhamon [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener. a88607c
@fabpot fabpot merged branch hhamon/session_listener_typo (PR #6512)
This PR was merged into the 2.0 branch.

Commits
-------

a88607c [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.

Discussion
----------

[Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
352eba3
Commits on Dec 30, 2012
@fabpot fabpot [Console] fixed unitialized properties (closes #5935) 2fc41a1
Commits on Jan 02, 2013
@fabpot fabpot merged branch fabpot/console-5935 (PR #6523)
This PR was merged into the 2.0 branch.

Commits
-------

2fc41a1 [Console] fixed unitialized properties (closes #5935)

Discussion
----------

[Console] fixed unitialized properties (closes #5935)
eb3eaf6
Commits on Jan 03, 2013
@jorgemaiden jorgemaiden Update src/Symfony/Component/HttpFoundation/Response.php d337ad5
@fabpot fabpot merged branch jorgemaiden/patch-1 (PR #6525)
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #6525).

Commits
-------

0b5f1e3 Update src/Symfony/Component/HttpFoundation/Response.php

Discussion
----------

Update src/Symfony/Component/HttpFoundation/Response.php

Fix phpdoc typo
66b5818
Commits on Jan 04, 2013
@stloyd stloyd Update .travis.yml
Add PHP 5.5 to Travis-CI testing and allow it to fail.
f4ce2f1
@stloyd stloyd [Form] Fix failing `MonthChoiceList` in PHP 5.5 8ae773b
@stloyd stloyd [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5 913b564
@stloyd stloyd [Locale] Fix failing `StubIntlDateFormatter` tests in PHP 5.5 b2ce983
@stloyd stloyd [Locale] Adjust `StubIntlDateFormatter` to have new methods added in …
…PHP 5.5
73d9cef
@fabpot fabpot updated license year df5c171
@fabpot fabpot merged branch stloyd/feature/travis_php55 (PR #6552)
This PR was merged into the 2.0 branch.

Commits
-------

73d9cef [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5
b2ce983 [Locale] Fix failing `StubIntlDateFormatter` tests in PHP 5.5
913b564 [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5
8ae773b [Form] Fix failing `MonthChoiceList` in PHP 5.5
f4ce2f1 Update .travis.yml

Discussion
----------

[2.0] Add testing of PHP 5.5 on Travis-CI & fix failing code
cd0a9d7
Commits on Jan 05, 2013
@fabpot fabpot [DependencyInjection] fixed CS 3827e3e
@fabpot fabpot [DependencyInjection] added some tests for PhpDumper when the contain…
…er is compiled
e939a42
@fabpot fabpot [DependencyInjection] fixed PhpDumper when an inlined service definit…
…ion has some properties
cd15390
@fabpot fabpot [DependencyInjection] fixed PhpDumper optimizations when an inlined s…
…ervice depends on the current one indirectly
e0923ae
@egeloen egeloen [Console] Make getTerminalWith & getTerminalHeight public f299bd0
@fabpot fabpot merged branch egeloen/f-2.0-terminal-width (PR #6571)
This PR was merged into the 2.0 branch.

Commits
-------

f299bd0 [Console] Make getTerminalWith & getTerminalHeight public

Discussion
----------

[Console] Make getTerminalWith & getTerminalHeight public

Bug fix: yes
Feature addition: yes
Backwards compatibility break: no
Fixes the following tickets: ~
Todo: -
License of the code: MIT
Documentation PR: ~

After demand in #6567, I open an other one on the 2.0 branch.
5157693
@stloyd stloyd Restrict Monolog version to be in version <1.3
Because of conflict between `HttpKernel\Log\LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)
ba2d035
@fabpot fabpot merged branch stloyd/patch-1 (PR #6572)
This PR was merged into the 2.0 branch.

Commits
-------

ba2d035 Restrict Monolog version to be in version <1.3

Discussion
----------

[2.0] Restrict Monolog version to be in version <1.3

Because of conflict between `HttpKernel\Log\LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3).

Main `composer.json` already restricts to proper version, but bridge allows also conflicting version.

---------------------------------------------------------------------------

by Seldaek at 2013-01-05T14:58:18Z

Looks fine, I will try to wrap up the 1.3.0 soon so you can migrate the code to use it (well it can already be done I guess in the master branch).
4f7791d
@fabpot fabpot merged branch fabpot/container-dumper-fixes (PR #6565)
This PR was merged into the 2.0 branch.

Commits
-------

e0923ae [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly
cd15390 [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties
e939a42 [DependencyInjection] added some tests for PhpDumper when the container is compiled
3827e3e [DependencyInjection] fixed CS

Discussion
----------

[DependencyInjection] Fixed PhpDumper when compiling inlined services
5258edb
@fabpot fabpot Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
This reverts commit 5157693, reversing
changes made to cd0a9d7.
151f2c1
Commits on Jan 06, 2013
@fabpot fabpot [DependencyInjection] refactored code to avoid logic duplication 1e2fb64
Commits on Jan 07, 2013
@stloyd stloyd [HttpFoundation] Docblock for Request::isXmlHttpRequest() now points …
…to Wikipedia
666283c
@kosssi kosssi [CssSelector] added css selector with empty string dbafc2c
@fabpot fabpot merged branch kosssi/bugfix/css-selector-empty (PR #6271)
This PR was squashed before being merged into the 2.0 branch (closes #6271).

Commits
-------

dbafc2c [CssSelector] added css selector with empty string

Discussion
----------

[CssSelector] added css selector with empty string

---------------------------------------------------------------------------

by kosssi at 2012-12-14T18:29:40Z

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

---------------------------------------------------------------------------

by stloyd at 2013-01-07T08:21:56Z

@fabpot ping

---------------------------------------------------------------------------

by fabpot at 2013-01-07T10:28:54Z

Sorry, but I don't understand the use case.

---------------------------------------------------------------------------

by kosssi at 2013-01-07T10:36:31Z

if you have this code :
    \<img src="..." alt="">

you can find
    $this->assertCount(1, $crawler->filter('img[alt=""]'));

---------------------------------------------------------------------------

by fabpot at 2013-01-07T10:40:12Z

Then, can you change the unit test with the real use case?

---------------------------------------------------------------------------

by kosssi at 2013-01-07T11:05:50Z

I don't know if it suits you

---------------------------------------------------------------------------

by fabpot at 2013-01-07T11:07:11Z

thanks
5ec6b2a
@fabpot fabpot merged branch stloyd/feature/request_phpdoc (PR #6599)
This PR was merged into the 2.0 branch.

Commits
-------

666283c [HttpFoundation] Docblock for Request::isXmlHttpRequest() now points to Wikipedia

Discussion
----------

[2.0][HttpFoundation] Docblock for Request::isXmlHttpRequest()

Docblock now points to [Wikipedia entry](http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript) instead of pointing all known JS frameworks.

Replacement for #6444.
886f721
@srsbiz srsbiz [HttpFoundation] Check if required shell functions for `FileBinaryMim…
…eTypeGuesser` are not disabled
3195122
@fabpot fabpot merged branch stloyd/bugfix/mimeguesser_functions (PR #6601)
This PR was merged into the 2.0 branch.

Commits
-------

3195122 [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled

Discussion
----------

[HttpFoundation] Check if required shell functions are not disabled

Rebased to `2.0` & squashed version of #6526.
37c4952
@fabpot fabpot [DependencyInjection] fixed a bug where the strict flag on references…
… were lost (closes #6607)
1d362b8
@fabpot fabpot merged branch fabpot/strict-flag-bug (PR #6608)
This PR was merged into the 2.0 branch.

Commits
-------

1d362b8 [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)

Discussion
----------

[DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)
a538c42
Commits on Jan 08, 2013
@igorw igorw [TwigBundle] There is no CSS visibility of display, should be visible…
… instead
8da2b41
@fabpot fabpot merged branch igorw/visibility-display (PR #6612)
This PR was merged into the 2.0 branch.

Commits
-------

8da2b41 [TwigBundle] There is no CSS visibility of display, should be visible instead

Discussion
----------

[TwigBundle] There is no CSS visibility of display, should be visible instead
0544805
@hhamon hhamon [Bundle] [FrameworkBundle] fixed indentation in esi.xml services file. 113271c
@fabpot fabpot merged branch hhamon/indentation_fix_esi_services_file (PR #6622)
This PR was merged into the 2.0 branch.

Commits
-------

113271c [Bundle] [FrameworkBundle] fixed indentation in esi.xml services file.

Discussion
----------

[2.x] [Bundle] [FrameworkBundle] fixed indentation in esi.xml services file.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: -
Todo: -
License of the code: MIT
835c1b8
Commits on Jan 10, 2013
@stloyd stloyd [Process] In edge cases `getcwd()` can return `false`, then `proc_ope…
…n()` should get `null` to use default value (the working dir of the current PHP process)
880da01
@fabpot fabpot merged branch stloyd/bugfix/process_cwd (PR #6620)
This PR was merged into the 2.0 branch.

Commits
-------

880da01 [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)

Discussion
----------

[2.0][Process] In edge cases `getcwd()` can return `false`

Bug fix: yes
Feature addition: no
BC break: no
Symfony2 tests pass: yes

In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process).

---------------------------------------------------------------------------

by stloyd at 2013-01-08T12:43:40Z

I guess that this could be related to #6496, as error code `267` at Windows means:
[`ERROR_DIRECTORY - The directory name is invalid.`](http://msdn.microsoft.com/en-us/library/ms681382%28v=vs.85%29.aspx#error_directory)

---------------------------------------------------------------------------

by Seldaek at 2013-01-08T12:57:38Z

If null already uses the current working directory, what's the point of calling getcwd() at all?

---------------------------------------------------------------------------

by stloyd at 2013-01-08T13:03:06Z

@Seldaek TBH. I don't have idea =) It seems that it's there _from the beginning_, but yeah, I was a bit confused by usage of it too...

---------------------------------------------------------------------------

by fabpot at 2013-01-09T08:13:24Z

What about removing the code altogether?

---------------------------------------------------------------------------

by stloyd at 2013-01-09T08:22:55Z

@fabpot I'm ok with that, just not sure it will not be an BC break...

---------------------------------------------------------------------------

by Seldaek at 2013-01-09T08:24:57Z

php.net says `or NULL if you want to use the default value (the working
dir of the current PHP process)` which sounds like getcwd() to me.

---------------------------------------------------------------------------

by Seldaek at 2013-01-09T08:26:32Z

For full BC though, `getWorkingDirectory` should `return $this->cwd ?:
getcwd();` Then at least if that call fails the whole process isn't
failing. I don't see why anyone would use that getter though.

---------------------------------------------------------------------------

by stloyd at 2013-01-10T12:43:59Z

@fabpot @Seldaek What do you think about this now?

---------------------------------------------------------------------------

by Seldaek at 2013-01-10T12:58:39Z

:+1:
f9ed2bc
Commits on Jan 11, 2013
@LawnGnome LawnGnome Fix version_compare() calls for PHP 5.5.
Until PHP 5.5 hits beta, the version number for Git builds is still 5.5.0-dev,
which is less than 5.5.0alpha1 according to version_compare(). This means that
the branches for 5.5 aren't being executed on 5.5 snapshots at present.
c7bfce9
@fabpot fabpot merged branch LawnGnome/PHP-5.5-compat-2.0 (PR #6699)
This PR was merged into the 2.0 branch.

Commits
-------

c7bfce9 Fix version_compare() calls for PHP 5.5.

Discussion
----------

[2.0] [Form] [Locale] PHP 5.5 compatibility fixes

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: unknown, can't run the test suite on 2.0 due to `Doctrine\DBAL\Logging\DebugStack` not being found
Fixes the following tickets: N/A
Todo: None
License of the code: MIT
Documentation PR: N/A

A backport of #6647 to the Symfony 2.0 branch, as requested. This affects a couple of files that aren't affected on 2.1.
b4c6972
@fabpot fabpot [Console] fixed input bug when the value of an option is empty (closes
…#6649, closes #6689)
dc2cc6b
Commits on Jan 17, 2013
@fabpot fabpot added a way to enable/disable PHP support when parsing a YAML input v…
…ia Yaml::parse()

PHP support when parsing a file has been disabled by default.
If you do need PHP support when parsing a YAML file, enable it via:

    Yaml::setPhpParsing(true);

As of Symfony 2.1, PHP support is disabled by default, and support will
be removed in Symfony 2.3.
ac756bf
@fabpot fabpot added a way to enable/disable object support when parsing/dumping
By default, object support is disabled, and instead of throwing an
exception when an object is handled, null is returned.

If you do need object support, enable it via:

    Yaml::dump($data, false, true);

If you want an exception to be thrown in case an invalid type is handled
(a PHP resource or a PHP object), pass true as the second argument:

    Yaml::dump($data, true, true);

The same can be done when parsing:

    Yaml::parse($data, 2, false, true);
ba6e315
@sun sun Added Yaml\Dumper::setIndentation() method to allow a custom indentat…
…ion level of nested nodes.

YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/

Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.

The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).

Conflicts:
	src/Symfony/Component/Yaml/Dumper.php
	src/Symfony/Component/Yaml/Yaml.php
3c87e2e
@fabpot fabpot [Yaml] fixed default value e17e232
@fabpot fabpot updated CHANGELOG for 2.0.22 6645d30
@fabpot fabpot update CONTRIBUTORS for 2.0.22 e1d415a
@fabpot fabpot updated VERSION for 2.0.22 08ccc62
@fabpot fabpot [Yaml] fixed typo 51d1948
@fabpot fabpot [DependencyInjection] fixed a bug in the YAML dumper where references…
… where not converted to the @ notation
972e1b7
@fabpot fabpot [Yaml] fixed unneeded BC break 0138c2d
@fabpot fabpot bumped Symfony version to 2.0.23-DEV 4c437f6
@ezzatron ezzatron [Yaml] fixed #6770 fea20b7
@ezzatron ezzatron [Yaml] fixed #6773 ab0385c
Commits on Jan 18, 2013
@fabpot fabpot merged branch ezzatron/yaml-block-chomping (PR #6785)
This PR was merged into the 2.0 branch.

Commits
-------

ab0385c [Yaml] fixed #6773

Discussion
----------

[Yaml] fixed parsing of blocks with 'keep' chomping indicators (2.0 branch)

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

Also added a full set of tests for all combinations of literal/folded blocks and strip/clip/keep chomping indicators in both mid-file and end-of file positions.
4d673d7
@fabpot fabpot merged branch ezzatron/yaml-negative-integers (PR #6784)
This PR was merged into the 2.0 branch.

Commits
-------

fea20b7 [Yaml] fixed #6770

Discussion
----------

[Yaml] fixed parsing of negative integers (2.0 branch)

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

Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
0391ac7
@fabpot fabpot [Yaml] fixed ignored text when parsing an inlined mapping or sequence…
… (closes #6786)
53ccc2c
@fabpot fabpot [FrameworkBundle] fixed Client::doRequest that must call its parent m…
…ethod (closes #6737)
ce38069
@fabpot fabpot merged branch fabpot/client-fix (PR #6792)
This PR was merged into the 2.0 branch.

Commits
-------

ce38069 [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)

Discussion
----------

[FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6737
| License       | MIT
| Doc PR        | n/A
9773c8a
@fabpot fabpot merged branch fabpot/yaml-fix (PR #6790)
This PR was merged into the 2.0 branch.

Commits
-------

53ccc2c [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)

Discussion
----------

[Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6786
| License       | MIT
| Doc PR        | n/a
b9963ea
Commits on Jan 21, 2013
@franmomu franmomu [Security] PHPDoc in SecurityEvents 598ae9d
@fabpot fabpot merged branch franmomu/added_phpdoc_security_events (PR #6818)
This PR was squashed before being merged into the 2.0 branch (closes #6818).

Commits
-------

598ae9d [Security] PHPDoc in SecurityEvents

Discussion
----------

[Security] PHPDoc in SecurityEvents

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

I'm not sure about the description given.
5663820
@fabpot fabpot [DependencyInjection] fixed the creation of synthetic services in Con…
…tainerBuilder
4119caf
Commits on Jan 22, 2013
@fabpot fabpot merged branch fabpot/synthetic-service-fix (PR #6827)
This PR was merged into the 2.0 branch.

Commits
-------

4119caf [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder

Discussion
----------

[DependencyInjection] fixed the creation of synthetic services in ContainerBuilder

| 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

---------------------------------------------------------------------------

by stof at 2013-01-22T00:14:29Z

:+1:
115114b
Commits on Feb 04, 2013
@fabpot fabpot fixed a circular call (closes #6864) 74f2fcf
@fabpot fabpot merged branch fabpot/container-dumper-fix (PR #6959)
This PR was submitted for the 2.2 branch but it was merged into the 2.0 branch instead (closes #6959).

Commits
-------

ad889c9 [DependencyInjection] fixed a circular call (closes #6864)

Discussion
----------

[DependencyInjection] fixed a circular call (closes #6864)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6864
| License       | MIT
| Doc PR        | n/a
1eab515
@fabpot fabpot [HttpFoundation] fixed the creation of sub-requests under some circum…
…stancies (closes #6923, closes #6936)

This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
ddf4678
Commits on Feb 07, 2013
@fabpot fabpot merged branch fabpot/request-uti-fix (PR #6966)
This PR was merged into the 2.0 branch.

Commits
-------

ddf4678 [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)

Discussion
----------

[HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)

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

This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
4b30ae6
@romainneutron romainneutron Add dot character `.` to legal mime subtype regular expression a12744e
@fabpot fabpot merged branch romainneutron/file-binary-guesser (PR #7006)
This PR was merged into the 2.0 branch.

Commits
-------

a12744e Add dot character `.` to legal mime subtype regular expression

Discussion
----------

[HttpFoundation][2.0] Add dot character `.` to legal mime subtype regular expression

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

For example, the following mimetype (used for Microsoft powerpoints) is not recognized given the current regexp : `application/vnd.ms-powerpoint; charset=binary`
7a35cb7
@igorw igorw [DependencyInjection] Allow frozen containers to be dumped to graphviz bd0ad92
@fabpot fabpot merged branch igorw/graphviz-frozen-container-2.0 (PR #7017)
This PR was merged into the 2.0 branch.

Commits
-------

bd0ad92 [DependencyInjection] Allow frozen containers to be dumped to graphviz

Discussion
----------

[DependencyInjection] Allow frozen containers to be dumped to graphviz

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

This PR replaces #7010.
8c250bd
Commits on Feb 10, 2013
@vicb vicb [EventDispathcer] Fix removeListener 87f3db7
@fabpot fabpot merged branch vicb/event (PR #7023)
This PR was squashed before being merged into the 2.0 branch (closes #7023).

Commits
-------

87f3db7 [EventDispathcer] Fix removeListener

Discussion
----------

[EventDispathcer] Fix removeListener

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

Todo

- [x] Add a UT

I won't have time to add a test before next Friday but this PR could save some debugging (especially with Silex & Closures)

---------------------------------------------------------------------------

by vicb at 2013-02-09T23:32:51Z

Probably related to https://bugs.php.net/bug.php?id=62976, I need to do some more investigation - I use 546. anyway the fix is valid for whatever php version.

---------------------------------------------------------------------------

by vicb at 2013-02-10T10:24:46Z

This **is** related to the PHP bug mentioned above, see http://3v4l.org/Q6WKj:

```
Output for 5.3.18 - 5.3.21, 5.4.8 - 5.5.0alpha4
bool(false)

Output for 5.3.0 - 5.3.17, 5.4.0 - 5.4.7
Notice: Object of class Klass could not be converted to int in /in/Q6WKj on line 9
Notice: Object of class Closure could not be converted to int in /in/Q6WKj on line 9
int(0)
```

@fabpot anything more needed to merge this ?

---------------------------------------------------------------------------

by fabpot at 2013-02-10T10:26:52Z

Is it possible to add a test?

---------------------------------------------------------------------------

by vicb at 2013-02-10T10:29:34Z

It is, for php versions < fixed version, I'll do that

---------------------------------------------------------------------------

by vicb at 2013-02-10T10:42:01Z

@fabpot ready Sir !

---------------------------------------------------------------------------

by vicb at 2013-02-10T10:44:35Z

well I can probably add an assert, please wait !
ade5de0
@jakzal jakzal [EventDispatcher] Added assertion. 4ce9ac3
Commits on Feb 11, 2013
@fabpot fabpot merged branch jakzal/2.0-event (PR #7038)
This PR was merged into the 2.0 branch.

Commits
-------

4ce9ac3 [EventDispatcher] Added assertion.

Discussion
----------

[EventDispatcher] Added assertion

re #7023, I think it actually makes sense to add an assertion here. It reveals the intent of the test (listener is not removed).

---------------------------------------------------------------------------

by vicb at 2013-02-10T11:32:06Z

I don't think the assertion would fail with the former code, would it ?

---------------------------------------------------------------------------

by vicb at 2013-02-10T11:34:30Z

I mean an error would be generated even before the assertion.

---------------------------------------------------------------------------

by jakzal at 2013-02-10T11:37:05Z

Yes, it would fail before getting to the assertion with: *Object of class Closure could not be converted to int*.

However, this is something good to test for (and document - test is a documentation). We're not checking if type is taken into account in other tests. This test might still fail if code inside removeListener() changed.

---------------------------------------------------------------------------

by vicb at 2013-02-10T11:42:29Z

I don't really understand your point and think it is a bit useless here but I am not against your change - I don't argue that test is doc though.

---------------------------------------------------------------------------

by jakzal at 2013-02-10T15:38:09Z

Assertion is indeed useless for the bug you discovered and fixed. I think it's still worth to have it there for  other reason:
* test readability and completeness - with an assertion it's more clear that we don't expect the listener to be removed with the `removeListener()` call if passed argument doesn't match the one added before

If you still don't see my point just close this PR :)

---------------------------------------------------------------------------

by vicb at 2013-02-10T17:34:35Z

What I mean is that you are unit testing php and it is not a job for sf. So it is not strictly required but as it doesn't hurt, let's merge your change.

Jakub Zalas <notifications@github.com> wrote:

>Assertion is indeed useless for the bug you discovered and fixed. I
>think it's still worth to have it there for  other reason:
>* test readability and completeness - with an assertion it's more clear
>that we don't expect the listener to be removed with the
>`removeListener()` call if passed argument doesn't match the one added
>before
>
>If you still don't see my point just close this PR :)
>
>
>---
>Reply to this email directly or view it on GitHub:
>#7038 (comment)
880c1a0
@fabpot fabpot [DependencyInjection] fixed tests (refs #7017) d41fc8b
Commits on Feb 17, 2013
@Seldaek Seldaek [Process] Fix regression introduced in #6620 / 880da01, fixes #7082 179cd58
Commits on Feb 18, 2013
@fabpot fabpot merged branch Seldaek/regressionfix (PR #7102)
This PR was merged into the 2.0 branch.

Commits
-------

179cd58 [Process] Fix regression introduced in #6620 / 880da01, fixes #7082

Discussion
----------

[Process][2.0] getcwd failure fix

Fix regression introduced in #6620
Fixes #7082

For reference, here is the current behavior I saw:

PHP 5.4.11, windows:

```
5.4.11\php.exe -r "chdir('c:\\'); var_dump(getcwd()); $p = proc_open('pwd', [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']], $pipes, null); var_dump(stream_get_contents($pipes[1]));"
string(3) "C:\\"
string(14) "/c/Users/seld\n"
```

(I use pwd which is a unix util so it dumps a funny path, but don't look at that)

PHP 5.5alpha4, windows (seems fixed):

```
5.5.0a4\php.exe  -r "chdir('c:\\'); var_dump(getcwd()); $p = proc_open('pwd', [['pipe', 'r'], ['pipe', 'w'], ['pipe', 'w']], $pipes, null); var_dump(stream_get_contents($pipes[1]));"
string(3) "C:\"
string(3) "/c\n"
```

PHP 5.3.10, ubuntu:

```
php -r "chdir('/'); var_dump(getcwd()); \$p = proc_open('pwd', array(array('pipe', 'r'), array('p
ipe', 'w'), array('pipe', 'w')), \$pipes, null); var_dump(stream_get_contents(\$pipes[1]));"
string(1) "/"
string(2) "/\n"
```

Since the permission issue that #6620 originally was fixing is most likely not gonna happen on windows, this seems like a safe enough compromise. Ideally a check for PHP<5.5 should be introduced, but I would like to be sure it's been fixed and is not just a lucky coincidence (/cc @PierreJoye)

I would recommend merging fast and maybe adding the version check later, since it breaks composer create-project on windows. The workaround being: cd in the dir and run `composer install` again to finalize the project setup.

---------------------------------------------------------------------------

by vicb at 2013-02-17T20:12:17Z

Thanks @Seldaek !

Would you mind creating an issue for the version check so that it doesn't get lost ?

---------------------------------------------------------------------------

by Seldaek at 2013-02-18T10:43:56Z

@vicb done.

---------------------------------------------------------------------------

by vicb at 2013-02-18T11:45:16Z

thanks !
06e6c10
Commits on Feb 19, 2013
@JohannesKlauss JohannesKlauss [DomCrawler] lowered parsed protocol string (fixes #6986) cb03074
@fabpot fabpot merged branch cloppy/Dom-Crawler-fix (PR #7127)
This PR was merged into the 2.0 branch.

Commits
-------

cb03074 [DomCrawler] lowered parsed protocol string (fixes #6986)

Discussion
----------

[DomCrawler] lowered parsed protocol string (fixes #6986)

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

Are UTs needed for this?
cf15198
Commits on Feb 21, 2013
@webmozart webmozart [Form] Fixed "label" option to accept the value "0" f8812b2
@fabpot fabpot merged branch bschussek/issue6862 (PR #7150)
This PR was merged into the 2.0 branch.

Commits
-------

f8812b2 [Form] Fixed "label" option to accept the value "0"

Discussion
----------

[Form] Fixed "label" option to accept the value "0"

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

@fabpot: This commit will cause troubles when merging 2.0 into 2.1 and up. Tell me if you need help upon conflict resolution.
37d0491
Commits on Feb 27, 2013
@DenisGorbachev DenisGorbachev [Console] Fixed comment 3be3dde
@fabpot fabpot merged branch DenisGorbachev/2.0 (PR #7198)
This PR was merged into the 2.0 branch.

Commits
-------

3be3dde [Console] Fixed comment

Discussion
----------

[Console] Fixed comment

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
cb2277a
Commits on Mar 20, 2013
@fabpot fabpot updated CHANGELOG for 2.0.23 ad86c48
@fabpot fabpot update CONTRIBUTORS for 2.0.23 96618b5
@fabpot fabpot updated VERSION for 2.0.23 9948536
Commits on Aug 06, 2013
@webmozart webmozart Fixed metadata serialization 6d555bc
@jfsimon jfsimon added trusted hosts check c35cc5b
Commits on Aug 07, 2013
@fabpot fabpot updated CHANGELOG for 2.0.24 d22ac30
@fabpot fabpot updated VERSION for 2.0.24 2f19dab
Commits on Oct 10, 2013
@fabpot fabpot [Security] limited the password length passed to encoders 13d7d3a
@fabpot fabpot updated CHANGELOG for 2.0.25 40a77c1
@fabpot fabpot updated VERSION for 2.0.25
3968f00