Merge pull request #4490 from FruitFly638/devel

Add more perl signatures to lib::OpenQA::Files and Git
os-autoinst · Feb 1, 2022 · 0a1802f · 0a1802f
2 parents 2461a11 + 768ce57
commit 0a1802f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 29 deletions.
diff --git a/lib/OpenQA/Files.pm b/lib/OpenQA/Files.pm
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 package OpenQA::Files;
-use Mojo::Base 'OpenQA::Parser::Results';
+use Mojo::Base 'OpenQA::Parser::Results', -signatures;
 
 use Digest::SHA 'sha1_base64';
 use Mojo::File 'path';
@@ -36,9 +36,7 @@ sub prepare {
     return $self->each(sub { $_->prepare });
 }
 
-sub write_chunks {
-    my ($class, $chunk_path, $file) = @_;
-
+sub write_chunks ($class, $chunk_path, $file) {
     return Mojo::File->new($chunk_path)->list_tree()->sort->each(
         sub {
             my $chunk = OpenQA::File->deserialize($_->slurp);
@@ -47,24 +45,20 @@ sub write_chunks {
         });
 }
 
-sub write_verify_chunks {
-    my ($class, $chunk_path, $file) = @_;
+sub write_verify_chunks ($class, $chunk_path, $file) {
     $class->write_chunks($chunk_path => $file);
     return $class->verify_chunks($chunk_path => $file);
 }
 
-sub spurt {
-    my ($self, $dir) = @_;
+sub spurt ($self, $dir) {
     return $self->each(
         sub {
             $_->prepare;    # Prepare your data first before serializing
             Mojo::File->new($dir, $_->index)->spurt($_->serialize);
         });
 }
 
-sub verify_chunks {
-    my ($class, $chunk_path, $verify_file) = @_;
-
+sub verify_chunks ($class, $chunk_path, $verify_file) {
     my $sum;
     for (Mojo::File->new($chunk_path)->list_tree()->each) {
         my $chunk = OpenQA::File->deserialize($_->slurp);

diff --git a/lib/OpenQA/Git.pm b/lib/OpenQA/Git.pm
@@ -3,29 +3,25 @@
 
 package OpenQA::Git;
 
-use Mojo::Base -base;
+use Mojo::Base -base, -signatures;
 use Cwd 'abs_path';
 use OpenQA::Utils qw(run_cmd_with_log_return_error);
 
 has 'app';
 has 'dir';
 has 'user';
 
-sub enabled {
-    my ($self) = @_;
+sub enabled ($self, $args = undef) {
     die 'no app assigned' unless my $app = $self->app;
     return ($app->config->{global}->{scm} || '') eq 'git';
 }
 
-sub config {
-    my ($self) = @_;
+sub config ($self, $args = undef) {
     die 'no app assigned' unless my $app = $self->app;
     return $app->config->{'scm git'};
 }
 
-sub _prepare_git_command {
-    my ($self, $args) = @_;
-
+sub _prepare_git_command ($self, $args = undef) {
     my $dir = $args->{dir} // $self->dir;
     if ($dir !~ /^\//) {
         my $absolute_path = abs_path($dir);
@@ -34,25 +30,20 @@ sub _prepare_git_command {
     return ('git', '-C', $dir);
 }
 
-sub _format_git_error {
-    my ($git_result, $error_message) = @_;
-
+sub _format_git_error ($git_result, $error_message) {
     if ($git_result->{stderr}) {
         $error_message .= ': ' . $git_result->{stderr};
     }
     return $error_message;
 }
 
-sub _validate_attributes {
-    my ($self) = @_;
-
+sub _validate_attributes ($self) {
     for my $mandatory_property (qw(app dir user)) {
         die "no $mandatory_property specified" unless $self->$mandatory_property();
     }
 }
 
-sub set_to_latest_master {
-    my ($self, $args) = @_;
+sub set_to_latest_master ($self, $args = undef) {
     $self->_validate_attributes;
 
     my @git = $self->_prepare_git_command($args);
@@ -70,8 +61,7 @@ sub set_to_latest_master {
     return undef;
 }
 
-sub commit {
-    my ($self, $args) = @_;
+sub commit ($self, $args = undef) {
     $self->_validate_attributes;
 
     my @git = $self->_prepare_git_command($args);