Merge branch '4.1'
* 4.1: fixed usage of setUp in tests fixed usage of setUp in tests fixed usage of setUp in tests [travis] minor fix (quater)
This commit is contained in:
commit
a82b2a78c6
|
@ -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;
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -58,7 +58,7 @@ class CombinedStoreTest extends AbstractStoreTest
|
|||
/** @var CombinedStore */
|
||||
private $store;
|
||||
|
||||
public function setup()
|
||||
protected function setUp()
|
||||
{
|
||||
$this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
|
||||
$this->store1 = $this->getMockBuilder(StoreInterface::class)->getMock();
|
||||
|
|
|
@ -22,7 +22,7 @@ class ConsensusStrategyTest extends TestCase
|
|||
/** @var ConsensusStrategy */
|
||||
private $strategy;
|
||||
|
||||
public function setup()
|
||||
protected function setUp()
|
||||
{
|
||||
$this->strategy = new ConsensusStrategy();
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ class UnanimousStrategyTest extends TestCase
|
|||
/** @var UnanimousStrategy */
|
||||
private $strategy;
|
||||
|
||||
public function setup()
|
||||
protected function setUp()
|
||||
{
|
||||
$this->strategy = new UnanimousStrategy();
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Reference in New Issue