refactor: partial fix errors on Email #13316

Job	Run time
Setup PHP Version for Code Coverage	3s
Others (8.2) / Sanity Tests	3m 43s
Others (8.3) / Sanity Tests	2m 45s
Others (8.4) / Sanity Tests	2m 41s
Others (8.1) / Sanity Tests	2m 21s
SeparateProcess (8.1) / tests	3m 29s
CacheLive (8.2) / Cache Live Tests	2m 5s
SeparateProcess (8.4) / tests	3m 8s
CacheLive (8.1) / Cache Live Tests	1m 56s
SeparateProcess (8.2) / tests	3m 13s
SeparateProcess (8.3) / tests	3m 24s
CacheLive (8.3) / Cache Live Tests	2m 0s
DatabaseLive (8.1, MySQLi, 8.0) / tests	4m 30s
DatabaseLive (8.1, SQLite3, 8.0) / tests	2m 46s
CacheLive (8.4) / Cache Live Tests	2m 6s
DatabaseLive (8.1, OCI8, 8.0) / tests	6m 23s
DatabaseLive (8.2, SQLite3, 8.0) / tests	3m 4s
DatabaseLive (8.1, SQLSRV, 8.0) / tests	5m 30s
DatabaseLive (8.3, OCI8, 8.0) / tests	6m 50s
DatabaseLive (8.2, OCI8, 8.0) / tests	6m 59s
DatabaseLive (8.2, MySQLi, 8.0) / tests	5m 52s
DatabaseLive (8.1, Postgre, 8.0) / tests	2m 49s
DatabaseLive (8.1, MySQLi, 5.7) / tests	2m 46s
DatabaseLive (8.2, Postgre, 8.0) / tests	3m 20s
DatabaseLive (8.4, MySQLi, 8.0) / tests	4m 12s
DatabaseLive (8.4, OCI8, 8.0) / tests	6m 33s
DatabaseLive (8.3, Postgre, 8.0) / tests	2m 35s
DatabaseLive (8.2, SQLSRV, 8.0) / tests	6m 6s
DatabaseLive (8.4, Postgre, 8.0) / tests	2m 38s
DatabaseLive (8.3, SQLite3, 8.0) / tests	3m 3s
DatabaseLive (8.4, SQLSRV, 8.0) / tests	5m 10s
DatabaseLive (8.3, MySQLi, 8.0) / tests	5m 23s
DatabaseLive (8.3, SQLSRV, 8.0) / tests	4m 55s
DatabaseLive (8.4, SQLite3, 8.0) / tests	2m 44s
Upload coverage results to Coveralls / coveralls	34s
	2h 7m 36s

Provide feedback