[Console] Fixed argument parsing when a single dash is passed.
[HttpFoundation] Fixed the way path to directory is trimmed.
fixed wrong usage of unset()
merged branch jakzal/file-bugfix (PR #9019)

This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Fixed the way path to directory is trimmed

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

Commits
-------

773e716 [HttpFoundation] Fixed the way path to directory is trimmed.
Fix FileResource test

I had the following test failing on OS X before:

There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
merged branch adrienbrault/patch-1 (PR #9016)

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

Discussion
----------

[Config] Fix FileResource test

I had the following test failing on OS X before:

```
There was 1 failure:

1) Symfony\Component\Config\Tests\Resource\FileResourceTest::testSerializeUnserialize
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml
+/private/var/folders/ph/1jns4kxj653gqg7try5m2k780000gn/T/tmp.xml

symfony/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php:56
```

Commits
-------

76a5b50 [Config] Fix FileResource test
merged branch jakzal/console-single-dash-argument (PR #9014)

This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fixed argument parsing when a single dash is passed.

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

Commits
-------

42019f6 [Console] Fixed argument parsing when a single dash is passed.
Use setTimeZone if this method exists.

The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.
merged branch dropfen/master (PR #9015)

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

Discussion
----------

Fix #6029 : Use setTimeZone if this method exists.

The php version is not a critical factor to choose the method, but we have to use setTimeZone, if it exists.

Commits
-------

7d84cd7 Use setTimeZone if this method exists.
removed unneeded comment
NativeSessionStorage regenerate
merged branch lancergr/ticket_8460 (PR #8969)

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

Discussion
----------

[HttpFoundation] NativeSessionStorage regenerate

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

Since session_start is called by the regenerate function, then the 'started' flag of NativeSessionStorage have to be set to true. Otherwise, the variable $_SESSION is initiated and the exception "Failed to start the session: already started by PHP ($_SESSION is set)." is thrown.

This can be reproduced by clearing the session data (cookies) before authenticating with a method that does not require csrf (eg. using the confirmation link of FOSUserBundle).

Commits
-------

7a0eeb3 [HttpFoundation] NativeSessionStorage regenerate
fixed CS
[FrameworkBundle][Security] Replaced void return type with null for consistency
merged branch jakzal/dockblock-void-null-fix (PR #9026)

This PR was squashed before being merged into the 2.2 branch (closes #9026).

Discussion
----------

[FrameworkBundle][Security] Replaced void return type with null for consistency

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

We're using `null` everywhere else.

Commits
-------

e4100ac [FrameworkBundle][Security] Replaced void return type with null for consistency
Merge branch '2.2' into 2.3

* 2.2:
  [FrameworkBundle][Security] Replaced void return type with null for consistency
  fixed CS
  NativeSessionStorage regenerate
  removed unneeded comment
  Use setTimeZone if this method exists.
  Fix FileResource test
  fixed wrong usage of unset()
  [HttpFoundation] Fixed the way path to directory is trimmed.
  [Console] Fixed argument parsing when a single dash is passed.

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php