Attachment 39392 Details for Bug 6679 – [PASSED QA] Bug 6679 - [SIGNED-OFF] fix 11 perlcritic violations in C4/Dates.pm

[patch] [PASSED QA] Bug 6679 - [SIGNED-OFF] fix 11 perlcritic violations in C4/Dates.pm

PASSED-QA-Bug-6679---SIGNED-OFF-fix-11-perlcritic-.patch (text/plain), 4.02 KB, created by Kyle M Hall (khall) on 2015-05-22 12:25:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-05-22 12:25:54 UTC

Size: 4.02 KB

patch

obsolete

>From 2a65e875ec814de813cc09b7d5f6dacc658565f1 Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Wed, 27 Jun 2012 01:04:36 +1200
>Subject: [PATCH] [PASSED QA] Bug 6679 - [SIGNED-OFF] fix 11 perlcritic violations in C4/Dates.pm
>
>- Subroutine prototypes used at line 82, column 1.  See page 194 of PBP.  (Severity: 5)
>
>- "return" statement with explicit "undef" at line 102, column 28.  See page 199 of PBP.  (Severity: 5)
>
>- Expression form of "eval" at line 108, column 20.  See page 161 of PBP.  (Severity: 5)
>
>- Variable declared in conditional statement at line 126, column 5.  Declare variables outside of the condition.  (Severity: 5)
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/Dates.pm |   24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/C4/Dates.pm b/C4/Dates.pm
>index aaf188c..6ed9588 100644
>--- a/C4/Dates.pm
>+++ b/C4/Dates.pm
>@@ -79,7 +79,7 @@ our @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
> 
> our @days = qw(Sun Mon Tue Wed Thu Fri Sat);
> 
>-sub regexp ($;$) {
>+sub regexp {
>     my $self   = shift;
>     my $delim  = qr/:?\:|\/|-/;                                                                  # "non memory" cluster: no backreference
>     my $format = (@_) ? _recognize_format(shift) : ( $self->{'dateformat'} || _prefformat() );
>@@ -97,15 +97,15 @@ sub regexp ($;$) {
>     return qr/^(\d{1,2})$delim(\d{1,2})$delim(\d{4})(?:\s{1}(\d{1,2})\:?(\d{1,2})\:?(\d{1,2}))?/;    # everything else
> }
> 
>-sub dmy_map ($$) {
>+sub dmy_map {
>     my $self    = shift;
>-    my $val     = shift or return undef;
>-    my $dformat = $self->{'dateformat'} or return undef;
>+    my $val     = shift or return;
>+    my $dformat = $self->{'dateformat'} or return;
>     my $re      = $self->regexp();
>     my $xsub    = $dmy_subs{$dformat};
>     $debug and print STDERR "xsub: $xsub \n";
>     if ( $val =~ /$re/ ) {
>-        my $aref = eval $xsub;
>+        my $aref = eval {$xsub};
>         if ($dformat eq 'rfc822') {
>             $aref = _abbr_to_numeric($aref, $dformat);
>             pop(@{$aref}); #pop off tz offset because we are not setup to handle tz conversions just yet
>@@ -123,7 +123,9 @@ sub dmy_map ($$) {
> sub _abbr_to_numeric {
>     my $aref    = shift;
>     my $dformat = shift;
>-    my ($month_abbr, $day_abbr) = ($aref->[4], $aref->[3]) if $dformat eq 'rfc822';
>+
>+    my ($month_abbr, $day_abbr); # keep perlcritic happy ;)
>+    ($month_abbr, $day_abbr) = ($aref->[4], $aref->[3]) if $dformat eq 'rfc822';
> 
>     for( my $i = 0; $i < scalar(@months); $i++ ) {
>         if ( $months[$i] =~ /$month_abbr/ ) {
>@@ -171,7 +173,7 @@ sub new {
>     return $self->init(@_);
> }
> 
>-sub init ($;$$) {
>+sub init {
>     my $self = shift;
>     my $dformat;
>     $self->{'dateformat'} = $dformat = ( scalar(@_) >= 2 ) ? $_[1] : _prefformat();
>@@ -181,27 +183,27 @@ sub init ($;$$) {
>     return $self;
> }
> 
>-sub output ($;$) {
>+sub output {
>     my $self = shift;
>     my $newformat = (@_) ? _recognize_format(shift) : _prefformat();
>     return ( eval { POSIX::strftime( $posix_map{$newformat}, @{ $self->{'dmy_arrayref'} } ) } || undef );
> }
> 
>-sub today ($;$) {    # NOTE: sets date value to today (and returns it in the requested or current format)
>+sub today {    # NOTE: sets date value to today (and returns it in the requested or current format)
>     my $class = shift;
>     $class = ref($class) || $class;
>     my $format = (@_) ? _recognize_format(shift) : _prefformat();
>     return $class->new()->output($format);
> }
> 
>-sub _recognize_format($) {
>+sub _recognize_format {
>     my $incoming = shift;
>     ( $incoming eq 'syspref' ) and return _prefformat();
>     ( scalar grep ( /^$incoming$/, keys %format_map ) == 1 ) or croak "The format you asked for ('$incoming') is unrecognized.";
>     return $incoming;
> }
> 
>-sub DHTMLcalendar ($;$) {    # interface to posix_map
>+sub DHTMLcalendar {    # interface to posix_map
>     my $class = shift;
>     my $format = (@_) ? shift : _prefformat();
>     return $posix_map{$format};
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 6679: 4883 | 4884 | 4885 | 4886 | 4887 | 4888 | 5445 | 5446 | 5483 | 5487 | 6121 | 6122 | 6123 | 6139 | 6140 | 6141 | 6142 | 6143 | 6144 | 6270 | 6271 | 6663 | 6670 | 6675 | 6676 | 6677 | 6678 | 8542 | 8897 | 8898 | 8899 | 8950 | 8951 | 9746 | 9747 | 9748 | 9749 | 9750 | 10050 | 10051 | 10052 | 10053 | 10054 | 10075 | 10076 | 10077 | 10078 | 10079 | 10484 | 10485 | 10486 | 10487 | 10488 | 10489 | 10491 | 10492 | 10493 | 10494 | 10495 | 10496 | 10497 | 10499 | 10500 | 10501 | 10502 | 10503 | 10504 | 10505 | 10506 | 10507 | 10508 | 10509 | 10510 | 10512 | 10513 | 10514 | 10515 | 10517 | 10521 | 10522 | 10523 | 10524 | 10525 | 10526 | 10527 | 10935 | 10936 | 10938 | 10940 | 10944 | 10945 | 10946 | 10947 | 10948 | 10949 | 10950 | 10952 | 10953 | 10955 | 10957 | 10958 | 10959 | 10960 | 10961 | 10962 | 10963 | 10964 | 10965 | 10966 | 10967 | 10972 | 10976 | 10979 | 10980 | 10981 | 12224 | 12363 | 12490 | 12491 | 12492 | 34191 | 34192 | 34193 | 34194 | 34195 | 34196 | 34197 | 39100 | 39101 | 39102 | 39392 | 39393 | 39394 | 39395 | 39396 | 39397 | 39398 | 42770 | 47086 | 47087 | 47088 | 47089 | 47090 | 47178 | 47179 | 47180 | 47181 | 47205 | 47206 | 47207 | 47208