Item14152: Merge commit 'f798fe266f44c16bd49cf3f8d61eab0e42a58688' in…

…to Item14152

* commit 'f798fe266f44c16bd49cf3f8d61eab0e42a58688':
  Item13897: Turn on memorly leak detection only by FOSWIKI_CHECKLEAK environment variable.
  Item13897: Experimental rewrite of Foswiki::IncludeHandlers::doc
  Item13897: Minor documentation fixes.
  Item13897: Fixed loosing of cloned __orig_ attributes.
  Item13897: Fixed a problem with disapperaring $SERVER.
  Item13897: Fixed load_package() for more reliability
  Item13897: Fixed few memory leaks.

JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib.pm

@@ -1,13 +1,11 @@
 # See bottom of file for license and copyright information
 
 package Foswiki::Contrib::JsonRpcContrib;
-use v5.14;
 
 use Foswiki::Request                         ();
 use Foswiki::Contrib::JsonRpcContrib::Server ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::UI);
 
 #BEGIN {
@@ -50,8 +48,14 @@ sub BUILD {
     $SERVER = $this->server;
 }
 
+sub DEMOLISH {
+    undef $SERVER;
+}
+
 sub registerMethod {
-    $Foswiki::app->create(__PACKAGE__) unless $SERVER;
+    $Foswiki::app->heap->{JsonRpcContrib}{object} =
+      $Foswiki::app->create(__PACKAGE__)
+      unless $SERVER;
     $SERVER->registerMethod(@_);
 }
 

UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST

@@ -14,6 +14,7 @@ lib/Unit/CGIEngine.pm 0644
 lib/Unit/Eavesdrop.pm 0644
 lib/Unit/ExternalEngine.pm 0644
 lib/Unit/HTMLDiffer.pm 0644
+lib/Unit/Leak/Object.pm 0644
 lib/Unit/Response.pm 0644
 lib/Unit/TestCase.pm 0644
 lib/Unit/PlackTestCase.pm 0644