Update phpunit/phpunit requirement from ^10.5.10 to ^11.0.0 (#574)

* Update phpunit/phpunit requirement from ^10.5.10 to ^10.5.10 || ^11.0.0 Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version. - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/11.0.3/ChangeLog-11.0.md) - [Commits](sebastianbergmann/phpunit@10.5.10...11.0.3) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * CS Fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Filippo Tessarotto <[email protected]>
ddeboer · Feb 26, 2024 · 1e30909 · 1e30909
1 parent 9bae2b2
commit 1e30909
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 31 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -21,7 +21,6 @@
         'concat_space'                              => ['spacing' => 'one'],
         'echo_tag_syntax'                           => ['format' => 'long'],
         'error_suppression'                         => false,
-        'escape_implicit_backslashes'               => true,
         'explicit_indirect_variable'                => true,
         'explicit_string_variable'                  => true,
         'fully_qualified_strict_types'              => true,
@@ -63,6 +62,7 @@
         'space_after_semicolon'                     => true,
         'static_lambda'                             => true,
         'strict_comparison'                         => true,
+        'string_implicit_backslashes'               => true,
         'string_line_ending'                        => true,
     ])
     ->setFinder(

diff --git a/composer.json b/composer.json
@@ -30,12 +30,12 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.49.0",
+        "friendsofphp/php-cs-fixer": "^3.50.0",
         "laminas/laminas-mail": "^2.25.1",
-        "phpstan/phpstan": "^1.10.58",
-        "phpstan/phpstan-phpunit": "^1.3.15",
+        "phpstan/phpstan": "^1.10.59",
+        "phpstan/phpstan-phpunit": "^1.3.16",
         "phpstan/phpstan-strict-rules": "^1.5.2",
-        "phpunit/phpunit": "^10.5.10"
+        "phpunit/phpunit": "^11.0.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Message.php b/src/Message.php
@@ -210,7 +210,7 @@ public function maskAsSeen(): bool
 
     public function markAsSeen(): bool
     {
-        return $this->setFlag('\\Seen');
+        return $this->setFlag('\Seen');
     }
 
     public function copy(MailboxInterface $mailbox): void

diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -15,7 +15,7 @@ abstract class AbstractTestCase extends TestCase
 {
     public const IMAP_FLAGS = '/imap/ssl/novalidate-cert';
 
-    public const SPECIAL_CHARS = 'A_\\|!"£$%&()=?àèìòùÀÈÌÒÙ<>-@#[]_ß_б_π_€_✔_你_يد_Z_';
+    public const SPECIAL_CHARS = 'A_\|!"£$%&()=?àèìòùÀÈÌÒÙ<>-@#[]_ß_б_π_€_✔_你_يد_Z_';
 
     protected ?string $mailboxName;
     protected ?string $altName;

diff --git a/tests/EmbeddedMessageTest.php b/tests/EmbeddedMessageTest.php
@@ -88,7 +88,6 @@ public function testRecursiveEmbeddedAttachment(): void
         self::assertCount(3, $attachments);
 
         $attachment = \current($attachments);
-        self::assertNotFalse($attachment);
         self::assertTrue($attachment->isEmbeddedMessage());
 
         $embeddedMessage = $attachment->getEmbeddedMessage();
@@ -99,7 +98,6 @@ public function testRecursiveEmbeddedAttachment(): void
         self::assertCount(2, $embeddedAttachments);
 
         $embeddedAttachment = \current($embeddedAttachments);
-        self::assertNotFalse($embeddedAttachment);
         self::assertTrue($embeddedAttachment->isEmbeddedMessage());
 
         $secondEmbeddedMessage = $embeddedAttachment->getEmbeddedMessage();
@@ -110,7 +108,6 @@ public function testRecursiveEmbeddedAttachment(): void
         self::assertCount(1, $secondEmbeddedAttachments);
 
         $secondEmbeddedAttachment = \current($secondEmbeddedAttachments);
-        self::assertNotFalse($secondEmbeddedAttachment);
         self::assertTrue($secondEmbeddedAttachment->isEmbeddedMessage());
 
         $thirdEmbeddedMessage = $secondEmbeddedAttachment->getEmbeddedMessage();
@@ -131,7 +128,6 @@ public function testEmbeddedMessageWithoutContentDisposition(): void
         self::assertCount(6, $attachments);
 
         $attachment = \current($attachments);
-        self::assertNotFalse($attachment);
         self::assertNotEmpty($attachment->getContent());
         self::assertSame('file.jpg', $attachment->getFilename());
 

diff --git a/tests/MailboxSearchTest.php b/tests/MailboxSearchTest.php
@@ -111,7 +111,7 @@ public function testRawExpressionCondition(): void
 
     public function testSearchEscapes(): void
     {
-        $specialChars = 'A_ spaces _09!#$%&\'*+-/=?^_`{|}~.(),:;<>@[\\]_èπ€_Z';
+        $specialChars = 'A_ spaces _09!#$%&\'*+-/=?^_`{|}~.(),:;<>@[\]_èπ€_Z';
         $specialEmail = $specialChars . '@example.com';
 
         $date = new \DateTimeImmutable();

diff --git a/tests/MailboxTest.php b/tests/MailboxTest.php
@@ -171,22 +171,22 @@ public function testBulkSetFlags(): void
             self::assertFalse($message->isFlagged());
         }
 
-        $this->mailbox->setFlag('\\Flagged', $messages);
+        $this->mailbox->setFlag('\Flagged', $messages);
 
         foreach ($messages as $uid) {
             $message = $this->mailbox->getMessage($uid);
             self::assertTrue($message->isFlagged());
         }
 
-        $this->mailbox->clearFlag('\\Flagged', $messages);
+        $this->mailbox->clearFlag('\Flagged', $messages);
 
         foreach ($messages as $uid) {
             $message = $this->mailbox->getMessage($uid);
             self::assertFalse($message->isFlagged());
         }
 
         // Set flag for messages from another mailbox
-        $anotherMailbox->setFlag('\\Flagged', [1, 2, 3]);
+        $anotherMailbox->setFlag('\Flagged', [1, 2, 3]);
 
         self::assertTrue($anotherMailbox->getMessage(2)->isFlagged());
     }
@@ -201,20 +201,20 @@ public function testBulkSetFlagsNumbersParameter(): void
             $this->createTestMessage($mailbox, 'Message ' . $uid);
         }
 
