From 761bc94b8e40988bace526ff1e065e7d6ae6a0ed Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Fri, 21 Jul 2023 19:30:28 +0000
Subject: [PATCH] Removed local config plugin and fixed Index info pages.

---
 composer.json                     | 14 ++------
 composer.lock                     | 58 +------------------------------
 src/Http/Handlers/InfoHandler.php |  2 +-
 3 files changed, 4 insertions(+), 70 deletions(-)

diff --git a/composer.json b/composer.json
index 4e32384..45d54d1 100644
--- a/composer.json
+++ b/composer.json
@@ -7,8 +7,7 @@
         "erusev/parsedown": "~1.6",
         "chillerlan/php-qrcode": "^4.3",
         "symfony/mailer": "^6.0",
-        "matomo/device-detector": "^6.1",
-        "wikimedia/composer-merge-plugin": "^2.1"
+        "matomo/device-detector": "^6.1"
     },
     "autoload": {
         "classmap": [
@@ -28,16 +27,7 @@
         "preferred-install": "dist",
         "allow-plugins": {
             "composer/installers": true,
-            "wikimedia/composer-merge-plugin": true
-        }
-    },
-    "extra": {
-        "merge-plugin": {
-            "include": [
-                "composer.local.json"
-            ],
-            "recurse": true,
-            "replace": true
+            "wikimedia/composer-merge-plugin": false
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 3895635..1643481 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "037a307fed5a3eb0c42409760b9166a3",
+    "content-hash": "157cc1ef2fbb3b5667fd0b539ce87b27",
     "packages": [
         {
             "name": "chillerlan/php-qrcode",
@@ -1543,62 +1543,6 @@
                 }
             ],
             "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": [],
diff --git a/src/Http/Handlers/InfoHandler.php b/src/Http/Handlers/InfoHandler.php
index 24929cb..cc2f5e9 100644
--- a/src/Http/Handlers/InfoHandler.php
+++ b/src/Http/Handlers/InfoHandler.php
@@ -40,7 +40,7 @@ final class InfoHandler extends Handler {
         $pfx = '';
 
         if($isIndexDoc)
-            $pfx = '/lib/index';
+            $pfx = '/vendor/flashwave/index';
         elseif(!$isMisuzuDoc)
             $pfx = '/docs';