From bd9b0ccc722ea5939b5821d4dae7de9b00c7726e Mon Sep 17 00:00:00 2001 From: Guillaume Rousse <guillaume.rousse@renater.fr> Date: Tue, 1 Feb 2022 16:06:58 +0100 Subject: [PATCH] use Mojo::Base everywhere --- lib/AccountManager/Account.pm | 6 +----- lib/AccountManager/DB.pm | 5 +---- lib/AccountManager/DB/Object.pm | 4 +--- lib/AccountManager/Entity.pm | 5 +---- lib/AccountManager/L10N.pm | 4 +--- lib/AccountManager/L10N/en.pm | 5 +---- lib/AccountManager/L10N/fr.pm | 5 +---- lib/AccountManager/Metadata.pm | 3 +-- lib/AccountManager/Template/Plugin/Quote.pm | 4 ++-- lib/AccountManager/Token.pm | 5 +---- lib/AccountManager/Tools.pm | 3 +-- 11 files changed, 12 insertions(+), 37 deletions(-) diff --git a/lib/AccountManager/Account.pm b/lib/AccountManager/Account.pm index e4b6720..080b2f4 100644 --- a/lib/AccountManager/Account.pm +++ b/lib/AccountManager/Account.pm @@ -1,10 +1,6 @@ package AccountManager::Account; -use utf8; -use strict; -use warnings; - -use base 'AccountManager::DB::Object'; +use Mojo::Base 'AccountManager::DB::Object'; use Rose::DB::Object::Manager; diff --git a/lib/AccountManager/DB.pm b/lib/AccountManager/DB.pm index c200658..c851fff 100644 --- a/lib/AccountManager/DB.pm +++ b/lib/AccountManager/DB.pm @@ -1,9 +1,6 @@ package AccountManager::DB; -use strict; -use warnings; - -use base 'Rose::DB'; +use Mojo::Base 'Rose::DB'; __PACKAGE__->use_private_registry; diff --git a/lib/AccountManager/DB/Object.pm b/lib/AccountManager/DB/Object.pm index b37384a..fc7315d 100644 --- a/lib/AccountManager/DB/Object.pm +++ b/lib/AccountManager/DB/Object.pm @@ -1,8 +1,6 @@ package AccountManager::DB::Object; -use strict; -use warnings; -use base 'Rose::DB::Object'; +use Mojo::Base 'Rose::DB::Object'; use AccountManager::DB; diff --git a/lib/AccountManager/Entity.pm b/lib/AccountManager/Entity.pm index c5ec588..5723f30 100644 --- a/lib/AccountManager/Entity.pm +++ b/lib/AccountManager/Entity.pm @@ -1,9 +1,6 @@ package AccountManager::Entity; -use strict; -use warnings; - -use base 'AccountManager::DB::Object'; +use Mojo::Base 'AccountManager::DB::Object'; use List::MoreUtils qw(any); use Rose::DB::Object::Manager; diff --git a/lib/AccountManager/L10N.pm b/lib/AccountManager/L10N.pm index c8c17b4..e1b75cc 100644 --- a/lib/AccountManager/L10N.pm +++ b/lib/AccountManager/L10N.pm @@ -1,9 +1,7 @@ package AccountManager::L10N; -use strict; -use warnings; +use Mojo::Base 'Locale::Maketext'; -use base 'Locale::Maketext'; use Locale::Maketext::Lexicon::Gettext; sub load_custom_lexicon { diff --git a/lib/AccountManager/L10N/en.pm b/lib/AccountManager/L10N/en.pm index 83b4932..e872834 100644 --- a/lib/AccountManager/L10N/en.pm +++ b/lib/AccountManager/L10N/en.pm @@ -1,9 +1,6 @@ package AccountManager::L10N::en; -use strict; -use warnings; - -use base 'AccountManager::L10N'; +use Mojo::Base 'AccountManager::L10N'; our %Lexicon = ( '_AUTO' => 1, diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm index b8e1086..4bbe7b2 100644 --- a/lib/AccountManager/L10N/fr.pm +++ b/lib/AccountManager/L10N/fr.pm @@ -1,10 +1,7 @@ package AccountManager::L10N::fr; -use strict; -use warnings; -use utf8; +use Mojo::Base 'AccountManager::L10N'; -use base 'AccountManager::L10N'; use Locale::Maketext::Lexicon::Gettext; our %Lexicon = %{ diff --git a/lib/AccountManager/Metadata.pm b/lib/AccountManager/Metadata.pm index 654435b..f5d6a67 100644 --- a/lib/AccountManager/Metadata.pm +++ b/lib/AccountManager/Metadata.pm @@ -1,7 +1,6 @@ package AccountManager::Metadata; -use strict; -use warnings; +use Mojo::Base -base; use English qw(-no_match_vars); use XML::LibXML qw(:libxml); diff --git a/lib/AccountManager/Template/Plugin/Quote.pm b/lib/AccountManager/Template/Plugin/Quote.pm index 73e35ee..6187194 100644 --- a/lib/AccountManager/Template/Plugin/Quote.pm +++ b/lib/AccountManager/Template/Plugin/Quote.pm @@ -1,7 +1,7 @@ package AccountManager::Template::Plugin::Quote; -use strict; -use warnings; +use Mojo::Base -strict; + use Template::Stash; use constant DEFAULT_CHAR => '"'; diff --git a/lib/AccountManager/Token.pm b/lib/AccountManager/Token.pm index 1cf3421..95e2673 100644 --- a/lib/AccountManager/Token.pm +++ b/lib/AccountManager/Token.pm @@ -1,9 +1,6 @@ package AccountManager::Token; -use strict; -use warnings; - -use base 'AccountManager::DB::Object'; +use Mojo::Base 'AccountManager::DB::Object'; use Rose::DB::Object::Manager; diff --git a/lib/AccountManager/Tools.pm b/lib/AccountManager/Tools.pm index 548d5f5..6132732 100644 --- a/lib/AccountManager/Tools.pm +++ b/lib/AccountManager/Tools.pm @@ -1,7 +1,6 @@ package AccountManager::Tools; -use strict; -use warnings; +use Mojo::Base -strict; use Digest::SHA; use Encode; -- GitLab