Removed local config plugin and fixed Index info pages.
This commit is contained in:
parent
ffbe25d0b5
commit
761bc94b8e
3 changed files with 4 additions and 70 deletions
|
@ -7,8 +7,7 @@
|
||||||
"erusev/parsedown": "~1.6",
|
"erusev/parsedown": "~1.6",
|
||||||
"chillerlan/php-qrcode": "^4.3",
|
"chillerlan/php-qrcode": "^4.3",
|
||||||
"symfony/mailer": "^6.0",
|
"symfony/mailer": "^6.0",
|
||||||
"matomo/device-detector": "^6.1",
|
"matomo/device-detector": "^6.1"
|
||||||
"wikimedia/composer-merge-plugin": "^2.1"
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"classmap": [
|
"classmap": [
|
||||||
|
@ -28,16 +27,7 @@
|
||||||
"preferred-install": "dist",
|
"preferred-install": "dist",
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
"composer/installers": true,
|
"composer/installers": true,
|
||||||
"wikimedia/composer-merge-plugin": true
|
"wikimedia/composer-merge-plugin": false
|
||||||
}
|
|
||||||
},
|
|
||||||
"extra": {
|
|
||||||
"merge-plugin": {
|
|
||||||
"include": [
|
|
||||||
"composer.local.json"
|
|
||||||
],
|
|
||||||
"recurse": true,
|
|
||||||
"replace": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
58
composer.lock
generated
58
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "037a307fed5a3eb0c42409760b9166a3",
|
"content-hash": "157cc1ef2fbb3b5667fd0b539ce87b27",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "chillerlan/php-qrcode",
|
"name": "chillerlan/php-qrcode",
|
||||||
|
@ -1543,62 +1543,6 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-06-08T12:52:13+00:00"
|
"time": "2023-06-08T12:52:13+00:00"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "wikimedia/composer-merge-plugin",
|
|
||||||
"version": "v2.1.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/wikimedia/composer-merge-plugin.git",
|
|
||||||
"reference": "a03d426c8e9fb2c9c569d9deeb31a083292788bc"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/a03d426c8e9fb2c9c569d9deeb31a083292788bc",
|
|
||||||
"reference": "a03d426c8e9fb2c9c569d9deeb31a083292788bc",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"composer-plugin-api": "^1.1||^2.0",
|
|
||||||
"php": ">=7.2.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"composer/composer": "^1.1||^2.0",
|
|
||||||
"ext-json": "*",
|
|
||||||
"mediawiki/mediawiki-phan-config": "0.11.1",
|
|
||||||
"php-parallel-lint/php-parallel-lint": "~1.3.1",
|
|
||||||
"phpspec/prophecy": "~1.15.0",
|
|
||||||
"phpunit/phpunit": "^8.5||^9.0",
|
|
||||||
"squizlabs/php_codesniffer": "~3.7.1"
|
|
||||||
},
|
|
||||||
"type": "composer-plugin",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.x-dev"
|
|
||||||
},
|
|
||||||
"class": "Wikimedia\\Composer\\Merge\\V2\\MergePlugin"
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Wikimedia\\Composer\\Merge\\V2\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Bryan Davis",
|
|
||||||
"email": "bd808@wikimedia.org"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Composer plugin to merge multiple composer.json files",
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/wikimedia/composer-merge-plugin/issues",
|
|
||||||
"source": "https://github.com/wikimedia/composer-merge-plugin/tree/v2.1.0"
|
|
||||||
},
|
|
||||||
"time": "2023-04-15T19:07:00+00:00"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
|
|
|
@ -40,7 +40,7 @@ final class InfoHandler extends Handler {
|
||||||
$pfx = '';
|
$pfx = '';
|
||||||
|
|
||||||
if($isIndexDoc)
|
if($isIndexDoc)
|
||||||
$pfx = '/lib/index';
|
$pfx = '/vendor/flashwave/index';
|
||||||
elseif(!$isMisuzuDoc)
|
elseif(!$isMisuzuDoc)
|
||||||
$pfx = '/docs';
|
$pfx = '/docs';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue