OXDEV-9078 Fix code issues after review and compatibility with captcha #360

Job	Run time
push_module_ee	19m 46s
php83_mysql80 / init	11s
php83_mysql80 / install (8.3, mysql-8.0.36)	1m 48s
php83_mysql80 / runscript (8.3, mysql-8.0.36, report:tests-integration)	1m 40s
php83_mysql80 / runslim (8.3, mysql-8.0.36, report:phpstan-report)	1m 28s
php83_mysql80 / runslim (8.3, mysql-8.0.36, no_report:phpcs)	1m 15s
php83_mysql80 / yamllint	9s
php83_mysql80 / actionlint	11s
php83_mysql80 / runslim (8.3, mysql-8.0.36, no_report:phpmd)	1m 1s
php83_mysql80 / runscript (8.3, mysql-8.0.36, no_report:tests-codeception)	9m 11s
php83_mysql80 / runscript (8.3, mysql-8.0.36, report:tests-unit)	1m 13s
php83_mysql80 / sonarcloud (8.3, mysql-8.0.36, -)	57s
php83_mysql80 / finish	21s
	39m 11s

Provide feedback