Fix issue #5567 #5808

Job	Run time
Type Checker	32s
Coding Guidelines	42s
Unit Tests (ubuntu-latest, 8.2)	19s
Unit Tests (ubuntu-latest, 8.3)	31s
Unit Tests (ubuntu-latest, 8.4)	29s
Unit Tests (windows-latest, 8.2)	31s
Unit Tests (windows-latest, 8.3)	31s
Unit Tests (windows-latest, 8.4)	29s
End-to-End Tests (ubuntu-latest, 8.2)	36s
End-to-End Tests (ubuntu-latest, 8.3)	1m 1s
End-to-End Tests (ubuntu-latest, 8.4)	1m 41s
End-to-End Tests (windows-latest, 8.2)	1m 24s
End-to-End Tests (windows-latest, 8.3)	1m 23s
End-to-End Tests (windows-latest, 8.4)	1m 21s
Code Coverage	1m 19s
Build PHAR	29s
Test PHAR (8.2, pcov)	14s
Test PHAR (8.2, xdebug)	26s
Test PHAR (8.3, pcov)	42s
Test PHAR (8.3, xdebug)	56s
Test PHAR (8.4, pcov)	39s
Test PHAR (8.4, xdebug)	47s
	17m 2s

Provide feedback