From 41c1a68a2fe62fa89675c39b54a42243e156d86e Mon Sep 17 00:00:00 2001 From: Marv Date: Mon, 25 May 2020 08:49:48 +0100 Subject: [PATCH 1/2] modify php-cs-fixer config to import consts as per https://github.com/barbushin/php-imap/pull/504#discussion_r429778492 --- .php_cs.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/.php_cs.dist b/.php_cs.dist index 1459ad4d..c2827a2b 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -18,6 +18,7 @@ return PhpCsFixer\Config::create() 'import_constants' => true, 'import_functions' => false, ], + 'native_constant_invocation' => true, 'native_function_invocation' => true, 'php_unit_test_case_static_method_calls' => [ 'call_type' => 'this', From 6f605b4534089c42915803bbfdde8165c2ab4b25 Mon Sep 17 00:00:00 2001 From: Marv Date: Mon, 25 May 2020 08:51:05 +0100 Subject: [PATCH 2/2] import used consts --- src/PhpImap/DataPartInfo.php | 5 ++++ src/PhpImap/Imap.php | 1 + src/PhpImap/IncomingMail.php | 1 + src/PhpImap/Mailbox.php | 33 ++++++++++++++++++++++++++ tests/unit/IncomingMailTest.php | 2 ++ tests/unit/LiveMailboxIssue490Test.php | 1 + tests/unit/LiveMailboxTest.php | 4 ++++ tests/unit/MailboxTest.php | 15 ++++++++++++ 8 files changed, 62 insertions(+) diff --git a/src/PhpImap/DataPartInfo.php b/src/PhpImap/DataPartInfo.php index 3598844f..b02c1c94 100644 --- a/src/PhpImap/DataPartInfo.php +++ b/src/PhpImap/DataPartInfo.php @@ -4,6 +4,11 @@ namespace PhpImap; +use const ENC8BIT; +use const ENCBASE64; +use const ENCBINARY; +use const ENCQUOTEDPRINTABLE; + /** * @see https://github.com/barbushin/php-imap * diff --git a/src/PhpImap/Imap.php b/src/PhpImap/Imap.php index c767616d..76efd8c9 100644 --- a/src/PhpImap/Imap.php +++ b/src/PhpImap/Imap.php @@ -14,6 +14,7 @@ use const IMAP_WRITETIMEOUT; use InvalidArgumentException; use const NIL; +use const SE_FREE; use const SORTARRIVAL; use const SORTCC; use const SORTDATE; diff --git a/src/PhpImap/IncomingMail.php b/src/PhpImap/IncomingMail.php index dbfd9822..a0a573f5 100644 --- a/src/PhpImap/IncomingMail.php +++ b/src/PhpImap/IncomingMail.php @@ -4,6 +4,7 @@ namespace PhpImap; +use const FILEINFO_MIME; use InvalidArgumentException; /** diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php index 6717790c..4e242f91 100644 --- a/src/PhpImap/Mailbox.php +++ b/src/PhpImap/Mailbox.php @@ -4,14 +4,47 @@ namespace PhpImap; +use const CL_EXPUNGE; use function count; +use const CP_UID; +use const DATE_RFC3339; use DateTime; use const DIRECTORY_SEPARATOR; use Exception; +use const FILEINFO_EXTENSION; +use const FILEINFO_MIME; +use const FILEINFO_MIME_ENCODING; +use const FILEINFO_NONE; +use const FILEINFO_RAW; +use const FT_PEEK; +use const FT_PREFETCHTEXT; +use const FT_UID; +use const IMAP_CLOSETIMEOUT; +use const IMAP_OPENTIMEOUT; +use const IMAP_READTIMEOUT; +use const IMAP_WRITETIMEOUT; use InvalidArgumentException; +use const OP_ANONYMOUS; +use const OP_DEBUG; +use const OP_HALFOPEN; +use const OP_PROTOTYPE; +use const OP_READONLY; +use const OP_SECURE; +use const OP_SHORTCACHE; +use const OP_SILENT; +use const PATHINFO_EXTENSION; use PhpImap\Exceptions\ConnectionException; use PhpImap\Exceptions\InvalidParameterException; +use const SA_ALL; +use const SE_FREE; +use const SE_UID; +use const SORT_NUMERIC; +use const SORTARRIVAL; +use const ST_UID; use stdClass; +use const TYPEMESSAGE; +use const TYPEMULTIPART; +use const TYPETEXT; use UnexpectedValueException; /** diff --git a/tests/unit/IncomingMailTest.php b/tests/unit/IncomingMailTest.php index 03f3e136..a43ca775 100644 --- a/tests/unit/IncomingMailTest.php +++ b/tests/unit/IncomingMailTest.php @@ -6,6 +6,8 @@ namespace PhpImap; +use const DATE_RFC3339; +use const ENCOTHER; use PHPUnit\Framework\TestCase; class IncomingMailTest extends TestCase diff --git a/tests/unit/LiveMailboxIssue490Test.php b/tests/unit/LiveMailboxIssue490Test.php index fbc1e0e1..059ba8a6 100644 --- a/tests/unit/LiveMailboxIssue490Test.php +++ b/tests/unit/LiveMailboxIssue490Test.php @@ -12,6 +12,7 @@ use Exception; use ParagonIE\HiddenString\HiddenString; +use const TYPEMULTIPART; use const TYPETEXT; /** diff --git a/tests/unit/LiveMailboxTest.php b/tests/unit/LiveMailboxTest.php index 20f9d72e..b548d91d 100644 --- a/tests/unit/LiveMailboxTest.php +++ b/tests/unit/LiveMailboxTest.php @@ -11,9 +11,13 @@ namespace PhpImap; use function date; +use const ENCBASE64; use Exception; use Generator; use ParagonIE\HiddenString\HiddenString; +use const SORTARRIVAL; +use const TYPEAPPLICATION; +use const TYPEMULTIPART; use const TYPETEXT; /** diff --git a/tests/unit/MailboxTest.php b/tests/unit/MailboxTest.php index b28f27c4..d754021f 100644 --- a/tests/unit/MailboxTest.php +++ b/tests/unit/MailboxTest.php @@ -8,9 +8,24 @@ namespace PhpImap; +use const CL_EXPUNGE; use DateTime; +use const IMAP_CLOSETIMEOUT; +use const IMAP_OPENTIMEOUT; +use const IMAP_READTIMEOUT; +use const IMAP_WRITETIMEOUT; +use const OP_ANONYMOUS; +use const OP_DEBUG; +use const OP_HALFOPEN; +use const OP_PROTOTYPE; +use const OP_READONLY; +use const OP_SECURE; +use const OP_SHORTCACHE; +use const OP_SILENT; use PhpImap\Exceptions\InvalidParameterException; use PHPUnit\Framework\TestCase; +use const SE_FREE; +use const SE_UID; final class MailboxTest extends TestCase {