From 9db77158d09379504e171fb4c0f43e054b8940fd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 20 Sep 2013 17:38:49 +0200 Subject: [PATCH] Bug 10927: remove disused C4::Utils module Bug 10925 removes the last call to C4::Utils. The module becomes useless and can be deleted. Verify that t/db_dependent/Context.t still successfully passes. git grep hashdump git grep maxwidth Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Passes koha-qa.pl, no subs from the module are used anywhere Signed-off-by: Galen Charlton --- C4/Auth_with_cas.pm | 1 - C4/Utils.pm | 66 ---------------------------------------- t/Utils.t | 14 --------- t/db_dependent/Context.t | 12 ++------ 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 C4/Utils.pm delete mode 100755 t/Utils.t diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm index f841449c0a..46cb1ecd17 100644 --- a/C4/Auth_with_cas.pm +++ b/C4/Auth_with_cas.pm @@ -22,7 +22,6 @@ use warnings; use C4::Debug; use C4::Context; -use C4::Utils qw( :all ); use Authen::CAS::Client; use CGI; use FindBin; diff --git a/C4/Utils.pm b/C4/Utils.pm deleted file mode 100644 index dac9423073..0000000000 --- a/C4/Utils.pm +++ /dev/null @@ -1,66 +0,0 @@ -package C4::Utils; - -# Copyright 2007 Liblime -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -# Useful code I didn't feel like duplicating all over the place. -# - -use strict; -use warnings; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug); - -BEGIN { - require Exporter; - $VERSION = 3.07.00.049; # set the version for version checking - $debug = $ENV{DEBUG} || 0; - @ISA = qw(Exporter); - @EXPORT_OK = qw(&maxwidth &hashdump); - %EXPORT_TAGS = ( all => [qw(&maxwidth &hashdump)], ); -} - - -sub maxwidth { - (@_) or return 0; - return (sort {$a <=> $b} map {length} @_)[-1]; -} - -sub hashdump { - my $pre = shift; - my $val = shift; - if (ref($val) =~ /HASH/) { - print "$pre = HASH w/ " . scalar(keys %$val) . " keys.\n"; - my $w2 = maxwidth(keys %$val); - foreach (sort keys %$val) { - &hashdump($pre . '->{' . sprintf('%' . $w2 .'s', $_) . '}', $val->{$_}); - } - print "\n"; - } elsif (ref($val) =~ /ARRAY/) { - print "$pre = ARRAY w/ " . scalar(@$val) . " members.\n"; - my $w2 = maxwidth(@$val); - foreach (@$val) { - &hashdump($pre . '->{' . sprintf('%' . $w2 .'s', $_) . '}', $_); - } - print "\n"; - } else { - print "$pre = $val\n"; - } -} - -1; -__END__ diff --git a/t/Utils.t b/t/Utils.t deleted file mode 100755 index 01fb10b674..0000000000 --- a/t/Utils.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl -# -# This Koha test module is a stub! -# Add more tests here!!! - -use strict; -use warnings; - -use Test::More tests => 1; - -BEGIN { - use_ok('C4::Utils'); -} - diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t index 32ea441a01..d47385488b 100755 --- a/t/db_dependent/Context.t +++ b/t/db_dependent/Context.t @@ -16,7 +16,6 @@ BEGIN { ok($ret = $ENV{$_}, "ENV{$_} = $ret"); } use_ok('C4::Context'); - use_ok('C4::Utils', qw/ :all /); } ok($koha = C4::Context->new, 'C4::Context->new'); @@ -30,10 +29,10 @@ ok( ); my @keys = keys %$koha; diag("Number of keys in \%\$koha: " . scalar @keys); -our $width = 0; +my $width = 0; if (ok(@keys)) { - $width = maxwidth(@keys); - $debug and diag "widest key is $width"; + $width = (sort {$a <=> $b} map {length} @keys)[-1]; + $debug and diag "widest key is $width"; } foreach (sort @keys) { ok(exists $koha->{$_}, @@ -41,11 +40,6 @@ foreach (sort @keys) { . ((defined $koha->{$_}) ? "and is defined." : "but is not defined.") ); } -diag "Examining defined key values."; -foreach (grep {defined $koha->{$_}} sort @keys) { - print "\n"; - hashdump('$koha->{' . sprintf('%' . $width . 's', $_) . '}', $koha->{$_}); -} ok($config = $koha->{config}, 'Getting $koha->{config} '); diag "Testing syspref caching."; -- 2.39.5