Changed composer constraint to allow Doctrine 2.3 too
Added missing dependency to doctrine common in the global composer.json

Doctrine Common is a dependency of FrameworkBundle for the annotation
reader.
merged branch stof/allow_doctrine_2_3 (PR #4350)

Commits
-------

0581c3a Added missing dependency to doctrine common in the global composer.json
cdfb0b1 Changed composer constraint to allow Doctrine 2.3 too

Discussion
----------

Changed composer constraint to allow Doctrine 2.3 too

This allows both the 2.2.x and 2.3.x series for the Doctrine constraints instead of restricting to 2.2.x (thus allowing me to allow Doctrine 2.3 in DoctrineBundle too).

It also fixes some constraint that were missed when bumping the requirement to Doctrine 2.2 and added the missing deps in the global file (FrameworkBundle declares its dependency to ``doctrine/common`` for the ``annotation_reader`` service but it was not declared in the global file)

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

by travisbot at 2012-05-20T20:36:06Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1383231) (merged 0581c3a5 into 1407f112).

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

by stof at 2012-05-20T20:56:18Z

The failure is because the doctrine ORM does not allow Doctrine Common 2.2.x but only stable releases (see doctrine/doctrine2#351 fixing it) and Composer seems to resolve dev dependencies by considering all previous resolved deps as fixed whereas downgrading common to 2.2.2 could have worked to satisfy all deps

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

by fabpot at 2012-05-21T05:56:56Z

So, I cannot merge this until the composer bug is fixed (ping @naderman)

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

by stof at 2012-05-21T07:00:29Z

you could merge it now. The PR to the ORM has been merged so the composer.json is not triggering the issue anymore
[Console] Check for existence of proc_open to fix #4338

cs fix
merged branch davidwindell/issue_4338 (PR #4357)

Commits
-------

0a3dd0f [Console] Check for existence of proc_open to fix #4338

Discussion
----------

[Console] Check for existence of proc_open to fix #4338

It is quite common to disable proc_open for security purposes.

This PR checks for the existence of the proc_open function and fixes Issue #4338

Replacement for PR4356

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

by travisbot at 2012-05-21T10:49:59Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1387784) (merged dd991bea into 1407f112).

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

by travisbot at 2012-05-21T11:35:21Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1387991) (merged 0a3dd0fe into 1407f112).

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

by fabpot at 2012-05-21T12:17:32Z

I forgot to ask you to sent a new PR for the 2.0 branch instead of master. Thanks.

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

by davidwindell at 2012-05-21T13:03:36Z

proc_open is not used in 2.0?
merged 2.0
fixed CS
Merge branch '2.0'

* 2.0:
  fixed CS
  [HttpFoundation] Fix the UploadedFilename name sanitization (fix #2577)
fixed CS
merged branch Tobion/form-phpdoc (PR #4353)

Commits
-------

5d1b366 [Form] fix PhpDoc

Discussion
----------

[Form] fix PhpDoc

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

by travisbot at 2012-05-21T02:31:56Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1385372) (merged 5d1b3669 into 1407f112).

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

by vicb at 2012-05-21T05:44:03Z

have you used inheritdoc (over inheritDoc) on purpose ? (I must admin I haven't followed the CS discussion very closely)

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

by Tobion at 2012-05-21T16:16:48Z

Yes, inheritdoc is used on symfony. It's also the recommended way of phpdoc itself (all lower-case).
[HttpFoundation] Fix the UploadedFilename name sanitization (fix #2577)
[Routing] removed unused property of Router
[Routing] fixed namespace of test classes
[Routing] removed unused constructor arguments in test classes