Merge branch '2.8' into 3.4
* 2.8: fixed usage of setUp in tests [travis] minor fix (quater)
This commit is contained in:
commit
fcc31cb6dd
2
.github/rm-invalid-lowest-lock-files.php
vendored
2
.github/rm-invalid-lowest-lock-files.php
vendored
@ -79,7 +79,7 @@ foreach ($composerJsons as list($dir, $lockedPackages)) {
|
|||||||
continue 2;
|
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,
|
// the locked package has been patched locally but the lock references a commit,
|
||||||
// which means the referencing package itself is not modified
|
// which means the referencing package itself is not modified
|
||||||
continue;
|
continue;
|
||||||
|
@ -210,12 +210,12 @@ class CsrfTokenManagerTest extends TestCase
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
$_SERVER['HTTPS'] = 'on';
|
$_SERVER['HTTPS'] = 'on';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tearDown()
|
protected function tearDown()
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user