Merge pull request #776 from RotherOSS/issue-#760-perlcritic

Issue #760 perlcritic
RotherOSS · Feb 6, 2021 · 04738b3 · 04738b3
2 parents 2d4350a + 20fc382
commit 04738b3
Show file tree

Hide file tree

Showing 45 changed files with 168 additions and 223 deletions.
diff --git a/Kernel/Autoload/Test.pm b/Kernel/Autoload/Test.pm
@@ -14,11 +14,14 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 # --
 
-use Kernel::System::Valid;
+use Kernel::System::Valid; ## no critic (Modules::RequireExplicitPackage)
+
+package Kernel::System::Valid; ## no critic (Modules::RequireFilenameMatchesPackage)
 
-package Kernel::System::Valid;    ## no critic
 use strict;
 use warnings;
+use v5.24;
+use utf8;
 
 #
 # This file demonstrates how to use the autoload mechanism of OTOBO to change existing functionality,

diff --git a/Kernel/Autoload/Znuny4OTOBOPasswordPolicy.pm b/Kernel/Autoload/Znuny4OTOBOPasswordPolicy.pm
@@ -15,9 +15,9 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 # --
 
-use Kernel::Output::HTML::Layout;
+use Kernel::Output::HTML::Layout; ## no critic (Modules::RequireExplicitPackage)
 
-package Kernel::Output::HTML::Layout;    ## no critic
+package Kernel::Output::HTML::Layout; ## no critic (Modules::RequireFilenameMatchesPackage)
 
 use strict;
 use warnings;

