Skip to content

Commit 35737d8

Browse files
codedgeSebbo94BY
codedge
and
Sebbo94BY
authored
Fix deprecated methods (#595)
Co-authored-by: TS3tools <[email protected]>
1 parent 00b2592 commit 35737d8

8 files changed

+67
-62
lines changed

‎.php_cs.dist

+39-34
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
11
<?php
22

3-
return PhpCsFixer\Config::create()
4-
->setRules([
5-
'@Symfony' => true,
6-
'@Symfony:risky' => true,
7-
'array_syntax' => [
8-
'syntax' => 'short'
9-
],
10-
'ordered_imports' => true,
11-
'phpdoc_to_comment' => false,
12-
'no_superfluous_phpdoc_tags' => true,
13-
'declare_strict_types' => true,
14-
'void_return' => true,
15-
'ordered_class_elements' => true,
16-
'global_namespace_import' => [
17-
'import_classes' => true,
18-
'import_constants' => true,
19-
'import_functions' => false,
20-
],
21-
'native_constant_invocation' => true,
22-
'native_function_invocation' => true,
23-
'php_unit_test_case_static_method_calls' => [
24-
'call_type' => 'this',
25-
],
26-
'php_unit_method_casing' => true,
27-
'php_unit_dedicate_assert' => [
28-
'target' => 'newest',
29-
],
30-
])
3+
declare(strict_types=1);
4+
5+
$finder = PhpCsFixer\Finder::create()
6+
->in(__DIR__.'/src')
7+
->in(__DIR__.'/tests')
8+
->in(__DIR__.'/examples')
9+
->append([__FILE__]);
10+
11+
$config = new PhpCsFixer\Config();
12+
$config->setRules([
13+
'@Symfony' => true,
14+
'@Symfony:risky' => true,
15+
'array_syntax' => [
16+
'syntax' => 'short',
17+
],
18+
'ordered_imports' => true,
19+
'phpdoc_to_comment' => false,
20+
'no_superfluous_phpdoc_tags' => true,
21+
'declare_strict_types' => true,
22+
'void_return' => true,
23+
'ordered_class_elements' => true,
24+
'global_namespace_import' => [
25+
'import_classes' => true,
26+
'import_constants' => true,
27+
'import_functions' => false,
28+
],
29+
'native_constant_invocation' => true,
30+
'native_function_invocation' => true,
31+
'php_unit_test_case_static_method_calls' => [
32+
'call_type' => 'this',
33+
],
34+
'php_unit_method_casing' => true,
35+
'php_unit_dedicate_assert' => [
36+
'target' => 'newest',
37+
],
38+
])
3139
->setRiskyAllowed(true)
32-
->setFinder(
33-
PhpCsFixer\Finder::create()
34-
->in(__DIR__.'/src')
35-
->in(__DIR__.'/tests')
36-
->in(__DIR__.'/examples')
37-
)
40+
->setFinder($finder)
3841
;
42+
43+
return $config;

‎examples/get_and_parse_all_emails_with_matching_subject.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
try {
2424
$mail_ids = $mailbox->searchMailbox('SUBJECT "part of the subject"');
2525
} catch (ConnectionException $ex) {
26-
die('IMAP connection failed: '.$ex->getMessage());
26+
exit('IMAP connection failed: '.$ex->getMessage());
2727
} catch (Exception $ex) {
28-
die('An error occured: '.$ex->getMessage());
28+
exit('An error occured: '.$ex->getMessage());
2929
}
3030

3131
foreach ($mail_ids as $mail_id) {

‎examples/get_and_parse_all_emails_without_saving_attachments.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
try {
3434
$mail_ids = $mailbox->searchMailbox('UNSEEN');
3535
} catch (ConnectionException $ex) {
36-
die('IMAP connection failed: '.$ex->getMessage());
36+
exit('IMAP connection failed: '.$ex->getMessage());
3737
} catch (Exception $ex) {
38-
die('An error occured: '.$ex->getMessage());
38+
exit('An error occured: '.$ex->getMessage());
3939
}
4040

4141
foreach ($mail_ids as $mail_id) {

‎examples/get_and_parse_unseen_emails.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
try {
2424
$mail_ids = $mailbox->searchMailbox('UNSEEN');
2525
} catch (ConnectionException $ex) {
26-
die('IMAP connection failed: '.$ex->getMessage());
26+
exit('IMAP connection failed: '.$ex->getMessage());
2727
} catch (Exception $ex) {
28-
die('An error occured: '.$ex->getMessage());
28+
exit('An error occured: '.$ex->getMessage());
2929
}
3030

3131
foreach ($mail_ids as $mail_id) {

‎examples/get_and_parse_unseen_emails_save_attachments_one_by_one.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
try {
2222
$mail_ids = $mailbox->searchMailbox('UNSEEN');
2323
} catch (ConnectionException $ex) {
24-
die('IMAP connection failed: '.$ex->getMessage());
24+
exit('IMAP connection failed: '.$ex->getMessage());
2525
} catch (Exception $ex) {
26-
die('An error occured: '.$ex->getMessage());
26+
exit('An error occured: '.$ex->getMessage());
2727
}
2828

2929
foreach ($mail_ids as $mail_id) {

‎src/PhpImap/DataPartInfo.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ protected function decodeAfterFetch(): string
107107

108108
protected function convertEncodingAfterFetch(): string
109109
{
110-
if (isset($this->charset) and !empty(\trim($this->charset))) {
111-
$this->data = $this->mail->convertToUtf8(
112-
(string) $this->data, // Data to convert
113-
$this->charset
110+
if (isset($this->charset) && !empty(\trim($this->charset))) {
111+
$this->data = $this->mail->decodeMimeStr(
112+
(string) $this->data // Data to convert
113+
\trim($this->charset)
114114
);
115115
}
116116

‎src/PhpImap/IncomingMailAttachment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function addDataPartInfo(DataPartInfo $dataInfo): void
131131
*/
132132
public function getFileInfo(int $fileinfo_const = FILEINFO_NONE): string
133133
{
134-
if ((FILEINFO_MIME == $fileinfo_const) and (false != $this->mimeType)) {
134+
if ((FILEINFO_MIME == $fileinfo_const) && (false != $this->mimeType)) {
135135
return $this->mimeType;
136136
}
137137

‎src/PhpImap/Mailbox.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ public function setConnectionArgs(int $options = 0, int $retriesNum = 0, array $
363363
$this->imapRetriesNum = $retriesNum;
364364
}
365365

366-
if (\is_array($params) and \count($params) > 0) {
366+
if (\is_array($params) && \count($params) > 0) {
367367
$supported_params = ['DISABLE_AUTHENTICATOR'];
368368

369369
foreach (\array_keys($params) as $key) {
@@ -875,16 +875,16 @@ public function getMailsInfo(array $mailsIds): array
875875
throw new UnexpectedValueException('to property at index '.(string) $index.' of argument 1 passed to '.__METHOD__.'() was not a string!');
876876
}
877877

878-
if (isset($mail->subject) and !empty(\trim($mail->subject))) {
878+
if (isset($mail->subject) && !empty(\trim($mail->subject))) {
879879
$mail->subject = $this->decodeMimeStr($mail->subject);
880880
}
881-
if (isset($mail->from) and !empty(\trim($mail->from))) {
881+
if (isset($mail->from) && !empty(\trim($mail->from))) {
882882
$mail->from = $this->decodeMimeStr($mail->from);
883883
}
884-
if (isset($mail->sender) and !empty(\trim($mail->sender))) {
884+
if (isset($mail->sender) && !empty(\trim($mail->sender))) {
885885
$mail->sender = $this->decodeMimeStr($mail->sender);
886886
}
887-
if (isset($mail->to) and !empty(\trim($mail->to))) {
887+
if (isset($mail->to) && !empty(\trim($mail->to))) {
888888
$mail->to = $this->decodeMimeStr($mail->to);
889889
}
890890
}
@@ -951,7 +951,7 @@ public function getMailboxInfo(): object
951951
public function sortMails(
952952
int $criteria = SORTARRIVAL,
953953
bool $reverse = true,
954-
? string $searchCriteria = 'ALL',
954+
?string $searchCriteria = 'ALL',
955955
string $charset = null
956956
): array {
957957
return Imap::sort(
@@ -1100,22 +1100,22 @@ public function getMailHeader(int $mailId): IncomingMailHeader
11001100
$header->precedence = (\preg_match("/Precedence\:(.*)/i", $headersRaw, $matches)) ? \trim($matches[1]) : '';
11011101
$header->failedRecipients = (\preg_match("/Failed-Recipients\:(.*)/i", $headersRaw, $matches)) ? \trim($matches[1]) : '';
11021102

1103-
if (isset($head->date) and !empty(\trim($head->date))) {
1103+
if (isset($head->date) && !empty(\trim($head->date))) {
11041104
$header->date = self::parseDateTime($head->date);
1105-
} elseif (isset($head->Date) and !empty(\trim($head->Date))) {
1105+
} elseif (isset($head->Date) && !empty(\trim($head->Date))) {
11061106
$header->date = self::parseDateTime($head->Date);
11071107
} else {
11081108
$now = new DateTime();
11091109
$header->date = self::parseDateTime($now->format('Y-m-d H:i:s'));
11101110
}
11111111

1112-
$header->subject = (isset($head->subject) and !empty(\trim($head->subject))) ? $this->decodeMimeStr($head->subject) : null;
1113-
if (isset($head->from) and !empty($head->from)) {
1112+
$header->subject = (isset($head->subject) && !empty(\trim($head->subject))) ? $this->decodeMimeStr($head->subject) : null;
1113+
if (isset($head->from) && !empty($head->from)) {
11141114
list($header->fromHost, $header->fromName, $header->fromAddress) = $this->possiblyGetHostNameAndAddress($head->from);
11151115
} elseif (\preg_match('/smtp.mailfrom=[-0-9a-zA-Z.+_]+@[-0-9a-zA-Z.+_]+.[a-zA-Z]{2,4}/', $headersRaw, $matches)) {
11161116
$header->fromAddress = \substr($matches[0], 14);
11171117
}
1118-
if (isset($head->sender) and !empty($head->sender)) {
1118+
if (isset($head->sender) && !empty($head->sender)) {
11191119
list($header->senderHost, $header->senderName, $header->senderAddress) = $this->possiblyGetHostNameAndAddress($head->sender);
11201120
}
11211121
if (isset($head->to)) {
@@ -1255,10 +1255,10 @@ public function downloadAttachment(DataPartInfo $dataInfo, array $params, object
12551255
$fileName = \strtolower($partStructure->subtype).'.eml';
12561256
} elseif ('ALTERNATIVE' == $partStructure->subtype) {
12571257
$fileName = \strtolower($partStructure->subtype).'.eml';
1258-
} elseif ((!isset($params['filename']) or empty(\trim($params['filename']))) && (!isset($params['name']) or empty(\trim($params['name'])))) {
1258+
} elseif ((!isset($params['filename']) || empty(\trim($params['filename']))) && (!isset($params['name']) || empty(\trim($params['name'])))) {
12591259
$fileName = \strtolower($partStructure->subtype);
12601260
} else {
1261-
$fileName = (isset($params['filename']) and !empty(\trim($params['filename']))) ? $params['filename'] : $params['name'];
1261+
$fileName = (isset($params['filename']) && !empty(\trim($params['filename']))) ? $params['filename'] : $params['name'];
12621262
$fileName = $this->decodeMimeStr($fileName, $this->serverEncoding);
12631263
$fileName = $this->decodeRFC2231($fileName);
12641264
}
@@ -1300,7 +1300,7 @@ public function downloadAttachment(DataPartInfo $dataInfo, array $params, object
13001300
if (isset($charset) && !\is_string($charset)) {
13011301
throw new InvalidArgumentException('Argument 2 passed to '.__METHOD__.'() must specify charset as a string when specified!');
13021302
}
1303-
$attachment->charset = (isset($charset) and !empty(\trim($charset))) ? $charset : null;
1303+
$attachment->charset = (isset($charset) && !empty(\trim($charset))) ? $charset : null;
13041304
$attachment->emlOrigin = $emlOrigin;
13051305

13061306
$attachment->addDataPartInfo($dataInfo);
@@ -1807,7 +1807,7 @@ protected function possiblyGetEmailAndNameFromRecipient(object $recipient): ?arr
18071807

18081808
if ('' !== \trim($recipientMailbox) && '' !== \trim($recipientHost)) {
18091809
$recipientEmail = \strtolower($recipientMailbox.'@'.$recipientHost);
1810-
$recipientName = (\is_string($recipientPersonal) and '' !== \trim($recipientPersonal)) ? $this->decodeMimeStr($recipientPersonal) : null;
1810+
$recipientName = (\is_string($recipientPersonal) && '' !== \trim($recipientPersonal)) ? $this->decodeMimeStr($recipientPersonal) : null;
18111811

18121812
return [
18131813
$recipientEmail,

0 commit comments

Comments
 (0)