[Security] Removed unused var
fix overwriting of request's locale if attribute _locale is missing
Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
bumped Symfony version to 2.2.2-DEV
[HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259
Fix Process timeout
Round stream_select fifth argument up.

- This argument must be an integer
- An argument equal to 0 should be avoided as it consumes too much CPU time
merged branch Seldaek/fix-deprecated-logs (PR #7587)

This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][HttpKernel] Remove args from 5.3 stack traces to avoid filling log files

Fixes #7259 - it just makes the PHP 5.3 behavior match the one on 5.4.

Commits
-------

99256e4 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259
merged branch romainneutron/process-timeout-2 (PR #7583)

This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][Process] Fix Process timeout

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

This PR fixes timeout in the process component.
Timeout can now be float values. The precision of the timeout is given by the `Process::TIMEOUT_PRECISION` constant.

Note : The timeout works when running the process with the `Process::run` method. When using the `Process::start` method, the `Process::checkTimeout` method should be regularly triggered to perform a check.

example :

```php
$process->start();

while ($condition) {
    // some stuff
    $process->checkTimeout(); // throws an Symfony\Process\Exception\RuntimeException if timeout is reached
    usleep(1000);
}
```

Commits
-------

bf4a9b0 Round stream_select fifth argument up.
3780fdb Fix Process timeout
fixed CS
Fix timeout in Process::stop method

 - The timeout is ten times more than set.
 - The timeout does not occurs, it is actually blocking until the process dies.
merged branch romainneutron/process-timeout (PR #7580)

This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][Process] Fix timeout in Process::stop method

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

- The timeout is ten times more than set.
- The timeout does not occurs, it is actually blocking until the process dies.

Commits
-------

bec8ff1 Fix timeout in Process::stop method
Fix autocompletion of command names when namespaces conflict
merged branch Seldaek/autocomplete_fix (PR #7589)

This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #7589).

Discussion
----------

[2.2][Console] Fix autocompletion of command names when namespaces conflict

Fixes #7234

Currently autocompletion of namespaces works on *all* namespaces at once. This fixes it to only search inside subnamespaces once we matched the first level namespace. Otherwise if you have `api:doc` and `generate:doctrine:entity` commands, typing `gen:doc:entity` trips it up because it thinks "doc" is "api:doc", and you end up with a completed name of `generate:doc:entity` which does not match any command.

Commits
-------

fa465b1 [2.2][Console] Fix autocompletion of command names when namespaces conflict
#7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
merged branch ro0NL/master (PR #7537)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7537).

Discussion
----------

#7531: [HttpKernel][Config] FileLocator adds NULL as global resource path

Fixed FileLocator in HttpKernel\Config package if global path ($path) is NULL (default).

Commits
-------

8a8239d #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
[HttpKernel] tweaked previous merge
merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)

This PR was merged into the 2.2 branch.

Discussion
----------

[Symfony\Bridge\Twig\Extension] fixed two methods' documentation blocks

| Q             | A
| ------------- | ---
| Fixed tickets | None
| License       | MIT

Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)

Commits
-------

2ea5eaa Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
Fix finding ACLs from ObjectIdentity's with different types
merged branch gordalina/multiple-classes-oids-acls (PR #7567)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7567).

Discussion
----------

[Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types

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

If more than one ObjectIdentity with different Type (Class name) is given to AclProvider::findAcls() it would throw an exception stating that it could not find the ACLs

This fixes this issue which was introduced in 2.2.0-RC3 - see commit 3c3a90b9e5c78f89027169a33e80cfa76b6f6c62

/cc @iBiryukov @schmittjoh

Commits
-------

8b0bb57 [Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types