From 7fbfa01f78c79daf434a351d165d22382f13fd94 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 1 Jun 2016 20:41:27 -0400 Subject: [PATCH] Bug 16635: t/00-load.t warning from C4/Barcodes/hbyymmincr.pm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit According to http://perldoc.perl.org/vars.html, "our" should be a reasonable substitute for the "use vars". By declaring as "our", and removing the INIT, prove t/00-load will no longer generate a warning about INIT for the C4/Barcodes/hbyymmincr.pm module. TEST PLAN --------- 1) prove t/00-load.t -- warnings about INIT for hbyymmincr 2) prove `git grep -l hbyymmincr | grep [.]t$` -- should all run okay 3) apply patch 4) repeat steps 1 and 2 -- warning should be gone, and everything else run okay 5) run koha qa test tools Signed-off-by: Srdjan Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit fd152d9e95a2236a00f3cb0284bdd2aa7cca6da2) Signed-off-by: Frédéric Demians --- C4/Barcodes/hbyymmincr.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/C4/Barcodes/hbyymmincr.pm b/C4/Barcodes/hbyymmincr.pm index f963e9a072..4e76012ed0 100644 --- a/C4/Barcodes/hbyymmincr.pm +++ b/C4/Barcodes/hbyymmincr.pm @@ -29,16 +29,13 @@ use Koha::DateUtils qw( dt_from_string output_pref ); use vars qw(@ISA); use vars qw($debug $cgi_debug); # from C4::Debug, of course -use vars qw($branch $width); +our $branch = ''; +our $width = 4; # FIXME: 4 is too small for sizeable or multi-branch libraries. BEGIN { @ISA = qw(C4::Barcodes); } -INIT { - $branch = ''; - $width = 4; # FIXME: 4 is too small for sizeable or multi-branch libraries. -} # Generates barcode where hb = home branch Code, yymm = year/month catalogued, incr = incremental number, # increment resets yearly -fbcit -- 2.20.1