[Rt-commit] rt branch, 4.2/shredder-critic, repushed

[Alex Vandiver]

The branch 4.2/shredder-critic was deleted and repushed:
       was 1c2d400cc11c9b3e836c383f62aa445892abd5a1
       now df973f3c2b23ee92eabf0f086856e4cb5670e7ac

1:  da723e0 = 1:  ae4dfa4 use foreach to edit array, not map
2:  c88790c ! 2:  08cdd54 Switch to using UNIVERSAL::require rather than eval "require $_"
    @@ -121,6 +121,16 @@
      
      sub _GuessCharset {
          my $fallback = _CanonicalizeCharset('iso-8859-1');
    +@@
    +         return 'gbk';
    +     }
    +     elsif ( $charset =~ /^(?:(?:big5(-1984|-2003|ext|plus))|cccii|unisys|euc-tw|gb18030|(?:cns11643-\d+))$/ ) {
    +-        eval { require Encode::HanExtra };
    +-        if ( $@ ) {
    ++        unless ( Encode::HanExtra->require ) {
    +             RT->Logger->error("Please install Encode::HanExtra to handle $charset");
    +         }
    +         return $charset;
     
     diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
     --- a/lib/RT/Interface/Email.pm
    @@ -340,6 +350,19 @@
              $RT::Logger->crit("Couldn't load class '$class': $@");
              next;
          }
    +
    +diff --git a/share/html/Admin/Tools/Theme.html b/share/html/Admin/Tools/Theme.html
    +--- a/share/html/Admin/Tools/Theme.html
    ++++ b/share/html/Admin/Tools/Theme.html
    +@@
    + 
    + use List::MoreUtils qw(uniq);
    + 
    +-my $has_color_analyzer = eval { require Convert::Color; 1 };
    ++my $has_color_analyzer = Convert::Color->require;
    + my $colors;
    + my %gd_can;
    + my $valid_image_types;
     
     diff --git a/t/api/i18n_guess.t b/t/api/i18n_guess.t
     --- a/t/api/i18n_guess.t
3:  5459e25 = 3:  e55df2e More all code after package definition
4:  d6ebf9f = 4:  7c1576d decriticize shredder's code
5:  16c23fd ! 5:  df973f3 update perl critic policies
    @@ -29,4 +29,3 @@
     +
     +[BuiltinFunctions::RequireBlockMap]
     +severity = 1
    -
6:  1c2d400 < -:  ------- Remove skip_all from dependency checks which are in developer deps