From 9eb2fd7e0db4ec7c25afec8780e690f7f334210b Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 17 Sep 2012 11:29:40 +0200
Subject: [PATCH] Bug 8190: Followup Logger: FIX perlcritic
Content-Type: text/plain; charset="utf-8"
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
Koha/Utils/Logger.pm | 4 ++--
t/Logger.t | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Koha/Utils/Logger.pm b/Koha/Utils/Logger.pm
index 10f74a7..37b24de 100644
--- a/Koha/Utils/Logger.pm
+++ b/Koha/Utils/Logger.pm
@@ -165,8 +165,8 @@ sub called_by {
push(@subr, $line.$subr);
}
@subr = reverse(@subr);
- foreach $subr (@subr) {
- $str .= $subr;
+ foreach my $sr (@subr) {
+ $str .= $sr;
$str .= " > ";
}
$str =~ s/ > $/: /;
diff --git a/t/Logger.t b/t/Logger.t
index 11addf0..bff7733 100644
--- a/t/Logger.t
+++ b/t/Logger.t
@@ -53,7 +53,7 @@ $ENV{KOHA_LOG} = undef;
my $log_stderr_file = qq{/tmp/stderr.log};
$log = undef;
$log = Koha::Utils::Logger->new({level => 3});
-open(STDERR, ">>$log_stderr_file");
+open(STDERR, '>>', $log_stderr_file);
$log->error( "an error string");
$log->normal( "a normal string");
@lines = get_contains( $log_stderr_file );
@@ -66,20 +66,20 @@ system( qq{rm $log_stderr_file} );
sub get_contains {
my $filepath = shift;
my @lines;
- open FILE, "<", $filepath or die "Can't open $filepath: $!";
- while(<FILE>) {
+ open my $fh, "<", $filepath or die "Can't open $filepath: $!";
+ while(<$fh>) {
chomp;
push(@lines, $_);
}
- close(FILE);
+ close($fh);
return @lines;
}
sub truncate_file {
my $filepath = shift;
- open FILE, ">", $filepath or die "Can't open $filepath: $!";
- truncate FILE, 0;
- close FILE;
+ open my $fh, ">", $filepath or die "Can't open $filepath: $!";
+ truncate $fh, 0;
+ close $fh;
}
sub test_calledby {
--
1.7.2.5