Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none
minor #11946 [CI] Fixed merge conflict in .travis.yml (phansys)

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

Discussion
----------

[CI] Fixed merge conflict in .travis.yml

Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Doc PR        | none

Commits
-------

5238eba Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd
Unit test fixes
minor #11952 Unit test fixes (fejese)

This PR was squashed before being merged into the 2.5 branch (closes #11952).

Discussion
----------

Unit test fixes

[Validator][Debug] Fixing unit tests

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

Commits
-------

3c11fa5 Unit test fixes
[Debug] Restoring error handler before assertions
minor #11963 Unit test fixes
[HttpKernel] Fixing unit test broken since merge 4677e92ffeac80
[Validator] Fixing the way the default time zone is backed up
[Tests] PHPUnit Optimizations
minor #11962 [Tests] PHPUnit Optimizations (lyrixx)

This PR was merged into the 2.6-dev branch.

Discussion
----------

[Tests] PHPUnit Optimizations

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

Commits
-------

790127c [Tests] PHPUnit Optimizations
minor #11963 Fixing unit tests (fejese)

This PR was merged into the 2.6-dev branch.

Discussion
----------

Fixing unit tests

[Validator] Fixing how default time zone is backed up during testing to not interfere with other tests
[HttpKernel] Fixing merge issue since 4677e92ffeac80

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

Commits
-------

5b3193a minor #11963 Unit test fixes [HttpKernel] Fixing unit test broken since merge 4677e92ffeac80 [Validator] Fixing the way the default time zone is backed up
minor #11959 [Debug] Restoring error handler before assertions (fejese)

This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] Restoring error handler before assertions

[Debug] Improving unit test

As a follow up of @stof's comment on #11952 the reset of error handlers been moved up before the assertions to clean up even in case of a failure.

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

Commits
-------

51fa3ef [Debug] Restoring error handler before assertions
Merge branch '2.5'

* 2.5:
  [Debug] Restoring error handler before assertions
  Unit test fixes
  Fixed merge conflict in .travis.yml introduced in 687703a75ed741464e15b71a1e576c319865f3fd

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
[FrameworkBundle] Determine templating.engine.php scope as late as possible