Item13897: Removed all 'use locale'; replaced 'use Moo' with 'use Fos…

…wiki::Class' - Added corresponding locale warnings to checkers anyhow related to UseLocae LSC key.
foswiki · Oct 10, 2016 · fd070b6 · fd070b6
1 parent 05f7777
commit fd070b6
Show file tree

Hide file tree

Showing 196 changed files with 139 additions and 1,582 deletions.
diff --git a/InterwikiPlugin/lib/Foswiki/Plugins/InterwikiPlugin.pm b/InterwikiPlugin/lib/Foswiki/Plugins/InterwikiPlugin.pm
@@ -37,15 +37,6 @@ my $sitePattern;
 my $pagePattern;
 my %interSiteTable;
 
-BEGIN {
-
-    # 'Use locale' for internationalisation of Perl sorting and searching -
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 # Read preferences and get all InterWiki Site->URL mappings
 sub initPlugin {
     my ( $topic, $web, $user, $installWeb ) = @_;

diff --git a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
@@ -68,8 +68,7 @@ use Foswiki::Serialise                     ();
 use Try::Tiny;
 use Unicode::Normalize;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Store);
 
 # Web Preferences topic *file* name
@@ -79,12 +78,6 @@ our $json = JSON->new->pretty(0);
 
 BEGIN {
 
-    # Import the locale for sorting
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-
     if ($Foswiki::UNICODE) {
         require Encode;
 

diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/Handler.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/Handler.pm
@@ -52,17 +52,11 @@ use Foswiki::Meta                   ();
 use Foswiki::Serialise              ();
 use Foswiki::Users::BaseUserMapping ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Object);
 
 # use the locale if required to ensure sort order is correct
 BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-
     *_decode = \&Foswiki::Store::decode;
     *_encode = \&Foswiki::Store::encode;
     *_stat   = \&Foswiki::Store::Rcs::Store::_stat;

diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsLiteHandler.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsLiteHandler.pm
@@ -94,8 +94,7 @@ use Foswiki::Store   ();
 use Foswiki::Sandbox ();
 use Foswiki::Exception();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Store::Rcs::Handler);
 
 # SMELL: This code uses the log field for the checkin comment. This field is alongside the actual text
@@ -125,11 +124,6 @@ use constant CAN_IGNORE_COMMENT => 0;    # 1
 #
 
 BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-
     *_decode = \&Foswiki::Store::decode;
     *_encode = \&Foswiki::Store::encode;
 }

diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm
@@ -23,16 +23,10 @@ use Assert;
 use Foswiki::Sandbox ();
 use Foswiki::Exception();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Store::Rcs::Handler);
 
 BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-
     *_decode = \&Foswiki::Store::decode;
     *_encode = \&Foswiki::Store::encode;
 }

diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/Store.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/Store.pm
@@ -41,8 +41,7 @@ use Foswiki::Sandbox   ();
 use Foswiki::Serialise ();
 use Foswiki::Exception ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Store);
 
 has searchFn       => ( is => 'rw', );
