partly reverted changes;
- concatenation according to Symfony CS
- splitting of validateOptionTypes is not viable (used too often, potentially causing resource issues)