Commit 2ec5eff

authored

Merge pull request #9648 from michalsn/fix/email-destruct

fix: SMTP connection resource validation in `Email` class destructor

2 parents 2f6ca33 + 2e8091e commit 2ec5effCopy full SHA for 2ec5eff

File tree

5 files changed

+21

-8

lines changed

system
- Debug/Toolbar/Collectors
  - Routes.php
- Email
  - Email.php
- Router
  - RouteCollection.php
- Test/Mock
  - MockConnection.php
user_guide_src/source/changelogs
- v4.6.3.rst

5 files changed

+21

-8

lines changed

`‎system/Debug/Toolbar/Collectors/Routes.php`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class Routes extends BaseCollector`
`51`	`51`	`* Returns the data of this collector to be formatted in the toolbar`
`52`	`52`	`*`
`53`	`53`	`* @return array{`
`54`		`- * matchedRoute: array<array{`
	`54`	`+ * matchedRoute: list<array{`
`55`	`55`	`* directory: string,`
`56`	`56`	`* controller: string,`
`57`	`57`	`* method: string,`

`‎system/Email/Email.php`

Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ class Email`
`263`	`263`	`/**`
`264`	`264`	`* SMTP Connection socket placeholder`
`265`	`265`	`*`
`266`		`- * @var resource\|null`
	`266`	`+ * @var false\|resource\|null`
`267`	`267`	`*/`
`268`	`268`	`protected $SMTPConnect;`
`269`	`269`
`@@ -1886,7 +1886,7 @@ protected function SMTPEnd()`
`1886`	`1886`	`*/`
`1887`	`1887`	`protected function SMTPConnect()`
`1888`	`1888`	`{`
`1889`		`- if (is_resource($this->SMTPConnect)) {`
	`1889`	`+ if ($this->isSMTPConnected()) {`
`1890`	`1890`	`return true;`
`1891`	`1891`	`}`
`1892`	`1892`
`@@ -1910,7 +1910,7 @@ protected function SMTPConnect()`
`1910`	`1910`	`$this->SMTPTimeout,`
`1911`	`1911`	`);`
`1912`	`1912`
`1913`		`- if (! is_resource($this->SMTPConnect)) {`
	`1913`	`+ if (! $this->isSMTPConnected()) {`
`1914`	`1914`	`$this->setErrorMessage(lang('Email.SMTPError', [$errno . '' . $errstr]));`
`1915`	`1915`
`1916`	`1916`	`return false;`
`@@ -2227,7 +2227,7 @@ protected function mimeTypes($ext = '')`
`2227`	`2227`
`2228`	`2228`	`public function __destruct()`
`2229`	`2229`	`{`
`2230`		`- if ($this->SMTPConnect !== null) {`
	`2230`	`+ if ($this->isSMTPConnected()) {`
`2231`	`2231`	`try {`
`2232`	`2232`	`$this->sendCommand('quit');`
`2233`	`2233`	`} catch (ErrorException $e) {`
`@@ -2284,4 +2284,16 @@ protected function setArchiveValues(): array`
`2284`	`2284`
`2285`	`2285`	`return $this->archive;`
`2286`	`2286`	`}`
	`2287`	`+`
	`2288`	`+ /**`
	`2289`	`+ * Checks if there is an active SMTP connection.`
	`2290`	`+ *`
	`2291`	`+ * @return bool True if SMTP connection is established and open, false otherwise`
	`2292`	`+ */`
	`2293`	`+ protected function isSMTPConnected(): bool`
	`2294`	`+ {`
	`2295`	`+ return $this->SMTPConnect !== null`
	`2296`	`+ && $this->SMTPConnect !== false`
	`2297`	`+ && get_debug_type($this->SMTPConnect) !== 'resource (closed)';`
	`2298`	`+ }`
`2287`	`2299`	`}`

`‎system/Router/RouteCollection.php`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1724,7 +1724,7 @@ public function resetRoutes()`
`1724`	`1724`	`* @return array<`
`1725`	`1725`	`* string,`
`1726`	`1726`	`* array{`
`1727`		`- * filter?: string\|list<string>, namespace?: string, hostname?: string,`
	`1727`	`+ * filter?: list<string>\|string, namespace?: string, hostname?: string,`
`1728`	`1728`	`* subdomain?: string, offset?: int, priority?: int, as?: string,`
`1729`	`1729`	`* redirect?: int`
`1730`	`1730`	`* }`

`‎system/Test/Mock/MockConnection.php`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ class MockConnection extends BaseConnection`
`27`	`27`	`{`
`28`	`28`	`/**`
`29`	`29`	`* @var array{`
`30`		`- * connect?: object\|resource\|false\|list<object\|resource\|false>,`
`31`		`- * execute?: object\|resource\|false,`
	`30`	`+ * connect?: false\|list<false\|object\|resource>\|object\|resource,`
	`31`	`+ * execute?: false\|object\|resource,`
`32`	`32`	`* }`
`33`	`33`	`*/`
`34`	`34`	`protected $returnValues = [];`

`‎user_guide_src/source/changelogs/v4.6.3.rst`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ Bugs Fixed`
`31`	`31`	`**********`
`32`	`32`
`33`	`33`	`- Email: Fixed a bug with CID check when building email attachments.`
	`34`	`+- Email: Fixed a bug with SMTP connection resource validation in the class destructor.`
`34`	`35`
`35`	`36`	`See the repo's`
`36`	`37`	`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2ec5eff

File tree

5 files changed

5 files changed

`‎system/Debug/Toolbar/Collectors/Routes.php`

`‎system/Email/Email.php`

`‎system/Router/RouteCollection.php`

`‎system/Test/Mock/MockConnection.php`

`‎user_guide_src/source/changelogs/v4.6.3.rst`

0 commit comments