Merge branch '3.4' into 4.1

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

.github/rm-invalid-lowest-lock-files.php

@@ -79,7 +79,7 @@ foreach ($composerJsons as list($dir, $lockedPackages)) {
             continue 2;
         }
 
-        if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson[$key]['repositories'])) {
+        if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson['repositories'])) {
             // the locked package has been patched locally but the lock references a commit,
             // which means the referencing package itself is not modified
             continue;

src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php

@@ -58,7 +58,7 @@ class CombinedStoreTest extends AbstractStoreTest
     /** @var CombinedStore */
     private $store;
 
-    public function setup()
+    protected function setUp()
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
         $this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();

src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php

@@ -22,7 +22,7 @@ class ConsensusStrategyTest extends TestCase
     /** @var ConsensusStrategy */
     private $strategy;
 
-    public function setup()
+    protected function setUp()
     {
         $this->strategy = new ConsensusStrategy();
     }

src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php

@@ -22,7 +22,7 @@ class UnanimousStrategyTest extends TestCase
     /** @var UnanimousStrategy */
     private $strategy;
 
-    public function setup()
+    protected function setUp()
     {
         $this->strategy = new UnanimousStrategy();
     }

src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php

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