Merge branch '3.4' into 4.1

fabpot · fabpot · commit 525c98b22458 · 2018-09-04T08:28:44.000+02:00
* 3.4:
  fixed usage of setUp in tests
  fixed usage of setUp in tests
  [travis] minor fix (quater)
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -79,7 +79,7 @@ function getContentHash(array $composerJson)
             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;
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -58,7 +58,7 @@ public function getStore()
     /** @var CombinedStore */
     private $store;
 
-    public function setup()
+    protected function setUp()
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
         $this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();
diff --git a/src/Symfony/Component/Lock/Tests/Strategy/ConsensusStrategyTest.php b/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();
     }
diff --git a/src/Symfony/Component/Lock/Tests/Strategy/UnanimousStrategyTest.php b/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();
     }
diff --git a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php b/src/Symfony/Component/Security/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();
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function getContentHash(array $composerJson)`
`79`	`79`	`continue 2;`
`80`	`80`	`}`
`81`	`81`
`82`		`- if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson[$key]['repositories'])) {`
	`82`	`+ if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson['repositories'])) {`
`83`	`83`	`// the locked package has been patched locally but the lock references a commit,`
`84`	`84`	`// which means the referencing package itself is not modified`
`85`	`85`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getStore()`
`58`	`58`	`/** @var CombinedStore */`
`59`	`59`	`private $store;`
`60`	`60`
`61`		`- public function setup()`
	`61`	`+ protected function setUp()`
`62`	`62`	`{`
`63`	`63`	`$this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();`
`64`	`64`	`$this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ConsensusStrategyTest extends TestCase`
`22`	`22`	`/** @var ConsensusStrategy */`
`23`	`23`	`private $strategy;`
`24`	`24`
`25`		`- public function setup()`
	`25`	`+ protected function setUp()`
`26`	`26`	`{`
`27`	`27`	`$this->strategy = new ConsensusStrategy();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class UnanimousStrategyTest extends TestCase`
`22`	`22`	`/** @var UnanimousStrategy */`
`23`	`23`	`private $strategy;`
`24`	`24`
`25`		`- public function setup()`
	`25`	`+ protected function setUp()`
`26`	`26`	`{`
`27`	`27`	`$this->strategy = new UnanimousStrategy();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,12 @@ private function getGeneratorAndStorage()`
`210`	`210`	`);`
`211`	`211`	`}`
`212`	`212`
`213`		`- public function setUp()`
	`213`	`+ protected function setUp()`
`214`	`214`	`{`
`215`	`215`	`$_SERVER['HTTPS'] = 'on';`
`216`	`216`	`}`
`217`	`217`
`218`		`- public function tearDown()`
	`218`	`+ protected function tearDown()`
`219`	`219`	`{`
`220`	`220`	`parent::tearDown();`
`221`	`221`