Issue #1033: pull some slight code tidyings from rel-10_1

RotherOSS · Jul 13, 2021 · 1a11b42 · 1a11b42
1 parent 0674fc0
commit 1a11b42
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/Kernel/System/XML/Simple.pm b/Kernel/System/XML/Simple.pm
@@ -122,15 +122,15 @@ sub XMLIn {
             Priority => 'error',
             Message  => "Parameter Options needs to be a hash ref!",
         );
+
         return;
     }
 
-    my $PerlStructure;
-    eval {
+    my $PerlStructure = eval {
 
         my $XMLSimpleObject = XML::LibXML::Simple->new();
 
-        $PerlStructure = $XMLSimpleObject->XMLin(
+        return $XMLSimpleObject->XMLin(
             $Param{XMLInput},
             $Param{Options} ? %{ $Param{Options} } : (),
         );

diff --git a/scripts/restore.pl b/scripts/restore.pl
@@ -275,7 +275,7 @@
 
         # set password via environment variable if there is one
         if ($DatabasePw) {
-            $ENV{'PGPASSWORD'} = $DatabasePw;    ## no critic qw(Variables::RequireLocalizedPunctuationVars)
+            $ENV{PGPASSWORD} = $DatabasePw;    ## no critic qw(Variables::RequireLocalizedPunctuationVars)
         }
         say "Restore database into $DB ...";
         system(
@@ -286,7 +286,7 @@
 
         # set password via environment variable if there is one
         if ($DatabasePw) {
-            $ENV{'PGPASSWORD'} = $DatabasePw;    ## no critic qw(Variables::RequireLocalizedPunctuationVars)
+            $ENV{PGPASSWORD} = $DatabasePw;    ## no critic qw(Variables::RequireLocalizedPunctuationVars)
         }
         say "Restore database into $DB ...";
         system(

diff --git a/scripts/test/DateTime.t b/scripts/test/DateTime.t
@@ -133,7 +133,7 @@ $Self->IsDeeply(
 #
 # Tests for creating DateTime objects with given date and time
 #
-my @TestConfigs = (
+my @DateTimeTestConfigs = (
     {
         Params => {
             Year  => 2016,
@@ -316,7 +316,7 @@ my @TestConfigs = (
 );
 
 TESTCONFIG:
-for my $TestConfig (@TestConfigs) {
+for my $TestConfig (@DateTimeTestConfigs) {
 
     # Create DateTime object
     $DateTimeObject = $Kernel::OM->Create(
@@ -359,7 +359,7 @@ for my $TestConfig (@TestConfigs) {
 #
 # Tests for creating and setting DateTime object via string
 #
-@TestConfigs = (
+my @StringTestConfigs = (
     {
         Data => {
             String => '2016-02-28 14:59:00',
@@ -439,7 +439,7 @@ for my $TestConfig (@TestConfigs) {
     },
 );
 
-for my $TestConfig (@TestConfigs) {
+for my $TestConfig (@StringTestConfigs) {
     my $DateTimeObject = $Kernel::OM->Create(
         'Kernel::System::DateTime',
         ObjectParams => $TestConfig->{Data},

diff --git a/scripts/test/Selenium/Agent/Admin/AdminACL.t b/scripts/test/Selenium/Agent/Admin/AdminACL.t
@@ -155,13 +155,8 @@ $Selenium->RunTest(
             'Client side validation correctly detected missing input value',
         );
 
-        my @TestACLNames;
-
         # Create test ACL names.
-        for my $Name (qw(ACL NewACL)) {
-            my $TestACLName = $Name . $Helper->GetRandomNumber() . ' $ @';
-            push @TestACLNames, $TestACLName;
-        }
+        my @TestACLNames = map { $_ . $Helper->GetRandomNumber() . ' $ @' } qw(ACL NewACL);
 
         # Test for Bug#14411, 300 is more than the allowed by the filed (200), exceeding characters
         #   are just not typed.

diff --git a/scripts/test/Selenium/Customer/MultiAttachmentUpload/TicketMessage.t b/scripts/test/Selenium/Customer/MultiAttachmentUpload/TicketMessage.t
@@ -111,7 +111,7 @@ $Selenium->RunTest(
         # The class Hidden is only removed when the upload is complete.
         $Selenium->WaitFor(
             JavaScript =>
-                "return typeof(\$) === 'function' && \$('.AttachmentDelete i').length"
+                q{return typeof($) === 'function' && $('.AttachmentDelete i').length}
         );
 
         # Check if uploaded.