From cb3af0e92aa4af0080274241410866edb8607af5 Mon Sep 17 00:00:00 2001 From: bernhard Date: Sun, 23 May 2021 19:16:29 +0200 Subject: [PATCH] Issue #760: accept some suggestions from Perl::Tidy Mostly alignment issues --- .../SupportDataCollector/Plugin/OS/Load.pm | 6 +-- Kernel/System/Web/InterfacePublic.pm | 2 +- scripts/test/CheckItem.t | 2 +- scripts/test/DB/UTF8Range.t | 4 +- .../GenericInterface/Transport/Transport.t | 2 +- scripts/test/GenericInterface/Webservice.t | 2 +- scripts/test/HTMLUtils/DocumentCleanup.t | 4 +- scripts/test/SMIME.t | 52 +++++++++---------- scripts/test/SupportBundleGenerator.t | 40 +++++++------- scripts/test/Time/DestinationTime.t | 10 ++-- .../EscalationSuspend.t | 2 +- 11 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm b/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm index 11acea7d23..d35ec8d8c8 100644 --- a/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm +++ b/Kernel/System/SupportDataCollector/Plugin/OS/Load.pm @@ -65,11 +65,11 @@ sub Run { if (@Loads) { $Self->AddResultInformation( - Label => Translatable('System Load'), - Value => $Loads[2], + Label => Translatable('System Load'), + Value => $Loads[2], Message => Translatable( - 'The system load should be at maximum the number of CPUs the system has (e.g. a load of 8 or less on a system with 8 CPUs is OK).' + 'The system load should be at maximum the number of CPUs the system has (e.g. a load of 8 or less on a system with 8 CPUs is OK).' ), ); } diff --git a/Kernel/System/Web/InterfacePublic.pm b/Kernel/System/Web/InterfacePublic.pm index 1df60463b6..4489b37886 100644 --- a/Kernel/System/Web/InterfacePublic.pm +++ b/Kernel/System/Web/InterfacePublic.pm @@ -218,7 +218,7 @@ sub Run { if ( !$ModuleReg ) { $Kernel::OM->Get('Kernel::System::Log')->Log( Priority => 'error', - Message => + Message => "Module Kernel::Modules::$Param{Action} not registered in Kernel/Config.pm!", ); $LayoutObject->CustomerFatalError( diff --git a/scripts/test/CheckItem.t b/scripts/test/CheckItem.t index a575dfd05f..661b2a2ed0 100644 --- a/scripts/test/CheckItem.t +++ b/scripts/test/CheckItem.t @@ -358,7 +358,7 @@ for my $Test (@Tests) { Result => undef, }, { - String => eval {'aúz'}, # utf-8 string + String => eval {'aúz'}, # utf-8 string Params => {}, Result => 'aúz', }, diff --git a/scripts/test/DB/UTF8Range.t b/scripts/test/DB/UTF8Range.t index 721a16121d..997c03b690 100644 --- a/scripts/test/DB/UTF8Range.t +++ b/scripts/test/DB/UTF8Range.t @@ -52,11 +52,11 @@ my @Tests = ( }, { Name => "UTF8 3 byte", - Data => 'ऄ', # DEVANAGARI LETTER SHORT A (e0 a4 84) + Data => 'ऄ', # DEVANAGARI LETTER SHORT A (e0 a4 84) }, { Name => "UTF8 4 byte", - Data => '💩', # PILE OF POO (f0 9f 92 a9) + Data => '💩', # PILE OF POO (f0 9f 92 a9) ExpectedDataOnMysql => '💩', }, ); diff --git a/scripts/test/GenericInterface/Transport/Transport.t b/scripts/test/GenericInterface/Transport/Transport.t index 7cc4d6c64f..efa021d22b 100644 --- a/scripts/test/GenericInterface/Transport/Transport.t +++ b/scripts/test/GenericInterface/Transport/Transport.t @@ -302,7 +302,7 @@ for my $Fail ( 0 .. 1 ) { { Name => "TransportObject (Fail $Fail) ProviderGenerateResponse() UTF-8 data", Data => { - A => 'A', + A => 'A', '使用下列语言' => 'معلومات', }, ResultData => diff --git a/scripts/test/GenericInterface/Webservice.t b/scripts/test/GenericInterface/Webservice.t index 0476d33762..7551eec567 100644 --- a/scripts/test/GenericInterface/Webservice.t +++ b/scripts/test/GenericInterface/Webservice.t @@ -144,7 +144,7 @@ my @Tests = ( NameSpace => '!"§$%&/()=?Ü*ÄÖL:L@,.-', SOAPAction => '', Encoding => '', - Endpoint => + Endpoint => 'iojfoiwjeofjweoj ojerojgv oiaejroitjvaioejhtioja viorjhiojgijairogj aiovtq348tu 08qrujtio juortu oquejrtwoiajdoifhaois hnaeruoigbo eghjiob jaer89ztuio45u603u4i9tj340856u903 jvipojziopeji', }, }, diff --git a/scripts/test/HTMLUtils/DocumentCleanup.t b/scripts/test/HTMLUtils/DocumentCleanup.t index c82ab6f90f..892ad416eb 100644 --- a/scripts/test/HTMLUtils/DocumentCleanup.t +++ b/scripts/test/HTMLUtils/DocumentCleanup.t @@ -95,13 +95,13 @@ my @Tests = ( Name => 'DocumentCleanup - blockquote' }, { - Input => '
Some Text
', + Input => '
Some Text
', Result => '
Some Text
', Name => 'DocumentCleanup - blockquote' }, { - Input => '
Some Text
test
', + Input => '
Some Text
test
', Result => '
Some Text
test
', Name => 'DocumentCleanup - blockquote' diff --git a/scripts/test/SMIME.t b/scripts/test/SMIME.t index 3be0505f47..0696fa2698 100644 --- a/scripts/test/SMIME.t +++ b/scripts/test/SMIME.t @@ -998,13 +998,13 @@ $Certificates{OTOBORootCA} = { $CertInfo{'SmimeTest_0'} = { Serial => '8C640B7D82967C5A', Fingerprint => '8F:5A:BD:42:0F:4C:19:DC:15:09:69:1F:60:62:A0:A4:7A:33:02:54', - Modulus => + Modulus => 'A28172017D075C69600A03CFAC610FD44D348369E107DB5DA23B72D79E5F1E34583BE5E41D11203CE609AB34E6CA4F371D0D906C66693F1AAF59E8EA8D3A7756EAA73E3C0A081095191149B2AA82BCCD6918E73283A01D33641035164A9854FC9E174815E0BE90D08DED47B512B3CFCF42EEC60F3C486285A3B7E633AEC454BF', StartDate => 'Feb 25 20:12:47 2011 GMT', EndDate => 'Feb 25 20:12:47 2012 GMT', ShortStartDate => '2011-02-25', ShortEndDate => '2012-02-25', - CertString => + CertString => '-----BEGIN CERTIFICATE----- MIICqzCCAhQCCQCMZAt9gpZ8WjANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC TVgxEDAOBgNVBAgTB0phbGlzY28xFDASBgNVBAcTC0d1YWRhbGFqYXJhMQ0wCwYD @@ -1027,13 +1027,13 @@ hX1v0pAMYoGlj4pLmNqp $CertInfo{'SmimeTest_1'} = { Serial => 'EBBDEED192DEF3D5', Fingerprint => '45:BB:21:E6:AD:9B:0A:95:52:D6:0E:C1:95:94:D6:A4:AA:1E:A8:07', - Modulus => + Modulus => 'E0F44A17A52FF5930737244074CEE25CC8E28C65259A43F39BEFF0F600C81C8ABABB44C38B5BB2A45FABC87E00D9B51232CAE7F35E1AD13C0A0A8E87CD54D6CCF0734E3EE791544DA206AD485718DA0677EF7761DEEE0E32E8A1DC3EBCAE0ED5DA9C2B56207993319168E00621D17972687DA4C956821D2CF6A636675094E581', StartDate => 'Apr 8 14:23:22 2011 GMT', EndDate => 'Apr 7 14:23:22 2012 GMT', ShortStartDate => '2011-04-08', ShortEndDate => '2012-04-07', - CertString => + CertString => '-----BEGIN CERTIFICATE----- MIICqzCCAhQCCQDrve7Rkt7z1TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC TVgxEDAOBgNVBAgTB0phbGlzY28xFDASBgNVBAcTC0d1YWRhbGFqYXJhMQ0wCwYD @@ -1056,13 +1056,13 @@ BLrMsW3mKPx9cPinBGIH $CertInfo{'SmimeTest_2'} = { Serial => '92AC1D548E1ACAD9', Fingerprint => '7E:63:F2:63:65:80:BB:8E:EB:B7:A8:6A:5C:2C:58:C0:6F:EA:F8:37', - Modulus => + Modulus => 'C93D9FEA0914DBF689B1D11E69A7D059ABA12AF3D39415E18837A29F6EF018ECF89105BA50838C7298636B7B055DDCD898E10C78357902F381423A32D0974CF5CE8A3593CBEA0DBC902AE994DEFF2B131A4E0A03FA59E445EF08D31CA854EE2BDF01F039C27119ED8AE2CB8A54040D54EC20BB502B13D9A2D41808BFD2CBC62F', StartDate => 'May 10 16:18:07 2011 GMT', EndDate => 'May 9 16:18:07 2012 GMT', ShortStartDate => '2011-05-10', ShortEndDate => '2011-05-09', - CertString => + CertString => '-----BEGIN CERTIFICATE----- MIICqzCCAhQCCQCSrB1UjhrK2TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC TVgxEDAOBgNVBAgTB0phbGlzY28xFDASBgNVBAcTC0d1YWRhbGFqYXJhMQ0wCwYD @@ -1085,13 +1085,13 @@ PHquavB33QpjlKE/X01O $CertInfo{'SmimeTest_3'} = { Serial => '94791BB083403427', Fingerprint => '8D:57:A4:EA:90:B2:CF:2A:80:40:9A:06:B1:EC:A9:14:02:91:46:BF', - Modulus => + Modulus => 'A57D1A863BFAC706576464E9DAC3AEDAF83FC3EB2E830EC9399D5A2D2187D74ABC192F97942FB457F0E7563F9E2F926DC3A0A6D4C281766DE698485D4C8EEF213954F810F78195DA244B3754E84A9B55F20796937F19BB9EA3E10210E7F610E030061413DD0565A1D6E8D9726641EF11073FECBAF2A78172F2DBB86944D324AD', StartDate => 'May 10 16:24:37 2011 GMT', EndDate => 'May 9 16:24:37 2012 GMT', ShortStartDate => '2011-05-10', ShortEndDate => '2011-05-09', - CertString => + CertString => '-----BEGIN CERTIFICATE----- MIICqzCCAhQCCQCUeRuwg0A0JzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC TVgxEDAOBgNVBAgTB0phbGlzY28xFDASBgNVBAcTC0d1YWRhbGFqYXJhMQ0wCwYD @@ -1114,13 +1114,13 @@ xqdO7PfndBF8qwrJ7S91 $CertInfo{'SmimeTest_4'} = { Serial => 'F8903502A91B01F6', Fingerprint => '24:99:51:50:FD:79:12:D9:EF:2D:D9:FB:52:59:03:9D:16:A6:6B:6C', - Modulus => + Modulus => 'D6CD6043671BE6E0BF1F0A36F16C8ECF9DE5128E4176CD73D79B2F8662EEE9FFB81FB95DEE8776E70BFD74BDFE06C2BA3D72FCE7C8E3572AC78AFC2E184BE22AB03994E5529022CBFC94C08A868E49D64FD327F567B77453469DFED0150FEB4708F5605EB46D116591B62DF11D351E77922FE8C01705AE25F03F266536F6865B05405AF61BE73FDFB5EA583147A26617589C8C411AE6F3119408DEC57C8922420F7F7D682347A3D5E48149E2B2156E407CA3AC5DFDC90839995A19EA3300C0637CA79050A1CA063BD6A15BE7ADE4CFECE5EBFF5C38DC22BDBFE85D93B02AA1B2591F2C6125ACF9EAA35C2612B45D6E693C87A95404C49DA3267E7E2CCDD55B1F', StartDate => 'Apr 21 09:00:03 2020 GMT', EndDate => 'Apr 21 09:00:03 2023 GMT', ShortStartDate => '2020-04-21', ShortEndDate => '2023-04-21', - CertString => + CertString => '-----BEGIN CERTIFICATE----- MIIDpTCCAo2gAwIBAgIJAPiQNQKpGwH2MA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX @@ -2126,9 +2126,9 @@ HZ4= Name => '3 Certs, PKs and PSs', WrongCAs => { OTOBORootCA => { - WrongCAFile => "$WrongHashes{OTOBORootCA}.0", - WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, - WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, + WrongCAFile => "$WrongHashes{OTOBORootCA}.0", + WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, + WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, WrongCAPrivateSecretFileContent => $Certificates{OTOBORootCA}->{PrivateSecret}, WrongRelations => [ @@ -2171,9 +2171,9 @@ HZ4= ], }, OTOBOLabCA => { - WrongCAFile => "$WrongHashes{OTOBOLabCA}.0", - WrongCAFileContent => $Certificates{OTOBOLabCA}->{String}, - WrongCAPrivateKeyFileContent => $Certificates{OTOBOLabCA}->{PrivateString}, + WrongCAFile => "$WrongHashes{OTOBOLabCA}.0", + WrongCAFileContent => $Certificates{OTOBOLabCA}->{String}, + WrongCAPrivateKeyFileContent => $Certificates{OTOBOLabCA}->{PrivateString}, WrongCAPrivateSecretFileContent => $Certificates{OTOBORootCA}->{PrivateSecret}, WrongRelations => [ @@ -2258,9 +2258,9 @@ HZ4= Name => '1 Cert, No PKs No PSs', WrongCAs => { OTOBORootCA => { - WrongCAFile => "$WrongHashes{OTOBORootCA}.0", - WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, - WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, + WrongCAFile => "$WrongHashes{OTOBORootCA}.0", + WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, + WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, WrongCAPrivateSecretFileContent => $Certificates{OTOBORootCA}->{PrivateSecret}, }, @@ -2274,9 +2274,9 @@ HZ4= Name => '1 Cert, 1 PKs No PSs', WrongCAs => { OTOBORootCA => { - WrongCAFile => "$WrongHashes{OTOBORootCA}.0", - WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, - WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, + WrongCAFile => "$WrongHashes{OTOBORootCA}.0", + WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, + WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, WrongCAPrivateSecretFileContent => $Certificates{OTOBORootCA}->{PrivateSecret}, }, @@ -2290,9 +2290,9 @@ HZ4= Name => '1 Cert, No PKs 1 PSs', WrongCAs => { OTOBORootCA => { - WrongCAFile => "$WrongHashes{OTOBORootCA}.0", - WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, - WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, + WrongCAFile => "$WrongHashes{OTOBORootCA}.0", + WrongCAFileContent => $Certificates{OTOBORootCA}->{String}, + WrongCAPrivateKeyFileContent => $Certificates{OTOBORootCA}->{PrivateString}, WrongCAPrivateSecretFileContent => $Certificates{OTOBORootCA}->{PrivateSecret}, }, @@ -2660,7 +2660,7 @@ HZ4= # check for certificate words for my $String ( qw( - Certificate Serial Signature Issuer: Validity Before After Subject: Modulus RSA + Certificate Serial Signature Issuer: Validity Before After Subject: Modulus RSA ) ) { diff --git a/scripts/test/SupportBundleGenerator.t b/scripts/test/SupportBundleGenerator.t index 5654a2d415..582560a29a 100644 --- a/scripts/test/SupportBundleGenerator.t +++ b/scripts/test/SupportBundleGenerator.t @@ -320,7 +320,7 @@ for my $Test (@Tests) { for my $Package ( sort keys %{ $Test->{UninstallPackages} } ) { $Success = $PackageObject->PackageUninstall( - String => $Test->{UninstallPackages}->{$Package} + String => $Test->{UninstallPackages}->{$Package} ); $Self->True( $Success, @@ -425,7 +425,7 @@ for my $Test (@Tests) { for my $Package ( sort keys %{ $Test->{UninstallPackages} } ) { $Success = $PackageObject->PackageUninstall( - String => $Test->{UninstallPackages}->{$Package} + String => $Test->{UninstallPackages}->{$Package} ); $Self->True( $Success, @@ -470,8 +470,8 @@ my $PerlStructureScalar = $JSONObject->Decode( if (%RegistrationInfo) { for my $Attribute ( qw( - FQDN OTOBOVersion OSType OSVersion DatabaseVersion PerlVersion - Description SupportDataSending RegistrationKey APIKey State Type + FQDN OTOBOVersion OSType OSVersion DatabaseVersion PerlVersion + Description SupportDataSending RegistrationKey APIKey State Type ) ) { @@ -504,14 +504,14 @@ $OriginalResult{Result} = \%OriginalIdentifiers; # sometimes is doesn't for this test we delete the possible offending identifiers for my $Identifier ( qw( - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheDBIUsed - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheReloadUsed - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModDeflateLoaded - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModHeadersLoaded - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL_API_VERSION - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::PERL_USE_UNSAFE_INC - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::LANGUAGE + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheDBIUsed + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheReloadUsed + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModDeflateLoaded + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModHeadersLoaded + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL_API_VERSION + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::PERL_USE_UNSAFE_INC + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::LANGUAGE ) ) { @@ -555,14 +555,14 @@ $PerlStructureScalar->{Result} = \%NewIdentifiers; # sometimes is doesn't for this test we delete the possible offending identifiers for my $Identifier ( qw( - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheDBIUsed - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheReloadUsed - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModDeflateLoaded - Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModHeadersLoaded - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL_API_VERSION - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::PERL_USE_UNSAFE_INC - Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::LANGUAGE + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheDBIUsed + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ApacheReloadUsed + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModDeflateLoaded + Kernel::System::SupportDataCollector::Plugin::Webserver::Apache::Performance::ModHeadersLoaded + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::MOD_PERL_API_VERSION + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::PERL_USE_UNSAFE_INC + Kernel::System::SupportDataCollector::Plugin::Webserver::EnvironmentVariables::LANGUAGE ) ) { diff --git a/scripts/test/Time/DestinationTime.t b/scripts/test/Time/DestinationTime.t index 97bc033e64..6e3df856e7 100644 --- a/scripts/test/Time/DestinationTime.t +++ b/scripts/test/Time/DestinationTime.t @@ -353,11 +353,11 @@ my @Tests = ( # test for calendar 9 { - Name => 'OTOBO time zone UTC, Calendar 9 time zone Europe/Berlin ( Daylight Saving Time UTC+1 => UTC+2 )', - TimeStampStart => '2015-03-27 11:00:00', # UTC - OTOBOTimeZone => 'UTC', - Calendar => 9, - Time => 60 * 60 * 15, # Cal. 9 has 9 hours per day, Mon - Fri + Name => 'OTOBO time zone UTC, Calendar 9 time zone Europe/Berlin ( Daylight Saving Time UTC+1 => UTC+2 )', + TimeStampStart => '2015-03-27 11:00:00', # UTC + OTOBOTimeZone => 'UTC', + Calendar => 9, + Time => 60 * 60 * 15, # Cal. 9 has 9 hours per day, Mon - Fri TimeDate => '15h', # 90 days and 1h, contains 05-01 vacation day DestinationTime => '2015-03-31 07:00:00', # UTC }, diff --git a/scripts/test/Znuny4OTOBOEscalationSuspend/EscalationSuspend.t b/scripts/test/Znuny4OTOBOEscalationSuspend/EscalationSuspend.t index 2afcd0d9a6..cfab2abbb9 100644 --- a/scripts/test/Znuny4OTOBOEscalationSuspend/EscalationSuspend.t +++ b/scripts/test/Znuny4OTOBOEscalationSuspend/EscalationSuspend.t @@ -75,7 +75,7 @@ $Self->IsDeeply( $TicketEventModulePostConfig->{$EscalationIndexName}, { 'Transaction' => 0, - 'Event' => + 'Event' => 'TicketSLAUpdate|TicketQueueUpdate|TicketStateUpdate|TicketCreate|ArticleCreate|TicketDynamicFieldUpdate|TicketTypeUpdate|TicketServiceUpdate|TicketCustomerUpdate|TicketPriorityUpdate|TicketMerge', 'Module' => 'Kernel::System::Ticket::Event::TicketEscalationIndex' },