Merge branch '2.8' into 3.4

* 2.8:
  fixed usage of setUp in tests
  [travis] minor fix (quater)

Author: fabpot

Csrf/Tests/CsrfTokenManagerTest.php

@@ -210,12 +210,12 @@ private function getGeneratorAndStorage()
         );
     }
 
-    public function setUp()
+    protected function setUp()
     {
         $_SERVER['HTTPS'] = 'on';
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         parent::tearDown();