@@ -51,12 +50,6 @@ has searchQueryObj => ( is => 'rw', );
 
 BEGIN {
 
-    # Do a dynamic 'use locale' for this module
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-
     # The RCS Handler code works on bytes, so we have to mediate
     if ($Foswiki::UNICODE) {
         require Encode;

diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm
@@ -12,13 +12,6 @@ use Error qw(:try);
 
 use Unicode::Normalize;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 my @curTable;
 my $translationToken;
 my $insideTABLE;

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -115,11 +115,6 @@ BEGIN {
     use version 0.77; $VERSION = version->declare('v2.99.0');
     $RELEASE = 'Foswiki-2.99.0';
 
-    #if ( $Foswiki::cfg{UseLocale} ) {
-    #    require locale;
-    #    import locale();
-    #}
-
     # Set environment var FOSWIKI_NOTAINT to disable taint checks even
     # if Taint::Runtime is installed
     if ( DEBUG && !$ENV{FOSWIKI_NOTAINT} ) {

diff --git a/core/lib/Foswiki/Access.pm b/core/lib/Foswiki/Access.pm
@@ -13,20 +13,11 @@ use v5.14;
 
 use Assert;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class qw(app);
 extends qw(Foswiki::Object);
-with qw(Foswiki::AppObject);
 
 use constant MONITOR => 0;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 has failure => (
     is      => 'rw',
     clearer => 1,

diff --git a/core/lib/Foswiki/Access/AdminOnlyAccess.pm b/core/lib/Foswiki/Access/AdminOnlyAccess.pm
@@ -13,17 +13,10 @@ use v5.14;
 
 use Assert;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Access);
-use constant MONITOR => 0;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
+use constant MONITOR => 0;
 
 =begin TML
 

diff --git a/core/lib/Foswiki/Access/TopicACLAccess.pm b/core/lib/Foswiki/Access/TopicACLAccess.pm
@@ -19,17 +19,9 @@ use Foswiki        ();
 use Foswiki::Meta  ();
 use Foswiki::Users ();
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Access);
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 =begin TML
 
 ---++ ObjectMethod haveAccess($mode, $User, $web, $topic, $attachment) -> $boolean

diff --git a/core/lib/Foswiki/Access/TopicACLReadOnlyAccess.pm b/core/lib/Foswiki/Access/TopicACLReadOnlyAccess.pm
@@ -13,17 +13,10 @@ use v5.14;
 
 use Assert;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Access::TopicACLAccess);
-use constant MONITOR => 0;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
+use constant MONITOR => 0;
 
 =begin TML
 

diff --git a/core/lib/Foswiki/AccessControlException.pm b/core/lib/Foswiki/AccessControlException.pm
@@ -84,17 +84,9 @@ use v5.14;
 
 use Assert;
 
-use Moo;
-use namespace::clean;
+use Foswiki::Class;
 extends qw(Foswiki::Exception);
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 #our @_newParameters = qw( mode user web topic reason );
 
 has web    => ( is => 'ro', required => 1, );

diff --git a/core/lib/Foswiki/Address.pm b/core/lib/Foswiki/Address.pm
@@ -64,9 +64,8 @@ use Assert;
 use Foswiki::Func();
 use Foswiki::Meta();
 
-use Moo;
-use namespace::clean;
-extends 'Foswiki::Object';
+use Foswiki::Class;
+extends qw(Foswiki::Object);
 
 #use Data::Dumper;
 use constant TRACE                     => 0;  # Don't forget to uncomment dumper
@@ -76,13 +75,6 @@ use constant TRACEATTACH               => 0;
 use constant STRINGIFIED_WEB_SEPARATOR => '/';
 use constant STRINGIFIED_TOPIC_SEPARATOR => '.';
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 my $EXISTASLIST_DEFAULT = [qw(attachment topic)];
 my $EXISTAS_DEFAULT     = { attachment => 1, topic => 1 };
 my %atomiseAs           = (

diff --git a/core/lib/Foswiki/AggregateIterator.pm b/core/lib/Foswiki/AggregateIterator.pm
@@ -12,17 +12,10 @@ Combine multiple iterators into a single iteration.
 package Foswiki::AggregateIterator;
 use v5.14;
 
-use Moo;
+use Foswiki::Class;
 extends qw(Foswiki::Object);
 with qw(Foswiki::Iterator);
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 =begin TML
 
 ---++ new(iterators => \@list, uniqueOnly => $unique)

diff --git a/core/lib/Foswiki/Attach.pm b/core/lib/Foswiki/Attach.pm
@@ -18,13 +18,6 @@ use Foswiki qw(expandStandardEscapes);
 use Foswiki::Class qw(app);
 extends qw(Foswiki::Object);
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 our $MARKER = "\0";
 
 =begin TML

diff --git a/core/lib/Foswiki/Attrs.pm b/core/lib/Foswiki/Attrs.pm
@@ -53,13 +53,6 @@ use strict;
 use warnings;
 use Assert;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 # Used in interpolation an regexes, so constant not appropriate
 our $MARKER = "\0";
 

diff --git a/core/lib/Foswiki/Compatibility.pm b/core/lib/Foswiki/Compatibility.pm
@@ -5,13 +5,6 @@ use strict;
 use warnings;
 use Assert;
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 =begin TML
 
 ---+ package Foswiki::Compatibility

diff --git a/core/lib/Foswiki/Configure/Checkers/Site/Locale.pm b/core/lib/Foswiki/Configure/Checkers/Site/Locale.pm
@@ -2,7 +2,7 @@
 package Foswiki::Configure::Checkers::Site::Locale;
 use v5.14;
 
-use Moo;
+use Foswiki::Class;
 extends qw(Foswiki::Configure::Checker);
 
 my @required = (
@@ -13,6 +13,7 @@ sub check_current_value {
     my ( $this, $reporter ) = @_;
 
     if ( $Foswiki::cfg{UseLocale} ) {
+        $reporter->WARN("POSIX locales are not supported anymore.");
         eval("use locale;use POSIX");
         if ($@) {
             return $this->WARN( 'Locales cannot be used. Error was: '

diff --git a/core/lib/Foswiki/Configure/Checkers/Store/Encoding.pm b/core/lib/Foswiki/Configure/Checkers/Store/Encoding.pm
@@ -46,6 +46,7 @@ HERE
         }
 
         if ( $Foswiki::cfg{UseLocale} ) {
+            $reporter->WARN("POSIX locales are not supported anymore.");
 
             # Extract the character set from locale for consistency check
             my $charset;

diff --git a/core/lib/Foswiki/Configure/Checkers/UseLocale.pm b/core/lib/Foswiki/Configure/Checkers/UseLocale.pm
@@ -16,6 +16,8 @@ sub check_current_value {
 
     return unless $Foswiki::cfg{UseLocale};
 
+    $reporter->WARN("POSIX locales are not supported any more.");
+
     Foswiki::Configure::Dependency::checkPerlModules(@required);
     foreach my $mod (@required) {
         if ( !$mod->{ok} && !$mod->{optional} ) {

diff --git a/core/lib/Foswiki/Engine.pm b/core/lib/Foswiki/Engine.pm
@@ -164,13 +164,6 @@ Hashref of headers.
 
 has headers => ( is => 'rw', lazy => 1, builder => '_prepareHeaders', );
 
-BEGIN {
-    if ( $Foswiki::cfg{UseLocale} ) {
-        require locale;
-        import locale();
-    }
-}
-
 =begin TML
 ---++ ClassMethod start(env => \%env)