build bug fixes

Author: TheTechsTech

decode/MailReader.php

@@ -279,19 +279,21 @@ public function getMessages(string $email, int $offset = 0, int $max = 20)
         $dbc = $this->pdo;
 		if ($dbc instanceof \PDO) {
             $emails = $dbc->prepare("SELECT * FROM emails WHERE toaddr=:mail LIMIT :offset, :max");
-            $emails->bindValue(':mail', $email);
-            $emails->bindValue(':offset', $offset, \PDO::PARAM_INT);
-            $emails->bindValue(':max', $max, \PDO::PARAM_INT);
-            $emails->execute();
-
-            $records = [];
-            while ($record = $emails->fetchObject('Mail\Messages')) {
-                $records[] = $record;
-            }
+            if (!is_bool($email)) {
+                $emails->bindValue(':mail', $email);
+                $emails->bindValue(':offset', $offset, \PDO::PARAM_INT);
+                $emails->bindValue(':max', $max, \PDO::PARAM_INT);
+                $emails->execute();
+
+                $records = [];
+                while ($record = $emails->fetchObject('Mail\Messages')) {
+                    $records[] = $record;
+                }
 
-            unset($emails);
-            if (\count($records) > 0) 
-                return $records;
+                unset($emails);
+                if (\count($records) > 0) 
+                    return $records;
+            }
         }
 
         return false;
@@ -302,17 +304,19 @@ public function getMessageAttachments(int $message_id)
         $dbc = $this->pdo;
 		if ($dbc instanceof \PDO) {
             $files = $dbc->prepare("SELECT * FROM files WHERE email=:id");
-            $files->bindValue(':id', $message_id, \PDO::PARAM_INT);
-            $files->execute();
+            if (!is_bool($files)) {
+                $files->bindValue(':id', $message_id, \PDO::PARAM_INT);
+                $files->execute();
 
-            $records = [];
-            while ($record = $files->fetchObject('Mail\MessageAttachments')) {
-                $records[] = $record;
-            }
+                $records = [];
+                while ($record = $files->fetchObject('Mail\MessageAttachments')) {
+                    $records[] = $record;
+                }
 
-            unset($files);
-            if (\count($records) > 0) 
-                return $records;
+                unset($files);
+                if (\count($records) > 0) 
+                    return $records;
+            }
         }
 
         return false;

tests/MailReaderTest.php

@@ -17,7 +17,7 @@ class MailReaderTest extends TestCase
 
     protected $handle;
 
-    protected function setUp(): void
+    protected function setUp()
     {
         if (!\extension_loaded('pdo_mysql')) {
             $this->markTestSkipped(
@@ -39,7 +39,7 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
+    protected function tearDown()
     {
         $this->handle->query('DROP TABLE emails;');
         $this->handle->query('DROP TABLE files;');
@@ -54,7 +54,7 @@ public function testMailPipe()
         if ('\\' == \DIRECTORY_SEPARATOR)
             $output = \shell_exec('type tests\testfile | php mailPipe.php');
         else
-            $output = \shell_exec('cat tests/testfile | ./mailPipe.php');
+            $output = \shell_exec('cat tests/testfile | php mailPipe.php');
 
         $this->assertNull($output);