minor: misc fixes for sca #1054

Job	Run time
Static Analysis	2m 38s
Lint Documentation	8s
Sync meta files	0s
Code Coverage	3m 41s
P:8.1, S:6.4.*, D:mysql, PU:9 (dama) (schema)	2m 42s
P:8.1, S:6.4.*, D:mongo, PU:9 (schema)	35s
P:8.2, S:6.4.*, D:mysql, PU:9 (dama) (schema)	37s
P:8.2, S:6.4.*, D:mongo, PU:9 (schema)	35s
P:8.2, S:7.0.*, D:mysql, PU:9 (dama) (schema)	46s
P:8.2, S:7.0.*, D:mongo, PU:9 (schema)	40s
P:8.2, S:7.1.*, D:mysql, PU:9 (dama) (schema)	2m 45s
P:8.2, S:7.1.*, D:mongo, PU:9 (schema)	46s
P:8.3, S:6.4.*, D:mysql, PU:9 (dama) (schema)	30s
P:8.3, S:6.4.*, D:mongo, PU:9 (schema)	46s
P:8.3, S:7.0.*, D:mysql, PU:9 (dama) (schema)	41s
P:8.3, S:7.0.*, D:mongo, PU:9 (schema)	32s
P:8.3, S:7.1.*, D:mysql, PU:9 (dama) (schema)	44s
P:8.3, S:7.1.*, D:mongo, PU:9 (schema)	43s
P:8.3, S:*, D:none, PU:9 (schema)	2m 41s
P:8.3, S:*, D:mysql\|mongo, PU:9 (dama) (schema)	50s
P:8.3, S:*, D:pgsql\|mongo, PU:9 (dama) (schema)	1m 15s
P:8.3, S:*, D:pgsql, PU:9 (schema)	1m 20s
P:8.3, S:*, D:sqlite, PU:9 (schema)	1m 12s
P:8.3, S:*, D:sqlite, PU:9 (lowest) (schema)	55s
P:8.3, S:*, D:mysql, PU:9 (lowest) (dama) (schema)	2m 41s
P:8.3, S:*, D:mysql, PU:9 (dama) (migrate)	29s
P:8.3, S:*, D:mysql\|mongo, PU:10 (dama) (schema)	3m 50s
P:8.3, S:*, D:mysql\|mongo, PU:11 (dama) (schema)	49s
composer-validate / Validate composer.json	8s
Run php-cs-fixer	0s
	35m 59s

Provide feedback