clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11304 from annando/type-hints 

Type hints reverted
This commit is contained in:
Hypolite Petovan 2022-03-08 15:36:43 -05:00 committed by GitHub
parent 8cf843abc3 8039ab731f
commit 82e25a7cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Protocol/Email.php
View File

@ -38,10 +38,10 @@ class Email
* @param string $mailbox The mailbox name * @param string $mailbox The mailbox name
* @param string $username The username * @param string $username The username
* @param string $password The password * @param string $password The password
* @return Connection * @return Connection|resource
* @throws \Exception * @throws \Exception
*/ */
public static function connect($mailbox, $username, $password): Connection public static function connect($mailbox, $username, $password)
{ {
if (!function_exists('imap_open')) { if (!function_exists('imap_open')) {
return false; return false;
@ -63,12 +63,12 @@ class Email
} }
/** /**
* @param Connection $mbox mailbox * @param Connection|resource $mbox mailbox
* @param string $email_addr email * @param string $email_addr email
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function poll(Connection $mbox, $email_addr): array public static function poll($mbox, $email_addr): array
{ {
if (!$mbox || !$email_addr) { if (!$mbox || !$email_addr) {
return []; return [];
@ -113,24 +113,24 @@ class Email
} }
/** /**
* @param Connection $mbox mailbox * @param Connection|resource $mbox mailbox
* @param integer $uid user id * @param integer $uid user id
* @return mixed * @return mixed
*/ */
public static function messageMeta(Connection $mbox, $uid) public static function messageMeta($mbox, $uid)
{ {
$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox, $uid, FT_UID) : [[]]); // POSSIBLE CLEANUP --> array(array()) is probably redundant now $ret = (($mbox && $uid) ? @imap_fetch_overview($mbox, $uid, FT_UID) : [[]]); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
return (count($ret)) ? $ret : []; return (count($ret)) ? $ret : [];
} }
/** /**
* @param Connection $mbox mailbox * @param Connection|resource $mbox mailbox
* @param integer $uid user id * @param integer $uid user id
* @param string $reply reply * @param string $reply reply
* @return array * @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function getMessage(Connection $mbox, $uid, $reply, $item): array public static function getMessage($mbox, $uid, $reply, $item): array
{ {
$ret = $item; $ret = $item;
@ -211,14 +211,14 @@ class Email
/** /**
* fetch the specified message part number with the specified subtype * fetch the specified message part number with the specified subtype
* *
* @param Connection $mbox mailbox * @param Connection|resource $mbox mailbox
* @param integer $uid user id * @param integer $uid user id
* @param object $p parts * @param object $p parts
* @param integer $partno part number * @param integer $partno part number
* @param string $subtype sub type * @param string $subtype sub type
* @return string * @return string
*/ */
private static function messageGetPart(Connection $mbox, $uid, $p, $partno, $subtype) private static function messageGetPart($mbox, $uid, $p, $partno, $subtype)
{ {
// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
global $htmlmsg,$plainmsg,$charset,$attachments; global $htmlmsg,$plainmsg,$charset,$attachments;