Merge pull request #8486 from ehuelsmann/cleanup/no-use-base

Use 'parent' over 'base' module
ledgersmb · Nov 10, 2024 · d9f04ec · d9f04ec
2 parents 6856652 + 8f4fb50
commit d9f04ec
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 22 deletions.
diff --git a/cpanfile b/cpanfile
@@ -116,6 +116,7 @@ requires 'Text::CSV';
 requires 'Text::Markdown';
 requires 'URI';
 requires 'URI::Escape';
+requires 'Workflow::Action', '1.59';
 requires 'Workflow::Condition', '1.59';
 requires 'Workflow::Context', '1.59';
 requires 'Workflow::Exception', '1.59';
@@ -186,13 +187,7 @@ on 'develop' => sub {
     requires 'Selenium::Remote::Driver';
     requires 'TAP::Parser::SourceHandler::pgTAP', '3.33';
     requires 'Test::BDD::Cucumber', '0.86';
-    if ($ENV{CI}) {
-        # Required to suppress a variable re-definition
-        requires 'Test::Dependencies', '0.30';
-    }
-    else {
-        requires 'Test::Dependencies', '0.25';
-    }
+    requires 'Test::Dependencies', '0.34';
     requires 'Test::Pod', '1.00';
     requires 'Test::Pod::Coverage';
     requires 'Test2::Harness';

diff --git a/lib/LedgerSMB/Locale.pm b/lib/LedgerSMB/Locale.pm
@@ -97,7 +97,7 @@ $myconfig->{dateformat}.
 use strict;
 use warnings;
 
-use base qw( Locale::Maketext Exporter );
+use parent qw( Locale::Maketext Exporter );
 our @EXPORT_OK = qw(marktext);
 
 use Locale::Maketext::Lexicon;

diff --git a/lib/LedgerSMB/Magic.pm b/lib/LedgerSMB/Magic.pm
@@ -2,7 +2,7 @@ package LedgerSMB::Magic;
 use strict;
 use warnings;
 
-use base 'Exporter';
+use parent 'Exporter';
 
 
 our @EXPORT_OK = qw(

diff --git a/lib/LedgerSMB/PGDate.pm b/lib/LedgerSMB/PGDate.pm
@@ -16,7 +16,7 @@ The type behaves internally as a Datetime module.
 
 use v5.36.1;
 use warnings;
-use base qw(PGObject::Type::DateTime);
+use parent qw(PGObject::Type::DateTime);
 
 use Carp;
 use DateTime;

diff --git a/lib/LedgerSMB/PGNumber.pm b/lib/LedgerSMB/PGNumber.pm
@@ -17,7 +17,7 @@ Math::BigFloat and can be used in this way.
 
 use v5.36.1;
 use warnings;
-use base qw(PGObject::Type::BigFloat);
+use parent qw(PGObject::Type::BigFloat);
 
 # try using the GMP library for Math::BigFloat for speed
 use Carp;

diff --git a/lib/LedgerSMB/PGTimestamp.pm b/lib/LedgerSMB/PGTimestamp.pm
@@ -16,7 +16,7 @@ The type behaves internally as a Datetime module.
 
 use v5.36.1;
 use warnings;
-use base qw(PGObject::Type::DateTime);
+use parent qw(PGObject::Type::DateTime);
 
 use Carp;
 use DateTime::Format::Strptime qw(strptime);

diff --git a/lib/LedgerSMB/Workflow/Persister.pm b/lib/LedgerSMB/Workflow/Persister.pm
@@ -26,7 +26,7 @@ the same configuration semantics.
 
 use warnings;
 use strict;
-use base qw( Workflow::Persister::DBI );
+use parent qw( Workflow::Persister::DBI );
 
 use JSON::MaybeXS;
 use Workflow::Context;

diff --git a/lib/LedgerSMB/Workflow/Persister/Email.pm b/lib/LedgerSMB/Workflow/Persister/Email.pm
@@ -63,7 +63,7 @@ The C< content > field will be loaded from the database when it's being accessed
 
 use warnings;
 use strict;
-use base qw( LedgerSMB::Workflow::Persister::ExtraData );
+use parent qw( LedgerSMB::Workflow::Persister::ExtraData );
 
 use JSON::MaybeXS;
 use Log::Any qw($log);

diff --git a/lib/LedgerSMB/Workflow/Persister/ExtraData.pm b/lib/LedgerSMB/Workflow/Persister/ExtraData.pm
@@ -31,7 +31,7 @@ C<LedgerSMB::App_State::DBH>.
 
 use warnings;
 use strict;
-use base qw( Workflow::Persister::DBI::ExtraData );
+use parent qw( Workflow::Persister::DBI::ExtraData );
 
 use JSON::MaybeXS;
 use Workflow::Context;

diff --git a/lib/LedgerSMB/Workflow/Persister/Order.pm b/lib/LedgerSMB/Workflow/Persister/Order.pm
@@ -26,7 +26,7 @@ the same configuration semantics.
 
 use warnings;
 use strict;
-use base qw( LedgerSMB::Workflow::Persister );
+use parent qw( LedgerSMB::Workflow::Persister );
 
 use Workflow::Exception qw( persist_error );
 use English;

diff --git a/old/lib/LedgerSMB/Batch.pm b/old/lib/LedgerSMB/Batch.pm
@@ -46,7 +46,7 @@ use strict;
 use warnings;
 
 use LedgerSMB::Setting;
-use base qw(LedgerSMB::PGOld);
+use parent qw(LedgerSMB::PGOld);
 
 use Log::Any qw($log);
 

diff --git a/old/lib/LedgerSMB/DBObject/Payment.pm b/old/lib/LedgerSMB/DBObject/Payment.pm
@@ -19,7 +19,7 @@ see the included COPYRIGHT and LICENSE files for more information.
 =cut
 
 package LedgerSMB::DBObject::Payment;
-use base qw(LedgerSMB::PGOld);
+use parent qw(LedgerSMB::PGOld);
 use strict;
 use warnings;
 use LedgerSMB::PGNumber;

diff --git a/old/lib/LedgerSMB/DBObject/Reconciliation.pm b/old/lib/LedgerSMB/DBObject/Reconciliation.pm
@@ -49,7 +49,7 @@ package LedgerSMB::DBObject::Reconciliation;
 use strict;
 use warnings;
 
-use base qw(LedgerSMB::PGOld);
+use parent qw(LedgerSMB::PGOld);
 use List::Util qw(sum);
 use LedgerSMB::PGNumber;
 

diff --git a/old/lib/LedgerSMB/PGOld.pm b/old/lib/LedgerSMB/PGOld.pm
@@ -20,7 +20,7 @@ package LedgerSMB::PGOld;
 use strict;
 use warnings;
 
-use base 'PGObject::Simple';
+use parent 'PGObject::Simple';
 
 =head1 METHODS
 

diff --git a/old/lib/LedgerSMB/Setting.pm b/old/lib/LedgerSMB/Setting.pm
@@ -1,6 +1,6 @@
 package LedgerSMB::Setting;
 
-use base qw(LedgerSMB::PGOld Exporter);
+use parent qw(LedgerSMB::PGOld Exporter);
 use strict;
 use warnings;
 

diff --git a/old/lib/LedgerSMB/old_code.pm b/old/lib/LedgerSMB/old_code.pm
@@ -34,7 +34,7 @@ use POSIX 'SEEK_SET';
 use Symbol;
 use Feature::Compat::Try;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT_OK = qw(dispatch);
 
 # make sure the package exists after 'use'-ing this module: