From f9bd8acc580f69d3af8bea56dcc31f1d2322a4d8 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 3 Sep 2018 15:07:08 +0200 Subject: [PATCH 1/4] [travis] minor fix (quater) --- .github/rm-invalid-lowest-lock-files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php index c71463262171..3105942a0903 100644 --- 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; From 62e620843e30a228fc830783215384b68f31ba5f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Sep 2018 07:42:16 +0200 Subject: [PATCH 2/4] fixed usage of setUp in tests --- .../Component/Security/Csrf/Tests/CsrfTokenManagerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php b/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php index 214a189e99b1..2ec282144cfe 100644 --- 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(); From 298782841c636be9b4976cb9d32d642c3806a2b6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Sep 2018 08:21:44 +0200 Subject: [PATCH 3/4] fixed usage of setUp in tests --- src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php | 2 +- .../Component/Lock/Tests/Strategy/ConsensusStrategyTest.php | 2 +- .../Component/Lock/Tests/Strategy/UnanimousStrategyTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php index 699a3072b341..f2c55b056b32 100644 --- 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 index 87e83a992569..b8c09dfb31fa 100644 --- 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 index beff54a68574..4e63e6b4e2cd 100644 --- 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(); } From d8ba2cd7030cd7156fd11c3174df5e43d686499d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Sep 2018 08:24:48 +0200 Subject: [PATCH 4/4] fixed usage of setUp in tests --- .../DependencyInjection/Tests/ParameterBag/ContainerBagTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ContainerBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ContainerBagTest.php index a5e358dd1f21..7b9d1dc5dadc 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ContainerBagTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ContainerBagTest.php @@ -26,7 +26,7 @@ class ContainerBagTest extends TestCase /** @var ContainerBag */ private $containerBag; - public function setUp() + protected function setUp() { $this->parameterBag = new ParameterBag(array('foo' => 'value')); $this->containerBag = new ContainerBag(new Container($this->parameterBag));