refactor: Update code in /includes to be psr2 compliant #4220
Fix issue #2759 I only tested the regex, not against hardware as I don't have access to any.