Bug 28931: Use EXPORT_OK from Koha::DateUtils

It has been missed on bug 17600.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Adjusted commit title.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

C4/SIP/ILS/Item.pm

@@ -26,7 +26,7 @@ use Koha::Biblios;
 use Koha::Checkouts::ReturnClaims;
 use Koha::Checkouts;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Holds;
 use Koha::Items;
 use Koha::Patrons;

C4/SIP/ILS/Transaction.pm

@@ -8,7 +8,7 @@ use Carp;
 use strict;
 use warnings;
 use C4::Context;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Checkouts;
 
 my %fields = (

Koha/DateUtils.pm

@@ -21,11 +21,17 @@ use DateTime;
 use C4::Context;
 use Koha::Exceptions;
 
-use base 'Exporter';
+use vars qw(@ISA @EXPORT_OK);
+BEGIN {
+    require Exporter;
+    @ISA = qw(Exporter);
 
-our @EXPORT = (
-    qw( dt_from_string output_pref format_sqldatetime )
-);
+    @EXPORT_OK = qw(
+        dt_from_string
+        output_pref
+        format_sqldatetime
+    );
+}
 
 =head1 DateUtils
 

Koha/pdfformat/layout3pagesfr.pm

@@ -29,7 +29,7 @@ use utf8;
 
 use C4::Acquisition;
 use Koha::Number::Price;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Libraries;
 
 BEGIN {

installer/data/mysql/updatedatabase.pl

@@ -40,7 +40,7 @@ use C4::Context;
 use C4::Installer;
 use Koha::Database;
 use Koha;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 use MARC::Record;
 use MARC::File::XML ( BinaryEncoding => 'utf8' );

opac/svc/checkout_notes

@@ -29,7 +29,7 @@ use C4::Scrubber;
 use C4::Circulation;
 use C4::Biblio;
 use Koha::Checkouts;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patrons;
 
 =head1 NAME

svc/checkouts

@@ -28,7 +28,7 @@ use C4::Overdues qw(GetFine);
 use C4::Context;
 
 use Koha::AuthorisedValues;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::ItemTypes;
 
 my $input = CGI->new;

svc/holds

@@ -27,7 +27,7 @@ use C4::Charset;
 use C4::Circulation qw(GetTransfers);
 use C4::Context;
 
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Holds;
 use Koha::ItemTypes;
 use Koha::Libraries;

svc/return_claims

@@ -26,7 +26,7 @@ use C4::Auth qw(check_cookie_auth haspermission get_session);
 use C4::Context;
 
 use Koha::AuthorisedValues;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patrons;
 
 my $input = CGI->new;

t/Calendar.t

@@ -23,7 +23,7 @@ use Test::MockModule;
 use DateTime;
 use DateTime::Duration;
 use Koha::Caches;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::Mocks;
 

t/Circulation/AgeRestrictionMarkers.t

@@ -21,7 +21,7 @@
 use Modern::Perl;
 
 use DateTime;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Test::More tests => 8;
 use Test::Warn;
 

t/DateUtils.t

@@ -4,16 +4,16 @@ use DateTime::TimeZone;
 
 use C4::Context;
 
-use Test::More tests => 79;
+use Test::More tests => 78;
 
 use Test::MockModule;
 use Test::Warn;
 use Time::HiRes qw/ gettimeofday /;
 use Try::Tiny;
 
-use t::lib::Mocks;
+use Koha::DateUtils qw( dt_from_string output_pref format_sqldatetime );
 
-BEGIN { use_ok('Koha::DateUtils'); }
+use t::lib::Mocks;
 
 t::lib::Mocks::mock_preference('dateformat', 'us');
 t::lib::Mocks::mock_preference('TimeFormat', 'This_is_not_used_but_called');

t/db_dependent/Calendar.t

@@ -25,7 +25,7 @@ use t::lib::TestBuilder;
 
 use DateTime;
 use Koha::Caches;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use_ok('Koha::Calendar');
 

t/db_dependent/Circulation.t

@@ -39,7 +39,7 @@ use C4::Items qw( ModItemTransfer );
 use C4::Log;
 use C4::Reserves qw( AddReserve ModReserve ModReserveCancelAll ModReserveAffect CheckReserves GetOtherReserves );
 use C4::Overdues qw( CalcFine UpdateFine get_chargeable_units );
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Database;
 use Koha::Items;
 use Koha::Item::Transfers;

t/db_dependent/Circulation/GetHardDueDate.t

@@ -4,7 +4,7 @@ use Modern::Perl;
 use C4::Context;
 use DateTime;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::CirculationRules;
 use Koha::Library;
 

t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t

@@ -8,7 +8,7 @@ use C4::Context;
 use C4::Circulation qw( AddIssue AddReturn );
 use C4::Biblio qw( AddBiblio );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patron::Debarments qw( GetDebarments DelDebarment );
 use Koha::Patrons;
 

t/db_dependent/Circulation/Returns.t

@@ -30,7 +30,7 @@ use C4::Items;
 use C4::Biblio qw( AddBiblio );
 use Koha::Database;
 use Koha::Account::Lines;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 use Koha::Patrons;
 

t/db_dependent/Circulation/StoreLastBorrower.t

@@ -22,7 +22,7 @@ use Test::More tests => 1;
 use C4::Circulation qw( AddReturn );
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 
 use t::lib::Mocks;

t/db_dependent/Circulation/dateexpiry.t

@@ -21,7 +21,7 @@ use DateTime;
 use Time::HiRes qw/gettimeofday time/;
 use Test::More tests => 2;
 use C4::Members;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Database;
 
 use t::lib::TestBuilder;

t/db_dependent/Circulation/issue.t

@@ -30,7 +30,7 @@ use C4::Items;
 use C4::Reserves qw( AddReserve );
 use Koha::Checkouts;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Holds;
 use Koha::Items;
 use Koha::Library;

t/db_dependent/Circulation/transfers.t

@@ -21,7 +21,7 @@ use C4::Circulation qw( CreateBranchTransferLimit DeleteBranchTransferLimits Get
 use C4::Biblio qw( AddBiblio );
 use C4::Items qw( ModItemTransfer );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use DateTime::Duration;
 use Koha::Item::Transfers;
 

t/db_dependent/Contract.t

@@ -21,7 +21,7 @@ use Modern::Perl;
 
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Acquisition::Booksellers;
 
 use DateTime::Duration;

t/db_dependent/DecreaseLoanHighHolds.t

@@ -20,7 +20,7 @@ use DateTime;
 
 use C4::Circulation qw( CalcDateDue checkHighHolds CanBookBeIssued );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patrons;
 use Koha::Biblio;
 use Koha::Item;

t/db_dependent/Fines.t

@@ -5,7 +5,7 @@ use Modern::Perl;
 use C4::Context;
 use C4::Overdues qw( CalcFine );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use Test::More tests => 5;
 

t/db_dependent/Hold.t

@@ -26,7 +26,7 @@ use C4::Calendar qw( new insert_single_holiday );
 use Koha::Patrons;
 use Koha::Holds;
 use Koha::Item;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use t::lib::TestBuilder;
 
 use Test::More tests => 34;

t/db_dependent/Holds/WaitingReserves.t

@@ -3,7 +3,7 @@
 use Modern::Perl;
 
 use C4::Reserves qw( ModReserve ModReserveAffect );
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::Mocks;
 use t::lib::TestBuilder;

t/db_dependent/HoldsQueue.t

@@ -16,7 +16,7 @@ use C4::Context;
 use C4::Members;
 use C4::Circulation qw( AddIssue AddReturn );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 use Koha::Holds;
 use Koha::CirculationRules;

t/db_dependent/Holidays.t

@@ -25,8 +25,7 @@ use DateTime::TimeZone;
 use t::lib::TestBuilder;
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
-
+use Koha::DateUtils qw( dt_from_string );
 
 BEGIN {
     use_ok('Koha::Calendar');

t/db_dependent/ILSDI_Services.t

@@ -29,7 +29,7 @@ use C4::Items qw( ModItemTransfer );
 use C4::Circulation qw( AddIssue );
 
 use Koha::AuthUtils;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 BEGIN {
     use_ok('C4::ILSDI::Services', qw( AuthenticatePatron GetPatronInfo LookupPatron HoldTitle HoldItem GetRecords RenewLoan ));

t/db_dependent/Items/AutomaticItemModificationByAge.t

@@ -10,7 +10,7 @@ use DateTime::Duration;
 use C4::Items qw( GetMarcItem ToggleNewStatus );
 use C4::Biblio qw( AddBiblio GetMarcFromKohaField );
 use C4::Context;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 use t::lib::Mocks;
 use t::lib::TestBuilder;

t/db_dependent/Koha/Acquisition/Booksellers.t

@@ -28,7 +28,7 @@ use C4::Serials qw( NewSubscription SearchSubscriptions );
 
 use Koha::Acquisition::Booksellers;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 my $schema  = Koha::Database->schema();
 my $builder = t::lib::TestBuilder->new;

t/db_dependent/Koha/AdditionalContents.t

@@ -24,7 +24,7 @@ use Test::Exception;
 
 use Koha::AdditionalContents;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::TestBuilder;
 

t/db_dependent/Koha/BackgroundJobs.t

@@ -25,7 +25,7 @@ use JSON qw( decode_json );
 
 use Koha::Database;
 use Koha::BackgroundJobs;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::TestBuilder;
 use t::lib::Mocks;

t/db_dependent/Koha/Item.t

@@ -29,7 +29,7 @@ use C4::Circulation qw( AddIssue AddReturn );
 use Koha::Caches;
 use Koha::Items;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Old::Items;
 
 use List::MoreUtils qw(all);

t/db_dependent/Koha/Item/Transfer.t

@@ -20,7 +20,7 @@
 use Modern::Perl;
 
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::TestBuilder;
 

t/db_dependent/Koha/Item/Transfers.t

@@ -24,7 +24,7 @@ use Test::More tests => 3;
 use Koha::Item::Transfer;
 use Koha::Item::Transfers;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::TestBuilder;
 use t::lib::Dates;

t/db_dependent/Koha/Patron/Categories.t

@@ -23,7 +23,7 @@ use Test::More tests => 10;
 
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patron::Category;
 use Koha::Patron::Categories;
 use t::lib::Dates;

t/db_dependent/Koha/Patrons.t

@@ -42,7 +42,7 @@ use Koha::Patron::Attribute::Types;
 use Koha::Patron::Categories;
 use Koha::Patron::Relationship;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Virtualshelves;
 use Koha::Notice::Messages;
 

t/db_dependent/Koha/Suggestions.t

@@ -25,7 +25,7 @@ use Test::Exception;
 use Koha::Suggestion;
 use Koha::Suggestions;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 use t::lib::TestBuilder;
 

t/db_dependent/Letters/TemplateToolkit.t

@@ -33,7 +33,7 @@ use C4::Letters qw( GetPreparedLetter );
 use C4::Members qw( IssueSlip );
 use C4::Biblio;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::ArticleRequests;
 use Koha::Biblio;
 use Koha::Biblioitem;

t/db_dependent/OAI/Server.t

@@ -38,7 +38,7 @@ use C4::OAI::Sets qw(AddOAISet);
 
 use Koha::Biblio::Metadatas;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 BEGIN {
     use_ok('Koha::OAI::Server::DeletedRecord');

t/db_dependent/Passwordrecovery.t

@@ -20,7 +20,7 @@ use Modern::Perl;
 use C4::Context;
 use C4::Letters qw( GetQueuedMessages );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patrons;
 
 use t::lib::TestBuilder;

t/db_dependent/Patron/Borrower_PrevCheckout.t

@@ -4,7 +4,7 @@ use Modern::Perl;
 use C4::Members;
 use C4::Circulation qw( AddIssue AddReturn CanBookBeIssued );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Patrons;
 
 use Test::More tests => 61;

t/db_dependent/Patrons.t

@@ -22,7 +22,7 @@ use Test::Warn;
 
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use t::lib::Dates;
 use t::lib::TestBuilder;

t/db_dependent/Reserves.t

@@ -34,7 +34,7 @@ use C4::Members;
 use C4::Reserves qw( AddReserve CheckReserves GetReservesControlBranch ModReserve ModReserveAffect ReserveSlip CalculatePriority CanReserveBeCanceledFromOpac CanBookBeReserved IsAvailableForItemLevelRequest MoveReserve ChargeReserveFee RevertWaitingStatus CanItemBeReserved MergeHolds );
 use Koha::ActionLogs;
 use Koha::Caches;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Holds;
 use Koha::Items;
 use Koha::Libraries;

t/db_dependent/Reserves/AutoUnsuspendReserves.t

@@ -24,7 +24,7 @@ use t::lib::TestBuilder;
 
 use C4::Reserves qw( AutoUnsuspendReserves );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Holds;
 
 my $schema = Koha::Database->new->schema;

t/db_dependent/Reserves/CancelExpiredReserves.t

@@ -9,7 +9,7 @@ use t::lib::TestBuilder;
 use C4::Members;
 use C4::Reserves qw( CancelExpiredReserves );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Holds;
 
 my $schema = Koha::Database->new->schema;

t/db_dependent/SIP/Message.t

@@ -34,7 +34,7 @@ use C4::Reserves qw( AddReserve );
 use C4::Circulation qw( AddReturn );
 use Koha::Database;
 use Koha::AuthUtils qw(hash_password);
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Items;
 use Koha::Checkouts;
 use Koha::Old::Checkouts;

t/db_dependent/SIP/Patron.t

@@ -12,7 +12,7 @@ use t::lib::TestBuilder;
 use C4::SIP::ILS::Patron;
 use Koha::Account::Lines;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patron::Attributes;
 use Koha::Patrons;
 

t/db_dependent/Search/History.t

@@ -17,7 +17,7 @@ use URI::Escape;
 use List::Util qw( shuffle );
 
 use C4::Context;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 my $schema = Koha::Database->new->schema;
 $schema->storage->txn_begin;

t/db_dependent/Serials.t

@@ -12,7 +12,7 @@ use C4::Biblio qw( AddBiblio GetMarcFromKohaField );
 use C4::Budgets qw( AddBudgetPeriod AddBudget );
 use C4::Items qw( AddItemFromMarc );
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Acquisition::Booksellers;
 use t::lib::Mocks;
 use t::lib::TestBuilder;

t/db_dependent/Sitemapper.t

@@ -21,7 +21,7 @@ use Modern::Perl;
 use File::Basename;
 use File::Path;
 use DateTime;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Test::MockModule;
 use Test::More tests => 16;
 use Carp qw/croak carp/;

t/db_dependent/StockRotationItems.t

@@ -22,7 +22,7 @@ use Modern::Perl;
 use DateTime;
 use DateTime::Duration;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Item::Transfer;
 
 use Test::Warn;

t/db_dependent/Template/Plugin/KohaDates.t

@@ -3,7 +3,7 @@
 use Modern::Perl;
 
 use C4::Context;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 use Test::MockModule;
 use Test::More tests => 9;

t/db_dependent/Upload.t

@@ -12,8 +12,7 @@ use t::lib::TestBuilder;
 
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
-use Koha::UploadedFile;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::UploadedFiles;
 use Koha::Uploader;
 

t/db_dependent/Virtualshelves.t

@@ -6,7 +6,7 @@ use DateTime::Duration;
 
 use C4::Context;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Virtualshelves;
 use Koha::Virtualshelfshares;
 use Koha::Virtualshelfcontents;

t/db_dependent/api/v1/checkouts.t

@@ -29,7 +29,7 @@ use C4::Context;
 use C4::Circulation qw( AddIssue AddReturn );
 
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 my $schema = Koha::Database->schema;
 my $builder = t::lib::TestBuilder->new;

t/db_dependent/api/v1/holds.t

@@ -32,7 +32,7 @@ use C4::Reserves qw( AddReserve CanItemBeReserved CanBookBeReserved );
 use C4::Items;
 
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Biblios;
 use Koha::Biblioitems;
 use Koha::Items;

t/db_dependent/cronjobs/advance_notices_digest.t

@@ -25,7 +25,7 @@ use t::lib::Mocks;
 use File::Spec;
 use File::Basename;
 
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 my $scriptDir = dirname(File::Spec->rel2abs( __FILE__ ));
 

t/db_dependent/rollingloans.t

@@ -5,7 +5,7 @@ use C4::Context;
 use C4::Circulation qw( CanBookBeIssued AddIssue AddReturn );
 use C4::Members;
 use C4::Items;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Libraries;
 use Koha::Patrons;
 use t::lib::TestBuilder;

tools/additional-contents.pl

@@ -30,7 +30,8 @@ use C4::Context;
 use C4::Log qw( logaction );
 use C4::Output qw(output_html_with_http_headers);
 use C4::Languages qw(getTranslatedLanguages);
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
+
 use Koha::AdditionalContents;
 
 my $cgi = CGI->new;