From d8b3d1524cef111f7be2dd17e66a35d6397cfab1 Mon Sep 17 00:00:00 2001 From: Jenny Way Date: Thu, 18 Jan 2018 02:04:47 +0000 Subject: [PATCH] Bug 20017: use Modern::Perl in Tools perl scripts Test plan: Check that the following files don't contain use strict; use warnings; and have use Modern::Perl instead. background-job-progress.pl batchMod.pl copy-holidays.pl exceptionHolidays.pl holidays.pl import_borrowers.pl koha-news.pl letter.pl manage-marc-import.pl newHolidays.pl overduerules.pl quotes-upload.pl quotes.pl quotes/quotes-upload_ajax.pl quotes/quotes_ajax.pl scheduler.pl stage-marc-import.pl upload-cover-image.pl Also the credits have been added to newHolidays.pl https://bugs.koha-community.org/show_bug.cgi?id=20017 Signed-off-by: Jon Knight --- tools/background-job-progress.pl | 3 +-- tools/batchMod.pl | 3 +-- tools/copy-holidays.pl | 3 +-- tools/exceptionHolidays.pl | 3 +-- tools/holidays.pl | 3 +-- tools/import_borrowers.pl | 3 +-- tools/koha-news.pl | 3 +-- tools/letter.pl | 3 +-- tools/manage-marc-import.pl | 3 +-- tools/newHolidays.pl | 24 ++++++++++++++++++++---- tools/overduerules.pl | 3 +-- tools/quotes-upload.pl | 3 +-- tools/quotes.pl | 3 +-- tools/quotes/quotes-upload_ajax.pl | 3 +-- tools/quotes/quotes_ajax.pl | 3 +-- tools/scheduler.pl | 3 +-- tools/stage-marc-import.pl | 3 +-- tools/upload-cover-image.pl | 3 +-- 18 files changed, 37 insertions(+), 38 deletions(-) diff --git a/tools/background-job-progress.pl b/tools/background-job-progress.pl index 811f5b2df5..625389f902 100755 --- a/tools/background-job-progress.pl +++ b/tools/background-job-progress.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; # standard or CPAN modules used use IO::File; diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 0ab4db76d9..5f540766f6 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -19,8 +19,7 @@ # along with Koha; if not, see . use CGI qw ( -utf8 ); -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; use C4::Auth; use C4::Output; use C4::Biblio; diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl index 61be91e298..309f488dd0 100755 --- a/tools/copy-holidays.pl +++ b/tools/copy-holidays.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl index 2855189803..90b17bc6cf 100755 --- a/tools/exceptionHolidays.pl +++ b/tools/exceptionHolidays.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); diff --git a/tools/holidays.pl b/tools/holidays.pl index fb4272b20f..207439befc 100755 --- a/tools/holidays.pl +++ b/tools/holidays.pl @@ -16,8 +16,7 @@ # along with Koha; if not, see . #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl index d0aa3ebe67..d17bc408bc 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -34,8 +34,7 @@ # dates should be in the format you have set up Koha to expect # branchcode and categorycode need to be valid -use strict; -use warnings; +use Modern::Perl; use C4::Auth; use C4::Output; diff --git a/tools/koha-news.pl b/tools/koha-news.pl index 61c3ec606f..7c20b5d1eb 100755 --- a/tools/koha-news.pl +++ b/tools/koha-news.pl @@ -22,8 +22,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -# use warnings; FIXME - Bug 2505 +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth; use C4::Koha; diff --git a/tools/letter.pl b/tools/letter.pl index 922207958a..ef29c73fbe 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -40,8 +40,7 @@ # TODO This script drives the CRUD operations on the letter table # The DB interaction should be handled by calls to C4/Letters.pm -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth; use C4::Context; diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl index 55707aa263..d503a5e0c8 100755 --- a/tools/manage-marc-import.pl +++ b/tools/manage-marc-import.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; # standard or CPAN modules used use CGI qw ( -utf8 ); diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl index eb948c708e..d123b6d189 100755 --- a/tools/newHolidays.pl +++ b/tools/newHolidays.pl @@ -1,9 +1,25 @@ #!/usr/bin/perl -#FIXME: add a license #FIXME: perltidy this file - -use strict; -use warnings; +# +# Copyright 2011 C & P Bibliography Services +# +# 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 3 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 Lic# along with Koha; if not, see . +# along with Koha; if not, see . + + +use Modern::Perl; use CGI qw ( -utf8 ); diff --git a/tools/overduerules.pl b/tools/overduerules.pl index 5c35a8c7fa..616f6070ea 100755 --- a/tools/overduerules.pl +++ b/tools/overduerules.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Context; use C4::Output; diff --git a/tools/quotes-upload.pl b/tools/quotes-upload.pl index 5a535be78e..833942217f 100755 --- a/tools/quotes-upload.pl +++ b/tools/quotes-upload.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use autouse 'Data::Dumper' => qw(Dumper); diff --git a/tools/quotes.pl b/tools/quotes.pl index 1f4dff8f20..4781d2965a 100755 --- a/tools/quotes.pl +++ b/tools/quotes.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use autouse 'Data::Dumper' => qw(Dumper); diff --git a/tools/quotes/quotes-upload_ajax.pl b/tools/quotes/quotes-upload_ajax.pl index 727280c9e7..7a429abc46 100755 --- a/tools/quotes/quotes-upload_ajax.pl +++ b/tools/quotes/quotes-upload_ajax.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use JSON; diff --git a/tools/quotes/quotes_ajax.pl b/tools/quotes/quotes_ajax.pl index 9948313dbf..79fbe6fb01 100755 --- a/tools/quotes/quotes_ajax.pl +++ b/tools/quotes/quotes_ajax.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use JSON; diff --git a/tools/scheduler.pl b/tools/scheduler.pl index 809ffaebf3..3cf6b7e7fc 100755 --- a/tools/scheduler.pl +++ b/tools/scheduler.pl @@ -17,8 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; use C4::Context; use C4::Scheduler; use C4::Reports::Guided; diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl index 07a921fdc4..f2acc58d9c 100755 --- a/tools/stage-marc-import.pl +++ b/tools/stage-marc-import.pl @@ -24,8 +24,7 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -#use warnings; FIXME - Bug 2505 +use Modern::Perl; # standard or CPAN modules used use CGI qw ( -utf8 ); diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl index dd73bbbe59..009c890d0d 100755 --- a/tools/upload-cover-image.pl +++ b/tools/upload-cover-image.pl @@ -37,8 +37,7 @@ resized, maintaining aspect ratio. =cut -use strict; -use warnings; +use Modern::Perl; use File::Temp; use CGI qw ( -utf8 ); -- 2.14.1