From d0ffe11bd365b68d4da252b39d06d99f75d8cacb Mon Sep 17 00:00:00 2001
From: "Jannis M. Hoffmann" <jannis@fehcom.de>
Date: Wed, 16 Nov 2022 23:14:10 +0100
Subject: minor cleanup and fixes

---
 lib/JWebmail/Model/ReadMails/MockJSON.pm      | 6 +++---
 lib/JWebmail/Model/ReadMails/QMailAuthuser.pm | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib/JWebmail/Model/ReadMails')

diff --git a/lib/JWebmail/Model/ReadMails/MockJSON.pm b/lib/JWebmail/Model/ReadMails/MockJSON.pm
index 1a16ef6..b90a630 100644
--- a/lib/JWebmail/Model/ReadMails/MockJSON.pm
+++ b/lib/JWebmail/Model/ReadMails/MockJSON.pm
@@ -3,10 +3,10 @@ package JWebmail::Model::ReadMails::MockJSON;
 use v5.24;
 use warnings;
 use utf8;
+use autodie;
 
 use List::Util 'sum';
-
-use Mojo::JSON 'decode_json';
+use JSON::PP 'decode_json';
 
 use Digest::HMAC_MD5 'hmac_md5_hex';
 use Role::Tiny::With;
@@ -28,7 +28,7 @@ sub _read_json_file {
 
     use constant PREFIX => 't/private/';
 
-    open(my $body_file, '<', PREFIX . $file_name);
+    open my $body_file, '<', PREFIX . $file_name;
     local $/;
     my $body = <$body_file>;
     close $body_file;
diff --git a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
index d0d2b3c..39d8ab6 100644
--- a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
+++ b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
@@ -190,10 +190,9 @@ sub execute {
 
     binmode $reader, ':encoding(UTF-8)';
     my $input = <$reader>;
-    close $reader
+    close $reader # waits for the child to finish
         or die 'closing read pipe failed';
 
-    waitpid($pid, 0);
     my $rc = $? >> 8;
 
     my $resp;
-- 
cgit v1.2.3