dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: avoid LoadBalancer::getConnection waste when using $groups"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
composer
/
ComposerInstalledTest.php
diff --git
a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
index
05ae2a3
..
58e617c
100644
(file)
--- a/
tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
+++ b/
tests/phpunit/includes/libs/composer/ComposerInstalledTest.php
@@
-1,13
+1,12
@@
<?php
<?php
-class ComposerInstalledTest extends
MediaWiki
TestCase {
+class ComposerInstalledTest extends
PHPUnit\Framework\
TestCase {
private $installed;
public function setUp() {
parent::setUp();
private $installed;
public function setUp() {
parent::setUp();
- global $IP;
- $this->installed = "$IP/tests/phpunit/data/composer/installed.json";
+ $this->installed = __DIR__ . "/../../../data/composer/installed.json";
}
/**
}
/**
@@
-16,7
+15,7
@@
class ComposerInstalledTest extends MediaWikiTestCase {
*/
public function testGetInstalledDependencies() {
$installed = new ComposerInstalled( $this->installed );
*/
public function testGetInstalledDependencies() {
$installed = new ComposerInstalled( $this->installed );
- $this->assert
Array
Equals( [
+ $this->assertEquals( [
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
'leafo/lessphp' => [
'version' => '0.5.0',
'type' => 'library',
@@
-494,6
+493,6
@@
class ComposerInstalledTest extends MediaWikiTestCase {
],
'description' => 'The PHP Unit Testing framework.',
],
],
'description' => 'The PHP Unit Testing framework.',
],
- ], $installed->getInstalledDependencies()
, false, true
);
+ ], $installed->getInstalledDependencies() );
}
}
}
}