Fix phpstan errors regarding rcube_uploads trait methods

phpstan-baseline.neon

@@ -110,16 +110,6 @@ parameters:
 			count: 1
 			path: plugins/filesystem_attachments/filesystem_attachments.php
 
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: plugins/filesystem_attachments/filesystem_attachments.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:list_uploaded_files\\(\\)\\.$#"
-			count: 1
-			path: plugins/filesystem_attachments/filesystem_attachments.php
-
 		-
 			message: "#^Call to method getMessage\\(\\) on an unknown class PEAR_Error\\.$#"
 			count: 1
@@ -445,11 +435,6 @@ parameters:
 			count: 1
 			path: program/include/rcmail_action.php
 
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: program/include/rcmail_attachment_handler.php
-
 		-
 			message: "#^Binary operation \"\\*\" between string and 100 results in an error\\.$#"
 			count: 1
@@ -834,38 +819,3 @@ parameters:
 			message: "#^Variable \\$e might not be defined\\.$#"
 			count: 1
 			path: program/lib/Roundcube/spellchecker/googie.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/ActionTestCase.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Contacts/UploadPhoto.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Mail/AttachmentDelete.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:list_uploaded_files\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Mail/AttachmentDelete.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Mail/AttachmentRename.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Mail/AttachmentUpload.php
-
-		-
-			message: "#^Call to an undefined method rcube\\:\\:get_uploaded_file\\(\\)\\.$#"
-			count: 1
-			path: tests/Actions/Settings/Upload.php

plugins/filesystem_attachments/filesystem_attachments.php

@@ -156,6 +156,7 @@ public function cleanup($args)
         $rcube = rcube::get_instance();
         $group = $args['group'] ?? null;
 
+        // @phpstan-ignore-next-line
         foreach ($rcube->list_uploaded_files($group) as $file) {
             if ($file['path'] && $this->verify_path($file['path']) && file_exists($file['path'])) {
                 unlink($file['path']);
@@ -172,6 +173,7 @@ protected static function file_id()
         $id = preg_replace('/[^0-9]/', '', $rcube->user->ID . $sec . $usec);
 
         // make sure the ID is really unique (#1489546)
+        // @phpstan-ignore-next-line
         while ($rcube->get_uploaded_file($id)) {
             // increment last four characters
             $x  = substr($id, -4) + 1;

program/include/rcmail_attachment_handler.php

@@ -50,7 +50,7 @@ public function __construct()
         $file_id    = rcube_utils::get_input_string('_file', rcube_utils::INPUT_GET);
         $compose_id = rcube_utils::get_input_string('_id', rcube_utils::INPUT_GET);
         $uid        = rcube_utils::get_input_string('_uid', rcube_utils::INPUT_GET);
-        $rcube      = rcube::get_instance();
+        $rcube      = rcmail::get_instance();
 
         $this->download = !empty($_GET['_download']);
 

tests/ActionTestCase.php

@@ -234,7 +234,7 @@ protected function fileUpload($group)
 
         $rcmail->insert_uploaded_file($file);
 
-        $upload = rcube::get_instance()->get_uploaded_file($file['id']);
+        $upload = rcmail::get_instance()->get_uploaded_file($file['id']);
 
         $this->assertTrue(is_array($upload));
 

tests/Actions/Contacts/UploadPhoto.php

@@ -39,7 +39,7 @@ public function test_run()
         $this->assertTrue(strpos($result['exec'], 'this.replace_contact_photo("' . $file['id'] . '");') !== false);
         $this->assertTrue(strpos($result['exec'], 'this.photo_upload_end();') !== false);
 
-        $upload = rcube::get_instance()->get_uploaded_file($file['id']);
+        $upload = rcmail::get_instance()->get_uploaded_file($file['id']);
         $this->assertSame($file['name'], $upload['name']);
         $this->assertSame($file['type'], $upload['mimetype']);
         $this->assertSame($file['size'], $upload['size']);

tests/Actions/Mail/AttachmentDelete.php

@@ -10,7 +10,7 @@ class Actions_Mail_AttachmentDelete extends ActionTestCase
      */
     public function test_run()
     {
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
         $action = new rcmail_action_mail_attachment_delete();
         $output = $this->initOutput(rcmail_action::MODE_AJAX, 'mail', 'delete-attachment');
 
@@ -46,7 +46,6 @@ public function test_run()
         $this->assertSame(['Content-Type: application/json; charset=UTF-8'], $output->headers);
         $this->assertSame('delete-attachment', $result['action']);
         $this->assertSame('this.remove_from_attachment_list("rcmfile' . $file['id'] . '");', trim($result['exec']));
-
-        $this->assertNull(rcube::get_instance()->get_uploaded_file($file['id']));
+        $this->assertNull($rcmail->get_uploaded_file($file['id']));
     }
 }

tests/Actions/Mail/AttachmentRename.php

@@ -10,7 +10,7 @@ class Actions_Mail_AttachmentRename extends ActionTestCase
      */
     public function test_run()
     {
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
         $action = new rcmail_action_mail_attachment_rename();
         $output = $this->initOutput(rcmail_action::MODE_AJAX, 'mail', 'rename-attachment');
 
@@ -33,7 +33,7 @@ public function test_run()
         $this->assertSame('rename-attachment', $result['action']);
         $this->assertSame('this.rename_attachment_handler("rcmfile' . $file['id'] . '","mod.gif");', trim($result['exec']));
 
-        $upload = rcube::get_instance()->get_uploaded_file($file['id']);
+        $upload = $rcmail->get_uploaded_file($file['id']);
         $this->assertSame($_POST['_name'], $upload['name']);
         $this->assertSame($_POST['_id'], $upload['group']);
     }

tests/Actions/Mail/AttachmentUpload.php

@@ -48,7 +48,7 @@ public function test_run()
         $this->assertTrue(strpos($result['exec'], 'this.add2attachment_list("rcmfile' . $file['id'] . '"') !== false);
         $this->assertTrue(strpos($result['exec'], 'this.auto_save_start(false);') !== false);
 
-        $upload = rcube::get_instance()->get_uploaded_file($file['id']);
+        $upload = rcmail::get_instance()->get_uploaded_file($file['id']);
         $this->assertSame($file['name'], $upload['name']);
         $this->assertSame($file['type'], $upload['mimetype']);
         $this->assertSame($file['size'], $upload['size']);

tests/Actions/Settings/Upload.php

@@ -44,7 +44,7 @@ public function test_run()
         $this->assertSame('upload', $result['action']);
         $this->assertTrue(strpos($result['exec'], 'this.add2attachment_list("rcmfile' . $file['id'] . '"') !== false);
 
-        $upload = rcube::get_instance()->get_uploaded_file($file['id']);
+        $upload = rcmail::get_instance()->get_uploaded_file($file['id']);
         $this->assertSame($file['name'], $upload['name']);
         $this->assertSame($file['type'], $upload['mimetype']);
         $this->assertSame($file['size'], $upload['size']);