Merge "Rebuilt PHPVersionCheck to be an own class"