Skip to content

Commit fcc31cb

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: fixed usage of setUp in tests [travis] minor fix (quater)
2 parents e170d94 + 26b173b commit fcc31cb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function getContentHash(array $composerJson)
7979
continue 2;
8080
}
8181

82-
if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson[$key]['repositories'])) {
82+
if (isset($composerJsons[$name][2]['repositories']) && !isset($lockedJson['repositories'])) {
8383
// the locked package has been patched locally but the lock references a commit,
8484
// which means the referencing package itself is not modified
8585
continue;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ private function getGeneratorAndStorage()
210210
);
211211
}
212212

213-
public function setUp()
213+
protected function setUp()
214214
{
215215
$_SERVER['HTTPS'] = 'on';
216216
}
217217

218-
public function tearDown()
218+
protected function tearDown()
219219
{
220220
parent::tearDown();
221221

0 commit comments

Comments
 (0)