diff options
117 files changed, 121 insertions, 121 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index 0cec21708..3dbd4ce6d 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -46,7 +46,7 @@ use Bugzilla::Hook; use File::Copy; use List::Util qw(max); -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); ############################### #### Initialization #### diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm index a4fb3aea2..a55275a54 100644 --- a/Bugzilla/Auth/Login/CGI.pm +++ b/Bugzilla/Auth/Login/CGI.pm @@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::CGI; use 5.10.1; use strict; -use base qw(Bugzilla::Auth::Login); +use parent qw(Bugzilla::Auth::Login); use constant user_can_create_account => 1; use Bugzilla::Constants; diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm index 1f6f83f5e..56bc34f40 100644 --- a/Bugzilla/Auth/Login/Cookie.pm +++ b/Bugzilla/Auth/Login/Cookie.pm @@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::Cookie; use 5.10.1; use strict; -use base qw(Bugzilla::Auth::Login); +use parent qw(Bugzilla::Auth::Login); use Bugzilla::Constants; use Bugzilla::Util; diff --git a/Bugzilla/Auth/Login/Env.pm b/Bugzilla/Auth/Login/Env.pm index 9b24c0edc..51261e6b9 100644 --- a/Bugzilla/Auth/Login/Env.pm +++ b/Bugzilla/Auth/Login/Env.pm @@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::Env; use 5.10.1; use strict; -use base qw(Bugzilla::Auth::Login); +use parent qw(Bugzilla::Auth::Login); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Auth/Verify/DB.pm b/Bugzilla/Auth/Verify/DB.pm index dc074b20a..2ad98874d 100644 --- a/Bugzilla/Auth/Verify/DB.pm +++ b/Bugzilla/Auth/Verify/DB.pm @@ -10,7 +10,7 @@ package Bugzilla::Auth::Verify::DB; use 5.10.1; use strict; -use base qw(Bugzilla::Auth::Verify); +use parent qw(Bugzilla::Auth::Verify); use Bugzilla::Constants; use Bugzilla::Token; diff --git a/Bugzilla/Auth/Verify/RADIUS.pm b/Bugzilla/Auth/Verify/RADIUS.pm index 9fecec77e..e5157c68f 100644 --- a/Bugzilla/Auth/Verify/RADIUS.pm +++ b/Bugzilla/Auth/Verify/RADIUS.pm @@ -10,7 +10,7 @@ package Bugzilla::Auth::Verify::RADIUS; use 5.10.1; use strict; -use base qw(Bugzilla::Auth::Verify); +use parent qw(Bugzilla::Auth::Verify); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index e06213b7d..f8b4d2142 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -36,7 +36,7 @@ use URI; use URI::QueryParam; use Scalar::Util qw(blessed); -use base qw(Bugzilla::Object Exporter); +use parent qw(Bugzilla::Object Exporter); @Bugzilla::Bug::EXPORT = qw( bug_alias_to_id LogActivityEntry diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm index 2074a3667..df72d9cf7 100644 --- a/Bugzilla/BugUrl.pm +++ b/Bugzilla/BugUrl.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Util; use Bugzilla::Error; diff --git a/Bugzilla/BugUrl/Bugzilla.pm b/Bugzilla/BugUrl/Bugzilla.pm index 8e2f37226..db132eeff 100644 --- a/Bugzilla/BugUrl/Bugzilla.pm +++ b/Bugzilla/BugUrl/Bugzilla.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Bugzilla; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); use Bugzilla::Error; use Bugzilla::Util; diff --git a/Bugzilla/BugUrl/Bugzilla/Local.pm b/Bugzilla/BugUrl/Bugzilla/Local.pm index 360d5dd97..7381d5610 100644 --- a/Bugzilla/BugUrl/Bugzilla/Local.pm +++ b/Bugzilla/BugUrl/Bugzilla/Local.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Bugzilla::Local; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl::Bugzilla); +use parent qw(Bugzilla::BugUrl::Bugzilla); use Bugzilla::Error; use Bugzilla::Util; diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm index f791a437e..7ab8bf173 100644 --- a/Bugzilla/BugUrl/Debian.pm +++ b/Bugzilla/BugUrl/Debian.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Debian; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm index 1dc325c80..dbcaf655f 100644 --- a/Bugzilla/BugUrl/GitHub.pm +++ b/Bugzilla/BugUrl/GitHub.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::GitHub; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/Google.pm b/Bugzilla/BugUrl/Google.pm index 809c92cca..eb9aa88f2 100644 --- a/Bugzilla/BugUrl/Google.pm +++ b/Bugzilla/BugUrl/Google.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Google; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/JIRA.pm b/Bugzilla/BugUrl/JIRA.pm index d9614c4bd..e358ff439 100644 --- a/Bugzilla/BugUrl/JIRA.pm +++ b/Bugzilla/BugUrl/JIRA.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::JIRA; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/Launchpad.pm b/Bugzilla/BugUrl/Launchpad.pm index f858f2895..43c5c57d9 100644 --- a/Bugzilla/BugUrl/Launchpad.pm +++ b/Bugzilla/BugUrl/Launchpad.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Launchpad; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/MantisBT.pm b/Bugzilla/BugUrl/MantisBT.pm index d774eca10..8dffabcbe 100644 --- a/Bugzilla/BugUrl/MantisBT.pm +++ b/Bugzilla/BugUrl/MantisBT.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::MantisBT; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/SourceForge.pm b/Bugzilla/BugUrl/SourceForge.pm index ee9a3e7ca..90a7ca6a5 100644 --- a/Bugzilla/BugUrl/SourceForge.pm +++ b/Bugzilla/BugUrl/SourceForge.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::SourceForge; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/BugUrl/Trac.pm b/Bugzilla/BugUrl/Trac.pm index ddad281fe..edb18e8fd 100644 --- a/Bugzilla/BugUrl/Trac.pm +++ b/Bugzilla/BugUrl/Trac.pm @@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Trac; use 5.10.1; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index e0953d4f6..cb92800f1 100644 --- a/Bugzilla/CGI.pm +++ b/Bugzilla/CGI.pm @@ -10,7 +10,7 @@ package Bugzilla::CGI; use 5.10.1; use strict; -use base qw(CGI); +use parent qw(CGI); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Classification.pm b/Bugzilla/Classification.pm index 27a59fa97..771a894b4 100644 --- a/Bugzilla/Classification.pm +++ b/Bugzilla/Classification.pm @@ -16,7 +16,7 @@ use Bugzilla::Util; use Bugzilla::Error; use Bugzilla::Product; -use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object Exporter); +use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object Exporter); @Bugzilla::Classification::EXPORT = qw(sort_products_by_classification); ############################### diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm index 0851d7643..caefb2d6d 100644 --- a/Bugzilla/Comment.pm +++ b/Bugzilla/Comment.pm @@ -10,7 +10,7 @@ package Bugzilla::Comment; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Attachment; use Bugzilla::Constants; diff --git a/Bugzilla/Component.pm b/Bugzilla/Component.pm index e559ba1a2..53a6f216c 100644 --- a/Bugzilla/Component.pm +++ b/Bugzilla/Component.pm @@ -10,7 +10,7 @@ package Bugzilla::Component; use 5.10.1; use strict; -use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); +use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Util; diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm index 227d07c01..69becbf95 100644 --- a/Bugzilla/Config.pm +++ b/Bugzilla/Config.pm @@ -10,7 +10,7 @@ package Bugzilla::Config; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); use Bugzilla::Constants; use Bugzilla::Hook; use Data::Dumper; diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm index 75f6e0ea2..64c7ebcbb 100644 --- a/Bugzilla/Config/Common.pm +++ b/Bugzilla/Config/Common.pm @@ -19,7 +19,7 @@ use Bugzilla::Field; use Bugzilla::Group; use Bugzilla::Status; -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Config::Common::EXPORT = qw(check_multi check_numeric check_regexp check_url check_group check_sslbase check_priority check_severity check_platform diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 3a95e30f3..5af171878 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -10,7 +10,7 @@ package Bugzilla::Constants; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); # For bz_locations use File::Basename; diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index bdda889b3..f5320cb7f 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -13,7 +13,7 @@ use strict; use DBI; # Inherit the DB class from DBI::db. -use base qw(DBI::db); +use parent -norequire, qw(DBI::db); use Bugzilla::Constants; use Bugzilla::Install::Requirements; diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm index 3be58767b..78d0908fa 100644 --- a/Bugzilla/DB/Mysql.pm +++ b/Bugzilla/DB/Mysql.pm @@ -24,7 +24,7 @@ package Bugzilla::DB::Mysql; use 5.10.1; use strict; -use base qw(Bugzilla::DB); +use parent qw(Bugzilla::DB); use Bugzilla::Constants; use Bugzilla::Install::Util qw(install_string); diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm index 01c37a028..aaf289b41 100644 --- a/Bugzilla/DB/Oracle.pm +++ b/Bugzilla/DB/Oracle.pm @@ -24,7 +24,7 @@ package Bugzilla::DB::Oracle; use 5.10.1; use strict; -use base qw(Bugzilla::DB); +use parent qw(Bugzilla::DB); use DBD::Oracle; use DBD::Oracle qw(:ora_types); @@ -720,7 +720,7 @@ package Bugzilla::DB::Oracle::st; use 5.10.1; use strict; -use base qw(DBI::st); +use parent qw(DBI::st); sub fetchrow_arrayref { my $self = shift; diff --git a/Bugzilla/DB/Pg.pm b/Bugzilla/DB/Pg.pm index bd3593cc5..890b19089 100644 --- a/Bugzilla/DB/Pg.pm +++ b/Bugzilla/DB/Pg.pm @@ -28,7 +28,7 @@ use Bugzilla::Error; use DBD::Pg; # This module extends the DB interface via inheritance -use base qw(Bugzilla::DB); +use parent qw(Bugzilla::DB); use constant BLOB_TYPE => { pg_type => DBD::Pg::PG_BYTEA }; diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm index 1275b2a81..d44864791 100644 --- a/Bugzilla/DB/Schema/Mysql.pm +++ b/Bugzilla/DB/Schema/Mysql.pm @@ -18,7 +18,7 @@ use strict; use Bugzilla::Error; -use base qw(Bugzilla::DB::Schema); +use parent qw(Bugzilla::DB::Schema); # This is for column_info_to_column, to know when a tinyint is a # boolean and when it's really a tinyint. This only has to be accurate diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm index 2edc6e3a6..275027954 100644 --- a/Bugzilla/DB/Schema/Oracle.pm +++ b/Bugzilla/DB/Schema/Oracle.pm @@ -16,7 +16,7 @@ package Bugzilla::DB::Schema::Oracle; use 5.10.1; use strict; -use base qw(Bugzilla::DB::Schema); +use parent qw(Bugzilla::DB::Schema); use Carp qw(confess); use Bugzilla::Util; diff --git a/Bugzilla/DB/Schema/Pg.pm b/Bugzilla/DB/Schema/Pg.pm index 8e90f73f9..206a53def 100644 --- a/Bugzilla/DB/Schema/Pg.pm +++ b/Bugzilla/DB/Schema/Pg.pm @@ -16,7 +16,7 @@ package Bugzilla::DB::Schema::Pg; use 5.10.1; use strict; -use base qw(Bugzilla::DB::Schema); +use parent qw(Bugzilla::DB::Schema); use Storable qw(dclone); #------------------------------------------------------------------------------ diff --git a/Bugzilla/DB/Schema/Sqlite.pm b/Bugzilla/DB/Schema/Sqlite.pm index 4423fae19..893e2387d 100644 --- a/Bugzilla/DB/Schema/Sqlite.pm +++ b/Bugzilla/DB/Schema/Sqlite.pm @@ -10,7 +10,7 @@ package Bugzilla::DB::Schema::Sqlite; use 5.10.1; use strict; -use base qw(Bugzilla::DB::Schema); +use parent qw(Bugzilla::DB::Schema); use Bugzilla::Error; use Bugzilla::Util qw(generate_random_password); diff --git a/Bugzilla/DB/Sqlite.pm b/Bugzilla/DB/Sqlite.pm index 0055f3884..8da73ae66 100644 --- a/Bugzilla/DB/Sqlite.pm +++ b/Bugzilla/DB/Sqlite.pm @@ -10,7 +10,7 @@ package Bugzilla::DB::Sqlite; use 5.10.1; use strict; -use base qw(Bugzilla::DB); +use parent qw(Bugzilla::DB); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 03fc8d642..d64219e87 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -10,7 +10,7 @@ package Bugzilla::Error; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Error::EXPORT = qw(ThrowCodeError ThrowTemplateError ThrowUserError); diff --git a/Bugzilla/Extension.pm b/Bugzilla/Extension.pm index aaffe6e2a..53bf6cd66 100644 --- a/Bugzilla/Extension.pm +++ b/Bugzilla/Extension.pm @@ -240,7 +240,7 @@ F<extensions/Foo.pm>: package Bugzilla::Extension::Foo use strict; - use base qw(Bugzilla::Extension); + use parent qw(Bugzilla::Extension); our $VERSION = '0.02'; use constant NAME => 'Foo'; diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm index 36abc2a99..14888287a 100644 --- a/Bugzilla/Field.pm +++ b/Bugzilla/Field.pm @@ -60,7 +60,7 @@ package Bugzilla::Field; use 5.10.1; use strict; -use base qw(Exporter Bugzilla::Object); +use parent qw(Exporter Bugzilla::Object); @Bugzilla::Field::EXPORT = qw(check_field get_field_id get_legal_field_values); use Bugzilla::Constants; diff --git a/Bugzilla/Field/Choice.pm b/Bugzilla/Field/Choice.pm index bbf96beb9..b3bca0dd2 100644 --- a/Bugzilla/Field/Choice.pm +++ b/Bugzilla/Field/Choice.pm @@ -10,7 +10,7 @@ package Bugzilla::Field::Choice; use 5.10.1; use strict; -use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); +use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); use Bugzilla::Config qw(SetParam write_params); use Bugzilla::Constants; @@ -95,7 +95,7 @@ sub type { if (!defined *{"${package}::DB_TABLE"}) { eval <<EOC; package $package; - use base qw(Bugzilla::Field::Choice); + use parent qw(Bugzilla::Field::Choice); use constant DB_TABLE => '$field_name'; EOC } diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm index 8ad48cce6..9073d349e 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -50,7 +50,7 @@ use Bugzilla::Mailer; use Bugzilla::Constants; use Bugzilla::Field; -use base qw(Bugzilla::Object Exporter); +use parent qw(Bugzilla::Object Exporter); @Bugzilla::Flag::EXPORT = qw(SKIP_REQUESTEE_ON_ERROR); ############################### diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm index 9e6dfe1e1..5fee86b30 100644 --- a/Bugzilla/FlagType.pm +++ b/Bugzilla/FlagType.pm @@ -41,7 +41,7 @@ use Bugzilla::Group; use Email::Address; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); ############################### #### Initialization #### diff --git a/Bugzilla/Group.pm b/Bugzilla/Group.pm index 70df15c80..25a792417 100644 --- a/Bugzilla/Group.pm +++ b/Bugzilla/Group.pm @@ -10,7 +10,7 @@ package Bugzilla::Group; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Util; diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm index 0d56ead6d..d79b292f5 100644 --- a/Bugzilla/Install/CPAN.pm +++ b/Bugzilla/Install/CPAN.pm @@ -10,7 +10,7 @@ package Bugzilla::Install::CPAN; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw( BZ_LIB diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 04f32313b..0f9df67a8 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -33,7 +33,7 @@ use File::Spec; use IO::File; use POSIX (); -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw( update_filesystem create_htaccess diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 4e54da3cf..3fa253729 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -27,7 +27,7 @@ use File::Basename qw(dirname); use Safe; use Term::ANSIColor; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT_OK = qw( read_localconfig diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index c446e3834..9602d0d28 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -23,7 +23,7 @@ use List::Util qw(max); use Safe; use Term::ANSIColor; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw( REQUIRED_MODULES OPTIONAL_MODULES diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index 80ebc2a88..7a7611bd1 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -24,7 +24,7 @@ use Scalar::Util qw(tainted); use Term::ANSIColor qw(colored); use PerlIO; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT_OK = qw( bin_loc get_version_and_os diff --git a/Bugzilla/Job/Mailer.pm b/Bugzilla/Job/Mailer.pm index 69f4be2e5..3d52f8428 100644 --- a/Bugzilla/Job/Mailer.pm +++ b/Bugzilla/Job/Mailer.pm @@ -11,7 +11,7 @@ use 5.10.1; use strict; use Bugzilla::Mailer; -BEGIN { eval "use base qw(TheSchwartz::Worker)"; } +BEGIN { eval "use parent qw(TheSchwartz::Worker)"; } # The longest we expect a job to possibly take, in seconds. use constant grab_for => 300; diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm index 19f833978..519313448 100644 --- a/Bugzilla/JobQueue.pm +++ b/Bugzilla/JobQueue.pm @@ -13,7 +13,7 @@ use strict; use Bugzilla::Constants; use Bugzilla::Error; use Bugzilla::Install::Util qw(install_string); -use base qw(TheSchwartz); +use parent qw(TheSchwartz); # This maps job names for Bugzilla::JobQueue to the appropriate modules. # If you add new types of jobs, you should add a mapping here. diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm index 15c82f622..7ab4f7f1a 100644 --- a/Bugzilla/JobQueue/Runner.pm +++ b/Bugzilla/JobQueue/Runner.pm @@ -22,7 +22,7 @@ use Pod::Usage; use Bugzilla::Constants; use Bugzilla::JobQueue; use Bugzilla::Util qw(get_text); -BEGIN { eval "use base qw(Daemon::Generic)"; } +BEGIN { eval "use parent qw(Daemon::Generic)"; } our $VERSION = BUGZILLA_VERSION; diff --git a/Bugzilla/Keyword.pm b/Bugzilla/Keyword.pm index 270048d2b..aedc6bcfc 100644 --- a/Bugzilla/Keyword.pm +++ b/Bugzilla/Keyword.pm @@ -10,7 +10,7 @@ package Bugzilla::Keyword; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Error; use Bugzilla::Util; diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm index 4a10688c3..d9aa9edc9 100644 --- a/Bugzilla/Mailer.pm +++ b/Bugzilla/Mailer.pm @@ -10,7 +10,7 @@ package Bugzilla::Mailer; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker); use Bugzilla::Constants; diff --git a/Bugzilla/Migrate/Gnats.pm b/Bugzilla/Migrate/Gnats.pm index 2e0784ac5..2778d28cc 100644 --- a/Bugzilla/Migrate/Gnats.pm +++ b/Bugzilla/Migrate/Gnats.pm @@ -10,7 +10,7 @@ package Bugzilla::Migrate::Gnats; use 5.10.1; use strict; -use base qw(Bugzilla::Migrate); +use parent qw(Bugzilla::Migrate); use Bugzilla::Constants; use Bugzilla::Install::Util qw(indicate_progress); diff --git a/Bugzilla/Milestone.pm b/Bugzilla/Milestone.pm index 1eb04bd0d..4f262fd2e 100644 --- a/Bugzilla/Milestone.pm +++ b/Bugzilla/Milestone.pm @@ -10,7 +10,7 @@ package Bugzilla::Milestone; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Util; diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm index 346727203..e2c01151a 100644 --- a/Bugzilla/Product.pm +++ b/Bugzilla/Product.pm @@ -10,7 +10,7 @@ package Bugzilla::Product; use 5.10.1; use strict; -use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); +use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Util; diff --git a/Bugzilla/RNG.pm b/Bugzilla/RNG.pm index c3f112007..14b831672 100644 --- a/Bugzilla/RNG.pm +++ b/Bugzilla/RNG.pm @@ -10,7 +10,7 @@ package Bugzilla::RNG; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); use Bugzilla::Constants qw(ON_WINDOWS); use Math::Random::ISAAC; diff --git a/Bugzilla/Report.pm b/Bugzilla/Report.pm index 03c054f57..fe2b82661 100644 --- a/Bugzilla/Report.pm +++ b/Bugzilla/Report.pm @@ -10,7 +10,7 @@ package Bugzilla::Report; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::CGI; use Bugzilla::Constants; diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index d4b74d187..22e837d46 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -10,7 +10,7 @@ package Bugzilla::Search; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Search::EXPORT = qw( IsValidQueryType split_order_term diff --git a/Bugzilla/Search/Condition.pm b/Bugzilla/Search/Condition.pm index 50d8258ea..4975775af 100644 --- a/Bugzilla/Search/Condition.pm +++ b/Bugzilla/Search/Condition.pm @@ -10,7 +10,7 @@ package Bugzilla::Search::Condition; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT_OK = qw(condition); sub new { diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm index 311ef751a..fc109a640 100644 --- a/Bugzilla/Search/Quicksearch.pm +++ b/Bugzilla/Search/Quicksearch.pm @@ -21,7 +21,7 @@ use List::Util qw(min max); use List::MoreUtils qw(firstidx); use Text::ParseWords qw(parse_line); -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Search::Quicksearch::EXPORT = qw(quicksearch); # Custom mappings for some fields. diff --git a/Bugzilla/Search/Recent.pm b/Bugzilla/Search/Recent.pm index af426ab74..6d349d129 100644 --- a/Bugzilla/Search/Recent.pm +++ b/Bugzilla/Search/Recent.pm @@ -10,7 +10,7 @@ package Bugzilla::Search::Recent; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Search/Saved.pm b/Bugzilla/Search/Saved.pm index 245cde37f..e81035ada 100644 --- a/Bugzilla/Search/Saved.pm +++ b/Bugzilla/Search/Saved.pm @@ -10,7 +10,7 @@ package Bugzilla::Search::Saved; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::CGI; use Bugzilla::Constants; diff --git a/Bugzilla/Send/Sendmail.pm b/Bugzilla/Send/Sendmail.pm index 4cf9b88f1..9496ff97c 100644 --- a/Bugzilla/Send/Sendmail.pm +++ b/Bugzilla/Send/Sendmail.pm @@ -10,7 +10,7 @@ package Bugzilla::Send::Sendmail; use 5.10.1; use strict; -use base qw(Email::Send::Sendmail); +use parent qw(Email::Send::Sendmail); use Return::Value; use Symbol qw(gensym); diff --git a/Bugzilla/Status.pm b/Bugzilla/Status.pm index e1d44a603..964df9070 100644 --- a/Bugzilla/Status.pm +++ b/Bugzilla/Status.pm @@ -14,7 +14,7 @@ use strict; # ChoiceInterface, because a bug status literally is a special type # of Field::Choice, not just an object that happens to have the same # methods. -use base qw(Bugzilla::Field::Choice Exporter); +use parent qw(Bugzilla::Field::Choice Exporter); @Bugzilla::Status::EXPORT = qw( BUG_STATE_OPEN SPECIAL_STATUS_WORKFLOW_ACTIONS diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 8ddd0a5df..a2fc81489 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -34,7 +34,7 @@ use IO::Dir; use List::MoreUtils qw(firstidx); use Scalar::Util qw(blessed); -use base qw(Template); +use parent qw(Template); use constant FORMAT_TRIPLE => '%19s|%-28s|%-28s'; use constant FORMAT_3_SIZE => [19,28,28]; diff --git a/Bugzilla/Template/Context.pm b/Bugzilla/Template/Context.pm index 61fcba4d6..ce1718e0f 100644 --- a/Bugzilla/Template/Context.pm +++ b/Bugzilla/Template/Context.pm @@ -11,7 +11,7 @@ package Bugzilla::Template::Context; use 5.10.1; use strict; -use base qw(Template::Context); +use parent qw(Template::Context); use Bugzilla::Hook; use Scalar::Util qw(blessed); diff --git a/Bugzilla/Template/Plugin/Bugzilla.pm b/Bugzilla/Template/Plugin/Bugzilla.pm index 044c9eed1..f0de2ed4d 100644 --- a/Bugzilla/Template/Plugin/Bugzilla.pm +++ b/Bugzilla/Template/Plugin/Bugzilla.pm @@ -10,7 +10,7 @@ package Bugzilla::Template::Plugin::Bugzilla; use 5.10.1; use strict; -use base qw(Template::Plugin); +use parent qw(Template::Plugin); use Bugzilla; diff --git a/Bugzilla/Template/Plugin/Hook.pm b/Bugzilla/Template/Plugin/Hook.pm index 52b3703dc..19260f005 100644 --- a/Bugzilla/Template/Plugin/Hook.pm +++ b/Bugzilla/Template/Plugin/Hook.pm @@ -10,7 +10,7 @@ package Bugzilla::Template::Plugin::Hook; use 5.10.1; use strict; -use base qw(Template::Plugin); +use parent qw(Template::Plugin); use Bugzilla::Constants; use Bugzilla::Install::Util qw(template_include_path); diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index a5bf9e0a3..183c11f96 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -21,7 +21,7 @@ use Date::Parse; use File::Basename; use Digest::SHA qw(hmac_sha256_base64); -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Token::EXPORT = qw(issue_session_token check_token_data delete_token issue_hash_token check_hash_token); diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 148608722..5e39eb49a 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -27,7 +27,7 @@ use Storable qw(dclone); use URI; use URI::QueryParam; -use base qw(Bugzilla::Object Exporter); +use parent qw(Bugzilla::Object Exporter); @Bugzilla::User::EXPORT = qw(is_available_username login_to_id user_id_to_login validate_password USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS diff --git a/Bugzilla/User/Setting.pm b/Bugzilla/User/Setting.pm index 52a5ff5aa..451e946f7 100644 --- a/Bugzilla/User/Setting.pm +++ b/Bugzilla/User/Setting.pm @@ -11,7 +11,7 @@ package Bugzilla::User::Setting; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); # Module stuff diff --git a/Bugzilla/User/Setting/Lang.pm b/Bugzilla/User/Setting/Lang.pm index 0dcec9aa1..4465185e3 100644 --- a/Bugzilla/User/Setting/Lang.pm +++ b/Bugzilla/User/Setting/Lang.pm @@ -10,7 +10,7 @@ package Bugzilla::User::Setting::Lang; use 5.10.1; use strict; -use base qw(Bugzilla::User::Setting); +use parent qw(Bugzilla::User::Setting); use Bugzilla::Constants; diff --git a/Bugzilla/User/Setting/Skin.pm b/Bugzilla/User/Setting/Skin.pm index 3181fdded..1e4e95a03 100644 --- a/Bugzilla/User/Setting/Skin.pm +++ b/Bugzilla/User/Setting/Skin.pm @@ -11,7 +11,7 @@ package Bugzilla::User::Setting::Skin; use 5.10.1; use strict; -use base qw(Bugzilla::User::Setting); +use parent qw(Bugzilla::User::Setting); use Bugzilla::Constants; use File::Spec::Functions; diff --git a/Bugzilla/User/Setting/Timezone.pm b/Bugzilla/User/Setting/Timezone.pm index 962e0a7ff..848fa418f 100644 --- a/Bugzilla/User/Setting/Timezone.pm +++ b/Bugzilla/User/Setting/Timezone.pm @@ -12,7 +12,7 @@ use strict; use DateTime::TimeZone; -use base qw(Bugzilla::User::Setting); +use parent qw(Bugzilla::User::Setting); use Bugzilla::Constants; diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm index 627120efc..c3f38cf85 100644 --- a/Bugzilla/UserAgent.pm +++ b/Bugzilla/UserAgent.pm @@ -10,7 +10,7 @@ package Bugzilla::UserAgent; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw(detect_platform detect_op_sys); use Bugzilla::Field; diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index c7f75f07e..bf072e88d 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -10,7 +10,7 @@ package Bugzilla::Util; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); @Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed html_quote url_quote xml_quote css_class_quote html_light_quote diff --git a/Bugzilla/Version.pm b/Bugzilla/Version.pm index b088e1c5c..920853ecd 100644 --- a/Bugzilla/Version.pm +++ b/Bugzilla/Version.pm @@ -10,7 +10,7 @@ package Bugzilla::Version; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Install::Util qw(vers_cmp); use Bugzilla::Util; diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index 6e352568a..a7f8446ec 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Bug; use 5.10.1; use strict; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Comment; use Bugzilla::Constants; diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm index d220d3c73..6fd7a023a 100644 --- a/Bugzilla/WebService/Bugzilla.pm +++ b/Bugzilla/WebService/Bugzilla.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Bugzilla; use 5.10.1; use strict; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Constants; use Bugzilla::Util qw(datetime_from); use Bugzilla::WebService::Util qw(validate filter_wants); diff --git a/Bugzilla/WebService/Classification.pm b/Bugzilla/WebService/Classification.pm index a3344b1c5..c104994a5 100644 --- a/Bugzilla/WebService/Classification.pm +++ b/Bugzilla/WebService/Classification.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Classification; use 5.10.1; use strict; -use base qw (Bugzilla::WebService); +use parent qw (Bugzilla::WebService); use Bugzilla::Classification; use Bugzilla::Error; diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm index 126cd7947..624ab6e09 100644 --- a/Bugzilla/WebService/Constants.pm +++ b/Bugzilla/WebService/Constants.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Constants; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw( WS_ERROR_CODE diff --git a/Bugzilla/WebService/Group.pm b/Bugzilla/WebService/Group.pm index 79ce1658b..e9aa405f6 100644 --- a/Bugzilla/WebService/Group.pm +++ b/Bugzilla/WebService/Group.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Group; use 5.10.1; use strict; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Constants; use Bugzilla::Error; use Bugzilla::WebService::Util qw(validate translate params_to_objects); diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm index 30a97c465..fc48ecd88 100644 --- a/Bugzilla/WebService/Product.pm +++ b/Bugzilla/WebService/Product.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Product; use 5.10.1; use strict; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Product; use Bugzilla::User; use Bugzilla::Error; diff --git a/Bugzilla/WebService/README b/Bugzilla/WebService/README index bbe320979..eb4799cfc 100644 --- a/Bugzilla/WebService/README +++ b/Bugzilla/WebService/README @@ -11,7 +11,7 @@ When XMLRPC::Lite calls a method, $self is the name of the *class* the method is in. For example, if we call Bugzilla.version(), the first argument is Bugzilla::WebService::Bugzilla. So in order to have $self (our first argument) act correctly in XML-RPC, we make all WebService -classes use base qw(Bugzilla::WebService). +classes use parent qw(Bugzilla::WebService). When JSON::RPC calls a method, $self is the JSON-RPC *server object*. In other words, it's an instance of Bugzilla::WebService::Server::JSONRPC. So we have diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm index f55bd6cf2..b4af1ab94 100644 --- a/Bugzilla/WebService/Server/XMLRPC.pm +++ b/Bugzilla/WebService/Server/XMLRPC.pm @@ -79,7 +79,7 @@ package Bugzilla::XMLRPC::Deserializer; use 5.10.1; use strict; -# We can't use "use base" because XMLRPC::Serializer doesn't return +# We can't use "use parent" because XMLRPC::Serializer doesn't return # a true value. use XMLRPC::Lite; our @ISA = qw(XMLRPC::Deserializer); @@ -204,7 +204,7 @@ use 5.10.1; use strict; use Scalar::Util qw(blessed); -# We can't use "use base" because XMLRPC::Serializer doesn't return +# We can't use "use parent" because XMLRPC::Serializer doesn't return # a true value. use XMLRPC::Lite; our @ISA = qw(XMLRPC::Serializer); diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm index 527ca95a3..b8a3763a2 100644 --- a/Bugzilla/WebService/User.pm +++ b/Bugzilla/WebService/User.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::User; use 5.10.1; use strict; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm index 57a55a599..9e20a1e06 100644 --- a/Bugzilla/WebService/Util.pm +++ b/Bugzilla/WebService/Util.pm @@ -10,7 +10,7 @@ package Bugzilla::WebService::Util; use 5.10.1; use strict; -use base qw(Exporter); +use parent qw(Exporter); # We have to "require", not "use" this, because otherwise it tries to # use features of Test::More during import(). diff --git a/Bugzilla/Whine.pm b/Bugzilla/Whine.pm index fba6e714a..488127dfa 100644 --- a/Bugzilla/Whine.pm +++ b/Bugzilla/Whine.pm @@ -10,7 +10,7 @@ package Bugzilla::Whine; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/Bugzilla/Whine/Query.pm b/Bugzilla/Whine/Query.pm index b40ba1c3b..a4fd54539 100644 --- a/Bugzilla/Whine/Query.pm +++ b/Bugzilla/Whine/Query.pm @@ -10,7 +10,7 @@ package Bugzilla::Whine::Query; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; use Bugzilla::Search::Saved; diff --git a/Bugzilla/Whine/Schedule.pm b/Bugzilla/Whine/Schedule.pm index 2171f84a5..f16c629af 100644 --- a/Bugzilla/Whine/Schedule.pm +++ b/Bugzilla/Whine/Schedule.pm @@ -10,7 +10,7 @@ package Bugzilla::Whine::Schedule; use 5.10.1; use strict; -use base qw(Bugzilla::Object); +use parent qw(Bugzilla::Object); use Bugzilla::Constants; diff --git a/contrib/extension-convert.pl b/contrib/extension-convert.pl index 457f40f07..4e24b614a 100755 --- a/contrib/extension-convert.pl +++ b/contrib/extension-convert.pl @@ -76,7 +76,7 @@ END my $extension_pm = <<END; package Bugzilla::Extension::$extension_name; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); $modules diff --git a/docs/lib/Pod/Simple/HTML/Bugzilla.pm b/docs/lib/Pod/Simple/HTML/Bugzilla.pm index 4a1517671..66e1d7b59 100644 --- a/docs/lib/Pod/Simple/HTML/Bugzilla.pm +++ b/docs/lib/Pod/Simple/HTML/Bugzilla.pm @@ -10,7 +10,7 @@ package Pod::Simple::HTML::Bugzilla; use 5.10.1; use strict; -use base qw(Pod::Simple::HTML); +use parent qw(Pod::Simple::HTML); # Without this constant, HTMLBatch will throw undef warnings. use constant VERSION => $Pod::Simple::HTML::VERSION; diff --git a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm index 52a09910f..bc60d0374 100644 --- a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm +++ b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm @@ -10,7 +10,7 @@ package Pod::Simple::HTMLBatch::Bugzilla; use 5.10.1; use strict; -use base qw(Pod::Simple::HTMLBatch); +use parent qw(Pod::Simple::HTMLBatch); # This is the same hack that HTMLBatch does to "import" this subroutine. BEGIN { *esc = \&Pod::Simple::HTML::esc } diff --git a/extensions/BmpConvert/Extension.pm b/extensions/BmpConvert/Extension.pm index 87ec5f5fd..b30bab604 100644 --- a/extensions/BmpConvert/Extension.pm +++ b/extensions/BmpConvert/Extension.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::BmpConvert; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); use Image::Magick; diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm index b3b1b299f..6b85ace42 100644 --- a/extensions/Example/Extension.pm +++ b/extensions/Example/Extension.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::Example; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); use Bugzilla::Constants; use Bugzilla::Error; diff --git a/extensions/Example/lib/Auth/Login.pm b/extensions/Example/lib/Auth/Login.pm index f87831157..03ca2481d 100644 --- a/extensions/Example/lib/Auth/Login.pm +++ b/extensions/Example/lib/Auth/Login.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::Example::Auth::Login; use strict; -use base qw(Bugzilla::Auth::Login); +use parent qw(Bugzilla::Auth::Login); use constant user_can_create_account => 0; use Bugzilla::Constants; diff --git a/extensions/Example/lib/Auth/Verify.pm b/extensions/Example/lib/Auth/Verify.pm index 0d068b2e1..0a0b40232 100644 --- a/extensions/Example/lib/Auth/Verify.pm +++ b/extensions/Example/lib/Auth/Verify.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::Example::Auth::Verify; use strict; -use base qw(Bugzilla::Auth::Verify); +use parent qw(Bugzilla::Auth::Verify); use Bugzilla::Constants; # A verifier that always fails. diff --git a/extensions/Example/lib/WebService.pm b/extensions/Example/lib/WebService.pm index 659189d2f..e5e14af53 100644 --- a/extensions/Example/lib/WebService.pm +++ b/extensions/Example/lib/WebService.pm @@ -8,7 +8,7 @@ package Bugzilla::Extension::Example::WebService; use strict; use warnings; -use base qw(Bugzilla::WebService); +use parent qw(Bugzilla::WebService); use Bugzilla::Error; # This can be called as Example.hello() from the WebService. diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm index 52b6e61c3..b251e70a8 100644 --- a/extensions/MoreBugUrl/Extension.pm +++ b/extensions/MoreBugUrl/Extension.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); use constant MORE_SUB_CLASSES => qw( Bugzilla::Extension::MoreBugUrl::ReviewBoard diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm index ff63b10e1..5adb897bc 100644 --- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm +++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl::GetSatisfaction; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm index c8d4e1689..38795b5e6 100644 --- a/extensions/MoreBugUrl/lib/PHP.pm +++ b/extensions/MoreBugUrl/lib/PHP.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl::PHP; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm index 0d5faa2a8..132118089 100644 --- a/extensions/MoreBugUrl/lib/RT.pm +++ b/extensions/MoreBugUrl/lib/RT.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl::RT; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/extensions/MoreBugUrl/lib/ReviewBoard.pm b/extensions/MoreBugUrl/lib/ReviewBoard.pm index 7628dd314..0c4d83fab 100644 --- a/extensions/MoreBugUrl/lib/ReviewBoard.pm +++ b/extensions/MoreBugUrl/lib/ReviewBoard.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl::ReviewBoard; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/extensions/MoreBugUrl/lib/Rietveld.pm b/extensions/MoreBugUrl/lib/Rietveld.pm index 0c52892e2..f9e894032 100644 --- a/extensions/MoreBugUrl/lib/Rietveld.pm +++ b/extensions/MoreBugUrl/lib/Rietveld.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::MoreBugUrl::Rietveld; use strict; -use base qw(Bugzilla::BugUrl); +use parent qw(Bugzilla::BugUrl); ############################### #### Methods #### diff --git a/extensions/OldBugMove/Extension.pm b/extensions/OldBugMove/Extension.pm index 9a499d5d0..913553790 100644 --- a/extensions/OldBugMove/Extension.pm +++ b/extensions/OldBugMove/Extension.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::OldBugMove; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); use Bugzilla::Constants; use Bugzilla::Error; use Bugzilla::Field::Choice; diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm index 49ab99e13..03397eaf4 100644 --- a/extensions/Voting/Extension.pm +++ b/extensions/Voting/Extension.pm @@ -7,7 +7,7 @@ package Bugzilla::Extension::Voting; use strict; -use base qw(Bugzilla::Extension); +use parent qw(Bugzilla::Extension); use Bugzilla::Bug; use Bugzilla::BugMail; diff --git a/mod_perl.pl b/mod_perl.pl index 20d8e5060..20b9746f3 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -113,7 +113,7 @@ package Bugzilla::ModPerl::ResponseHandler; use 5.10.1; use strict; -use base qw(ModPerl::Registry); +use parent qw(ModPerl::Registry); use Bugzilla; sub handler : method { diff --git a/t/010dependencies.t b/t/010dependencies.t index d84688a7e..89a26ba5e 100644 --- a/t/010dependencies.t +++ b/t/010dependencies.t @@ -27,7 +27,7 @@ use constant MODULE_REGEX => qr/ ['"]? ([\w:\.\\]+) /x; -use constant BASE_REGEX => qr/^use base qw\(([^\)]+)/; +use constant BASE_REGEX => qr/^use (?:base|parent) (?:-norequire, )?qw\(([^\)]+)/; # Extract all Perl modules. foreach my $file (@Support::Files::testitems) { @@ -59,7 +59,7 @@ foreach my $module (keys %mods) { } elsif ($line =~ BASE_REGEX or $line =~ MODULE_REGEX) { my $used_string = $1; - # "use base" can have multiple modules + # "use base"/"use parent" can have multiple modules my @used_array = split(/\s+/, $used_string); foreach my $used (@used_array) { next if $used !~ /^Bugzilla/; diff --git a/t/Support/Templates.pm b/t/Support/Templates.pm index a28ec8759..c9a528e9f 100644 --- a/t/Support/Templates.pm +++ b/t/Support/Templates.pm @@ -10,7 +10,7 @@ package Support::Templates; use strict; use lib 't'; -use base qw(Exporter); +use parent qw(Exporter); @Support::Templates::EXPORT = qw(@languages @include_paths $english_default_include_path %include_path @referenced_files %actual_files $num_actual_files); diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl index 206ea88f4..993bceb18 100644 --- a/template/en/default/extensions/extension.pm.tmpl +++ b/template/en/default/extensions/extension.pm.tmpl @@ -14,7 +14,7 @@ package B[% %]ugzilla::Extension::[% name %]; use strict; -use base qw(B[% %]ugzilla::Extension); +use parent qw(B[% %]ugzilla::Extension); # This code for this is in [% path %]/lib/Util.pm use B[% %]ugzilla::Extension::[% name %]::Util; diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl index 6c9fe3795..c693c8a01 100644 --- a/template/en/default/extensions/util.pm.tmpl +++ b/template/en/default/extensions/util.pm.tmpl @@ -14,7 +14,7 @@ package B[% %]ugzilla::Extension::[% name %]::Util; use strict; -use base qw(Exporter); +use parent qw(Exporter); our @EXPORT = qw( ); diff --git a/xt/lib/Bugzilla/Test/Search/AndTest.pm b/xt/lib/Bugzilla/Test/Search/AndTest.pm index ac417121e..f34ba1f3a 100644 --- a/xt/lib/Bugzilla/Test/Search/AndTest.pm +++ b/xt/lib/Bugzilla/Test/Search/AndTest.pm @@ -8,7 +8,7 @@ # This test combines two field/operator combinations using AND in # a single boolean chart. package Bugzilla::Test::Search::AndTest; -use base qw(Bugzilla::Test::Search::OrTest); +use parent qw(Bugzilla::Test::Search::OrTest); use Bugzilla::Test::Search::Constants; use List::MoreUtils qw(all); diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm index bfcc439e4..53837ba58 100644 --- a/xt/lib/Bugzilla/Test/Search/Constants.pm +++ b/xt/lib/Bugzilla/Test/Search/Constants.pm @@ -12,7 +12,7 @@ # More detailed information on each constant is available in the comments # in this file. package Bugzilla::Test::Search::Constants; -use base qw(Exporter); +use parent qw(Exporter); use Bugzilla::Constants; use Bugzilla::Util qw(generate_random_password); diff --git a/xt/lib/Bugzilla/Test/Search/CustomTest.pm b/xt/lib/Bugzilla/Test/Search/CustomTest.pm index 15e302cf3..132e5ac40 100644 --- a/xt/lib/Bugzilla/Test/Search/CustomTest.pm +++ b/xt/lib/Bugzilla/Test/Search/CustomTest.pm @@ -9,7 +9,7 @@ # Tests like this are specified in CUSTOM_SEARCH_TESTS in # Bugzilla::Test::Search::Constants. package Bugzilla::Test::Search::CustomTest; -use base qw(Bugzilla::Test::Search::FieldTest); +use parent qw(Bugzilla::Test::Search::FieldTest); use strict; use warnings; diff --git a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm b/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm index 4147c249e..888e7eb13 100644 --- a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm +++ b/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm @@ -10,7 +10,7 @@ package Bugzilla::Test::Search::FieldTestNormal; use strict; use warnings; -use base qw(Bugzilla::Test::Search::FieldTest); +use parent qw(Bugzilla::Test::Search::FieldTest); use Scalar::Util qw(blessed); diff --git a/xt/lib/Bugzilla/Test/Search/InjectionTest.pm b/xt/lib/Bugzilla/Test/Search/InjectionTest.pm index 86dff3e0f..90eaabc78 100644 --- a/xt/lib/Bugzilla/Test/Search/InjectionTest.pm +++ b/xt/lib/Bugzilla/Test/Search/InjectionTest.pm @@ -8,7 +8,7 @@ # This module represents the SQL Injection tests that get run on a single # operator/field combination for Bugzilla::Test::Search. package Bugzilla::Test::Search::InjectionTest; -use base qw(Bugzilla::Test::Search::FieldTest); +use parent qw(Bugzilla::Test::Search::FieldTest); use strict; use warnings; diff --git a/xt/lib/Bugzilla/Test/Search/NotTest.pm b/xt/lib/Bugzilla/Test/Search/NotTest.pm index def4f9ac9..190b8567b 100644 --- a/xt/lib/Bugzilla/Test/Search/NotTest.pm +++ b/xt/lib/Bugzilla/Test/Search/NotTest.pm @@ -12,7 +12,7 @@ # it to OrTest and AndTest, but without Moose there isn't much of an # easy way to do that. package Bugzilla::Test::Search::NotTest; -use base qw(Bugzilla::Test::Search::FieldTest); +use parent qw(Bugzilla::Test::Search::FieldTest); use strict; use warnings; use Bugzilla::Test::Search::Constants; diff --git a/xt/lib/Bugzilla/Test/Search/OrTest.pm b/xt/lib/Bugzilla/Test/Search/OrTest.pm index d460e4422..1b948f38d 100644 --- a/xt/lib/Bugzilla/Test/Search/OrTest.pm +++ b/xt/lib/Bugzilla/Test/Search/OrTest.pm @@ -8,7 +8,7 @@ # This test combines two field/operator combinations using OR in # a single boolean chart. package Bugzilla::Test::Search::OrTest; -use base qw(Bugzilla::Test::Search::FieldTest); +use parent qw(Bugzilla::Test::Search::FieldTest); use Bugzilla::Test::Search::Constants; use List::MoreUtils qw(all any uniq); |