Merge pull request #74 from php-api-clients/ensure-all-class-names-are-checked-for-reserved-keywords

WyriHaximus · web-flow · commit 18cec037de19 · 2023-01-17T08:24:51.000+01:00
Ensure all class names are checked for reserved keywords
diff --git a/src/Generator.php b/src/Generator.php
@@ -40,7 +40,7 @@ public function generate(string $namespace, string $destinationPath)
 
     public static function className(string $className): string
     {
-        return str_replace(['{', '}', '-', '$', '_', '+'], ['Cb', 'Rcb', 'Dash', '_', '\\', 'Plus'], (new Convert($className))->toPascal()) . (self::isKeyword($className) ? '_' : '');
+        return str_replace(['{', '}', '-', '$', '_', '+'], ['Cb', 'Rcb', 'Dash', '_', '\\', 'Plus'], (new Convert($className))->toPascal()) . (self::isKeyword(self::basename($className)) ? '_' : '');
     }
 
     private static function cleanUpNamespace(string $namespace): string

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function generate(string $namespace, string $destinationPath)`
`40`	`40`
`41`	`41`	`public static function className(string $className): string`
`42`	`42`	`{`
`43`		`- return str_replace(['{', '}', '-', '$', '_', '+'], ['Cb', 'Rcb', 'Dash', '_', '\\', 'Plus'], (new Convert($className))->toPascal()) . (self::isKeyword($className) ? '_' : '');`
	`43`	`+ return str_replace(['{', '}', '-', '$', '_', '+'], ['Cb', 'Rcb', 'Dash', '_', '\\', 'Plus'], (new Convert($className))->toPascal()) . (self::isKeyword(self::basename($className)) ? '_' : '');`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private static function cleanUpNamespace(string $namespace): string`