diff --git a/Kernel/Config/Defaults.pm b/Kernel/Config/Defaults.pm
@@ -1921,8 +1921,7 @@ via the Preferences button after logging in.
 
 # Please see the documentation in Kernel/Config.pod.dist.
 sub new {
-    my $Type = shift;
-    my %Param = @_;
+    my ($Type, %Param) = @_;
 
     # allocate new hash for object
     my $Self = bless {}, $Type;

diff --git a/Kernel/Language.pm b/Kernel/Language.pm
@@ -267,8 +267,7 @@ Valid placeholders are '%s' and '%d'.
 =cut
 
 sub Translate {
-    my $Self = shift;
-    my( $Text, @Replacements ) = @_;
+    my ( $Self, $Text, @Replacements ) = @_;
 
     $Text //= '';
     $Text = $Self->{Translation}->{$Text} || $Text;

diff --git a/Kernel/Output/HTML/Layout.pm b/Kernel/Output/HTML/Layout.pm
@@ -658,8 +658,7 @@ sub Redirect {
 }
 
 sub Login {
-    my $Self = shift;
-    my %Param = @_;
+    my ($Self, %Param) = @_;
 
     # set Action parameter for the loader
     $Self->{Action} = 'Login';
@@ -1244,8 +1243,7 @@ generates the HTML for the page begin in the Agent interface.
 =cut
 
 sub Header {
-    my $Self = shift;
-    my %Param = @_;
+    my ($Self, %Param) = @_;
 
     # extract params
     my $Type = $Param{Type} || '';
@@ -3896,8 +3894,7 @@ sub HumanReadableDataSize {
 }
 
 sub CustomerLogin {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $Output = '';
     $Param{TitleArea} = $Self->{LanguageObject}->Translate('Login') . ' - ';
@@ -4130,8 +4127,7 @@ sub CustomerLogin {
 }
 
 sub CustomerHeader {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $Type = $Param{Type} || '';
 

diff --git a/Kernel/System/Console/Command/Maint/Ticket/EscalationIndexRebuild.pm b/Kernel/System/Console/Command/Maint/Ticket/EscalationIndexRebuild.pm
@@ -56,8 +56,7 @@ sub Configure {
 }
 
 sub Run {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     $Self->Print("<yellow>Rebuilding ticket escalation index...</yellow>\n");
 

diff --git a/Kernel/System/DB/mysql.pm b/Kernel/System/DB/mysql.pm
@@ -30,8 +30,7 @@ our @ObjectDependencies = (
 );
 
 sub new {
-    my $Class = shift;
-    my %Param = @_;
+    my ( $Class, %Param ) = @_;
 
     # allocate new hash for object
     return bless { %Param }, $Class;

diff --git a/Kernel/System/Main.pm b/Kernel/System/Main.pm
@@ -78,8 +78,7 @@ require/load a module
 =cut
 
 sub Require {
-    my $Self  = shift;
-    my ( $Module, %Param ) = @_;
+    my ( $Self, $Module, %Param ) = @_;
 
     # check required params
     if ( !$Module ) {

diff --git a/Kernel/System/MigrateFromOTRS/Base.pm b/Kernel/System/MigrateFromOTRS/Base.pm
@@ -98,7 +98,8 @@ sub CleanLicenseHeader {
     my $NewContent;
 
     # Open file
-    open( my $FileHandle, '<:encoding(utf-8)', $FilePathAndName );
+    ## no critic qw(InputOutput::RequireBriefOpen)
+    open my $FileHandle, '<:encoding(utf-8)', $FilePathAndName;
 
     if ( !$FileHandle ) {
 
@@ -256,8 +257,7 @@ replace the XML element I<otrs_config> to I<otobo_config>.
 =cut
 
 sub MigrateXMLConfig {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $File = $Param{File};
 
@@ -339,7 +339,7 @@ sub CleanOTRSFileToOTOBOStyle {
     my @ParserRegExLicence = _ChangeLicenseHeaderRules();
 
     my $NewContent;
-    open( my $FileHandle, '<:encoding(utf-8)', $FilePathAndName );
+    open( my $FileHandle, '<:encoding(utf-8)', $FilePathAndName ); ## no critic (InputOutput::RequireBriefOpen)
 
     if ( !$FileHandle ) {
 
@@ -1087,8 +1087,7 @@ settings by default.
 
 # Note: looks like this method is currently unused
 sub SettingUpdate {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     if ( !$Param{Name} ) {
         $Kernel::OM->Get('Kernel::System::Log')->Log(

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Backend.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Backend.pm
@@ -59,8 +59,7 @@ create a CloneDB backend object
 =cut
 
 sub new {
-    my $Class = shift;
-    my %Param = @_;
+    my ( $Class, %Param ) = @_;
 
     # allocate new hash for object
     my $Self = bless {}, $Class;
@@ -127,8 +126,7 @@ creates the target db object.
 =cut
 
 sub CreateOTRSDBConnection {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     if ( !$Param{OTRSDBSettings} ) {
@@ -185,8 +183,7 @@ transfers information from a OTRS DB to the OTOBO DB.
 =cut
 
 sub DataTransfer {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $LogObject = $Kernel::OM->Get('Kernel::System::Log');
 
@@ -265,8 +262,7 @@ The returned value is a hash ref with the fields I<Message>, I<Comment>, and I<S
 =cut
 
 sub SanityChecks {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $LanguageObject = $Kernel::OM->Get('Kernel::Language');
 

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/Base.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/Base.pm
@@ -111,8 +111,7 @@ The returned value is a hash ref with the fields I<Message>, I<Comment>, and I<S
 =cut
 
 sub SanityChecks {
-    my $Self  = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $LanguageObject = $Kernel::OM->Get('Kernel::Language');
 
@@ -263,8 +262,7 @@ Get the number of rows in a table.
 =cut
 
 sub RowCount {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     my $MigrationBaseObject = $Kernel::OM->Get('Kernel::System::MigrateFromOTRS::Base');
 
@@ -305,8 +303,7 @@ Transfer the actual table data
 =cut
 
 sub DataTransfer {
-    my $Self = shift; # the source db backend
-    my %Param = @_;
+    my ( $Self, %Param ) = @_; # $Self is  the source db backend
 
     # check needed parameters
     for my $Needed (qw(OTRSDBObject OTOBODBObject OTOBODBBackend DBInfo)) {
@@ -345,6 +342,8 @@ sub DataTransfer {
     # Open for writing as the file usually does not exist yet.
     # This approach assumes that the the webserver processes are running on a single machine.
     my $LockFile = join '/', $ConfigObject->Get('Home'), 'var/tmp/migrate_from_otrs.lock';
+    # TODO: why still warnings from Perl::Critic ??
+    ## no critic qw(OTOBO::ProhibitLowPrecendeceOps OTOBO::ProhibitOpen InputOutput::RequireBriefOpen)
     open my $LockFh, '>', $LockFile or do {
         $MigrationBaseObject->MigrationLog(
             String   => "Could not open lockfile $LockFile; $!",

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/mysql.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/mysql.pm
@@ -53,8 +53,7 @@ Please look there for a detailed reference of the functions.
 
 # create external db connection.
 sub CreateOTRSDBConnection {
-    my $Self  = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check OTRSDBSettings
     for my $Needed (
@@ -97,8 +96,7 @@ sub CreateOTRSDBConnection {
 
 # List all columns of a table in the order of their position.
 sub ColumnsList {
-    my $Self  = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table)) {
@@ -133,8 +131,7 @@ sub ColumnsList {
 
 # Get all binary columns and return a lookup hash with table and column name as keys.
 sub BlobColumnsList {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table)) {
@@ -170,8 +167,7 @@ END_SQL
 # Get column infos
 # return DATA_TYPE
 sub GetColumnInfos {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table Column)) {
@@ -210,8 +206,7 @@ sub GetColumnInfos {
 # Translate column infos
 # return DATA_TYPE
 sub TranslateColumnInfos {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBType ColumnInfos)) {
@@ -263,8 +258,7 @@ sub TranslateColumnInfos {
 
 # Alter table add column
 sub AlterTableAddColumn {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject Table Column ColumnInfos)) {

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/oracle.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/oracle.pm
@@ -106,8 +106,7 @@ sub CreateOTRSDBConnection {
 
 # List all columns of a table in the order of their position.
 sub ColumnsList {
-    my $Self  = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject Table)) {
@@ -231,8 +230,7 @@ sub ResetAutoIncrementField {
 
 # Get all binary columns and return a lookup hash with table and column name as keys.
 sub BlobColumnsList {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table)) {

diff --git a/Kernel/System/MigrateFromOTRS/CloneDB/Driver/postgresql.pm b/Kernel/System/MigrateFromOTRS/CloneDB/Driver/postgresql.pm
@@ -96,8 +96,7 @@ sub CreateOTRSDBConnection {
 
 # List all columns of a table in the order of their position.
 sub ColumnsList {
-    my $Self  = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject Table)) {
@@ -198,8 +197,7 @@ sub ResetAutoIncrementField {
 
 # Get all binary columns and return a lookup hash with table and column name as keys.
 sub BlobColumnsList {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table)) {
@@ -235,8 +233,7 @@ END_SQL
 # Get column infos
 # return DATA_TYPE
 sub GetColumnInfos {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject DBName Table Column)) {
@@ -274,8 +271,7 @@ sub GetColumnInfos {
 # Translate column infos
 # return DATA_TYPE
 sub TranslateColumnInfos {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBType ColumnInfos)) {
@@ -330,8 +326,7 @@ sub TranslateColumnInfos {
 
 # Alter table add column
 sub AlterTableAddColumn {
-    my $Self = shift;
-    my %Param = @_;
+    my ( $Self, %Param ) = @_;
 
     # check needed stuff
     for my $Needed (qw(DBObject Table Column ColumnInfos)) {