#655: Add missing PHP 8.1 support

Sebastian Krätzig · Sebastian Krätzig · commit 4d4220729100 · 2022-01-10T21:58:57.000+01:00
IMAP stream can be an IMAP resource or IMAP\Connection object. See https://www.php.net/manual/en/migration81.incompatible.php for further information.
diff --git a/src/PhpImap/Imap.php b/src/PhpImap/Imap.php
@@ -721,7 +721,7 @@ public static function open(
      */
     public static function ping($imap_stream): bool
     {
-        return \is_resource($imap_stream) && \imap_ping($imap_stream);
+        return (\is_resource($imap_stream) || $imap_stream instanceof \IMAP\Connection) && \imap_ping($imap_stream);
     }
 
     /**
diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
@@ -476,7 +476,7 @@ public function getImapStream(bool $forceConnection = true)
 
     public function hasImapStream(): bool
     {
-        return \is_resource($this->imapStream) && \imap_ping($this->imapStream);
+        return (\is_resource($this->imapStream) || $this->imapStream instanceof \IMAP\Connection) && \imap_ping($this->imapStream);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ public static function open(`
`721`	`721`	`*/`
`722`	`722`	`public static function ping($imap_stream): bool`
`723`	`723`	`{`
`724`		`- return \is_resource($imap_stream) && \imap_ping($imap_stream);`
	`724`	`+ return (\is_resource($imap_stream) \|\| $imap_stream instanceof \IMAP\Connection) && \imap_ping($imap_stream);`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ public function getImapStream(bool $forceConnection = true)`
`476`	`476`
`477`	`477`	`public function hasImapStream(): bool`
`478`	`478`	`{`
`479`		`- return \is_resource($this->imapStream) && \imap_ping($this->imapStream);`
	`479`	`+ return (\is_resource($this->imapStream) \|\| $this->imapStream instanceof \IMAP\Connection) && \imap_ping($this->imapStream);`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`/**`