fix overwriting of request's locale if attribute _locale is missing
[WebProfilerBundle] removed next pointer class in a template
merged branch bamarni/patch-3 (PR #7544)

This PR was merged into the 2.1 branch.

Discussion
----------

[WebProfilerBundle] removed next pointer class in a template

It's not needed as there is nothing after the span here, eg. on a 404, see :
http://awesomescreenshot.com/0d5149an51

It displays "n/a ::".

Commits
-------

b0ba9fd [WebProfilerBundle] removed next pointer class in a template
[FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
merged branch phc/2.1 (PR #7569)

This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes] I assume : only changed a comment word
| License       | MIT

Commits
-------

815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
updated CHANGELOG for 2.2.1
Merge branch '2.1' into 2.2

* 2.1:
  [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
  [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
  [WebProfilerBundle] removed next pointer class in a template
updated VERSION for 2.2.1
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