Remove match keyword from class names (atc.) for PHP8.0+ (for version-one breanch)
#8
+7
−6