aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/phpunit/data/composer/composer.json36
-rw-r--r--tests/phpunit/data/composer/new-composer.json48
-rw-r--r--tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php3
3 files changed, 4 insertions, 83 deletions
diff --git a/tests/phpunit/data/composer/composer.json b/tests/phpunit/data/composer/composer.json
index 52b60fcf7181..f4c2691334db 100644
--- a/tests/phpunit/data/composer/composer.json
+++ b/tests/phpunit/data/composer/composer.json
@@ -1,20 +1,6 @@
{
- "name": "mediawiki/core",
- "description": "Free software wiki application developed by the Wikimedia Foundation and others",
- "keywords": ["mediawiki", "wiki"],
- "homepage": "https://www.mediawiki.org/",
- "authors": [
- {
- "name": "MediaWiki Community",
- "homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
- }
- ],
- "license": "GPL-2.0-only",
- "support": {
- "issues": "https://bugzilla.wikimedia.org/",
- "irc": "irc://irc.libera.chat/mediawiki",
- "wiki": "https://www.mediawiki.org/"
- },
+ "name": "example/test",
+ "license": "0BSD",
"require": {
"leafo/lessphp": "0.5.0",
"php": ">=5.3.3",
@@ -26,23 +12,7 @@
"phpunit/phpunit": "*"
},
"suggest": {
- "ext-fileinfo": "*",
"ext-mbstring": "*",
- "ext-wikidiff2": "*",
- "ext-apc": "*",
- "monolog/monolog": "*"
- },
- "autoload": {
- "psr-0": {
- "ComposerHookHandler": "includes/composer"
- }
- },
- "scripts": {
- "pre-update-cmd": "ComposerHookHandler::onPreUpdate",
- "pre-install-cmd": "ComposerHookHandler::onPreInstall"
- },
- "config": {
- "prepend-autoloader": false,
- "optimize-autoloader": true
+ "ext-apc": "*"
}
}
diff --git a/tests/phpunit/data/composer/new-composer.json b/tests/phpunit/data/composer/new-composer.json
deleted file mode 100644
index 35e3c0365b75..000000000000
--- a/tests/phpunit/data/composer/new-composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "name": "mediawiki/core",
- "description": "Free software wiki application developed by the Wikimedia Foundation and others",
- "keywords": ["mediawiki", "wiki"],
- "homepage": "https://www.mediawiki.org/",
- "authors": [
- {
- "name": "MediaWiki Community",
- "homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
- }
- ],
- "license": "GPL-2.0-only",
- "support": {
- "issues": "https://bugzilla.wikimedia.org/",
- "irc": "irc://irc.libera.chat/mediawiki",
- "wiki": "https://www.mediawiki.org/"
- },
- "require": {
- "leafo/lessphp": "0.5.0",
- "php": ">=5.3.3",
- "psr/log": "1.0.0",
- "cssjanus/cssjanus": "1.1.1",
- "wikimedia/cdb": "1.0.1"
- },
- "require-dev": {
- "phpunit/phpunit": "*"
- },
- "suggest": {
- "ext-fileinfo": "*",
- "ext-mbstring": "*",
- "ext-wikidiff2": "*",
- "ext-apc": "*",
- "monolog/monolog": "*"
- },
- "autoload": {
- "psr-0": {
- "ComposerHookHandler": "includes/composer"
- }
- },
- "scripts": {
- "pre-update-cmd": "ComposerHookHandler::onPreUpdate",
- "pre-install-cmd": "ComposerHookHandler::onPreInstall"
- },
- "config": {
- "prepend-autoloader": false,
- "optimize-autoloader": true
- }
-}
diff --git a/tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php b/tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php
index 25d43c84e365..833e32300006 100644
--- a/tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php
+++ b/tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php
@@ -2,12 +2,11 @@
class ComposerJsonTest extends PHPUnit\Framework\TestCase {
- private $json, $json2;
+ private $json;
protected function setUp() : void {
parent::setUp();
$this->json = __DIR__ . "/../../../../data/composer/composer.json";
- $this->json2 = __DIR__ . "/../../../../data/composer/new-composer.json";
}
/**