-        $mailbox->setFlag('\\Seen', [
+        $mailbox->setFlag('\Seen', [
             '1,2',
             '3',
             '4:6',
         ]);
-        $mailbox->setFlag('\\Seen', '7,8:10');
+        $mailbox->setFlag('\Seen', '7,8:10');
 
         foreach ($uids as $uid) {
             $message = $mailbox->getMessage($uid);
             self::assertTrue($message->isSeen());
         }
 
-        $mailbox->clearFlag('\\Seen', '1,2,3,4:6');
-        $mailbox->clearFlag('\\Seen', [
+        $mailbox->clearFlag('\Seen', '1,2,3,4:6');
+        $mailbox->clearFlag('\Seen', [
             '7:9',
             '10',
         ]);
@@ -264,7 +264,7 @@ public function testAppendOptionalArguments(): void
     {
         $mailbox = $this->createMailbox();
 
-        $mailbox->addMessage($this->getFixture('thread/unrelated'), '\\Seen', new \DateTimeImmutable('2012-01-03T10:30:03+01:00'));
+        $mailbox->addMessage($this->getFixture('thread/unrelated'), '\Seen', new \DateTimeImmutable('2012-01-03T10:30:03+01:00'));
 
         $message = $mailbox->getMessage(1);
 

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -49,7 +49,7 @@ final class MessageTest extends AbstractTestCase
     ];
 
     private const CHARSETS = [
-        'ASCII'        => '! "#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~',
+        'ASCII'        => '! "#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~',
         'GB18030'      => "　、。〃々〆〇〈〉《》「」『』【】〒〓〔〕〖〗〝〞〡〢〣〤〥〦〧〨〩〾一\u{200b}丁\u{200b}丂踰\u{200b}踱\u{200b}踲\u{200b}",
         'ISO-8859-6'   => 'ءآأؤإئابةتثجحخدذرزسشصضطظعغـفقكلمنهوىي',
         'ISO-8859-7'   => 'ΆΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟ2ΠΡΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ',
@@ -337,7 +337,7 @@ public function testEmailAddress(): void
         self::assertSame('This one: is "right"', $cc[0]->getName());
         self::assertSame('dong.com', $cc[0]->getHostname());
         self::assertSame('[email protected]', $cc[0]->getAddress());
-        self::assertSame('"This one: is \\"right\\"" <[email protected]>', $cc[0]->getFullAddress());
+        self::assertSame('"This one: is \"right\"" <[email protected]>', $cc[0]->getFullAddress());
 
         self::assertInstanceOf(EmailAddress::class, $cc[1]);
         self::assertSame('No-address', $cc[1]->getMailbox());
@@ -531,7 +531,6 @@ public function testPlainTextAttachment(): void
         self::assertCount(1, $attachments);
 
         $attachment = \current($attachments);
-        self::assertNotFalse($attachment);
         self::assertSame('Hi!', $attachment->getDecodedContent());
     }
 
@@ -572,7 +571,6 @@ public function testAdditionalAddresses(): void
             self::assertCount(1, $emails, $type);
 
             $email = \current($emails);
-            self::assertNotFalse($email);
             self::assertSame(\sprintf('%[email protected]', \strtolower($type)), $email->getAddress(), $type);
         }
     }
@@ -679,15 +677,15 @@ public function testSetFlags(): void
 
         self::assertFalse($message->isFlagged());
 
-        $message->setFlag('\\Flagged');
+        $message->setFlag('\Flagged');
 
         self::assertTrue($message->isFlagged());
 
-        $message->clearFlag('\\Flagged');
+        $message->clearFlag('\Flagged');
 
         self::assertFalse($message->isFlagged());
 
-        $message->setFlag('\\Seen');
+        $message->setFlag('\Seen');
         self::assertSame('R', $message->isRecent());
         self::assertTrue($message->isSeen());
     }
@@ -1008,7 +1006,6 @@ public function testMixedInlineDisposition(): void
         self::assertCount(1, $attachments);
 
         $attachment = \current($attachments);
-        self::assertNotFalse($attachment);
         self::assertSame('Price4VladDaKar.xlsx', $attachment->getFilename());
     }
 

diff --git a/tests/MockabilityTest.php b/tests/MockabilityTest.php
@@ -81,13 +81,11 @@ public function testFullMockedBehaviour(): void
 
         self::assertCount(1, $loopedMessages);
         $foundMessage = \current($loopedMessages);
-        self::assertInstanceOf(MessageInterface::class, $foundMessage);
-        $attachments = $foundMessage->getAttachments();
+        $attachments  = $foundMessage->getAttachments();
 
         self::assertCount(1, $attachments);
 
         $attachment = \current($attachments);
-        self::assertNotFalse($attachment);
         self::assertSame($attachmentFilename, $attachment->getFilename());
     }
 }