From 73d3f9f7f7684da34befd2fb2a4e4166f04d7f02 Mon Sep 17 00:00:00 2001 From: TheNewHEROBRINEX Date: Wed, 17 Jul 2019 17:52:29 +0200 Subject: [PATCH 1/3] Fix loadbefore sometimes not working (#3040) loadbefore operates by injecting self into the target plugin's soft-dependencies. The problem is that these soft-dependency lists are overwritten if the target plugin's soft-dependencies are resolved after the loadbefore of the origin plugin. --- src/pocketmine/plugin/PluginManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 0034dc93a2..7936542fd7 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -286,7 +286,7 @@ class PluginManager{ $plugins[$name] = $file; - $softDependencies[$name] = $description->getSoftDepend(); + $softDependencies[$name] = array_merge($softDependencies[$name] ?? [], $description->getSoftDepend()); $dependencies[$name] = $description->getDepend(); foreach($description->getLoadBefore() as $before){ From f5491346ceece9af880f58f01ec0db9f03448ddd Mon Sep 17 00:00:00 2001 From: Dylan T Date: Fri, 19 Jul 2019 10:34:41 +0100 Subject: [PATCH 2/3] doxygen: set HIDE_IN_BODY_DOCS = yes (#3044) fixes #3043 --- doxygen/doxygen.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 293669c888..4939b61cf0 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -530,7 +530,7 @@ HIDE_FRIEND_COMPOUNDS = NO # blocks will be appended to the function's detailed documentation block. # The default value is: NO. -HIDE_IN_BODY_DOCS = NO +HIDE_IN_BODY_DOCS = YES # The INTERNAL_DOCS tag determines if documentation that is typed after a # \internal command is included. If the tag is set to NO then the documentation From 670bf2b9d186087a7b0ff637a11f0e1604f77b26 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Fri, 19 Jul 2019 10:52:32 +0100 Subject: [PATCH 3/3] doxygen: sort more things, for our sanity (#3045) --- doxygen/doxygen.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 4939b61cf0..371218ecec 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -600,7 +600,7 @@ SORT_MEMBER_DOCS = YES # this will also influence the order of the classes in the class list. # The default value is: NO. -SORT_BRIEF_DOCS = NO +SORT_BRIEF_DOCS = YES # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the # (brief and detailed) documentation of class members so that constructors and @@ -612,7 +612,7 @@ SORT_BRIEF_DOCS = NO # detailed member documentation. # The default value is: NO. -SORT_MEMBERS_CTORS_1ST = NO +SORT_MEMBERS_CTORS_1ST = YES # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy # of group names into alphabetical order. If set to NO the group names will