Item14237: New Foswiki::Class option format compatibility

foswiki · May 16, 2018 · 08c44cc · 08c44cc
1 parent a081ccd
commit 08c44cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/core/lib/Foswiki/Config.pm b/core/lib/Foswiki/Config.pm
@@ -221,12 +221,6 @@ use Foswiki qw(urlEncode urlDecode make_params);
 use Foswiki::Configure::FileUtil;
 use Foswiki::Exception::Config;
 
-package Foswiki::Exception::_expandStr::UndefVal {
-    use Foswiki::Class;
-    extends qw<Foswiki::Exception>;
-    with qw<Foswiki::Exception::Harmless>;
-}
-
 use Foswiki::Class -app;
 extends qw(Foswiki::Object);
 with qw(Foswiki::Util::Localize);
@@ -4342,6 +4336,11 @@ sub _specCfgKey {
     }
 }
 
+package Foswiki::Exception::_expandStr::UndefVal;
+use Foswiki::Class;
+extends qw<Foswiki::Exception>;
+with qw<Foswiki::Exception::Harmless>;
+
 1;
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/

diff --git a/core/lib/Foswiki/IncludeHandlers/doc.pm b/core/lib/Foswiki/IncludeHandlers/doc.pm
@@ -76,15 +76,15 @@ sub INCLUDE {
     my $isa;
     state $extendsRx = qr/(?<=;)\s*(?:extends\s+|our\s+\@ISA\s*=\s*)/;
     state $withRx    = qr/(?<=;)\s*with\s+(?=q|\()/;
-    state $fwClassRx = qr/(?<=;)\s*use\s+Foswiki::Class\s+/;
+    state $fwClassRx = qr/(?<=;)\s*use\s+Foswiki::Class\s*/;
     my %baseType2Text = (
         extends    => 'IS A',
         with       => 'ROLES',
         classAttrs => _doclink( $app, 'Foswiki::Class' ) . ' MODIFIERS',
     );
     my %classAttributes2Roles = (
-        app       => 'Foswiki::AppObject',
-        callbacks => 'Foswiki::Util::Callbacks',
+        -app       => 'Foswiki::Role::AppObject',
+        -callbacks => 'Foswiki::Role::Callbacks',
     );
 
     if (USE_LEXICAL_PARSER) {