diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.8' into 3.4

Browse Source 
* 2.8:
  fixed usage of setUp in tests
  [travis] minor fix (quater)
This commit is contained in:
Fabien Potencier 2018-09-04 08:27:33 +02:00
commit fcc31cb6dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/rm-invalid-lowest-lock-files.php vendored
View File

@ -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;

4
src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
View File

@ -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();