Improve default filters to match more cases - #12

Author: sandrokeil

composer.json

@@ -56,8 +56,8 @@
             "@test",
             "@analyse"
         ],
-        "cs": "php-cs-fixer fix src -v --diff --dry-run",
-        "cs-fix": "php-cs-fixer fix src -v --diff",
+        "cs": "php-cs-fixer fix -v --diff --dry-run",
+        "cs-fix": "php-cs-fixer fix -v --diff",
         "test": "vendor/bin/phpunit",
         "analyse": "php vendor/bin/phpstan.phar analyse --no-interaction"
     },

src/FilterFactory.php

@@ -23,16 +23,13 @@ final class FilterFactory
     /**
      * Returns a normalize filter for labels, names ...
      *
-     * @param callable ...$callables Attached to the end of the filter chain
+     * @param  callable ...$callables Attached to the end of the filter chain
      * @return callable
      */
     public static function normalizeFilter(callable ...$callables): callable
     {
         $filter = new Filter\FilterChain();
         $filter->attach(new NormalizeLabel());
-        $filter->attach(new Filter\Word\SeparatorToSeparator(' ', '-'));
-        $filter->attach(new Filter\Word\UnderscoreToCamelCase());
-        $filter->attach(new Filter\Word\DashToCamelCase());
 
         foreach ($callables as $callable) {
             $filter->attach($callable);
@@ -48,7 +45,15 @@ public static function normalizeFilter(callable ...$callables): callable
      */
     public static function classNameFilter(): callable
     {
-        return new UpperCaseFirst(self::normalizeFilter());
+        return new UpperCaseFirst(
+            self::normalizeFilter(
+                new Filter\Word\CamelCaseToUnderscore(),
+                new Filter\StringToLower(),
+                new Filter\Word\UnderscoreToCamelCase(),
+                new Filter\Word\SeparatorToSeparator(' ', '-'),
+                new Filter\Word\DashToCamelCase()
+            )
+        );
     }
 
     /**
@@ -59,6 +64,8 @@ public static function classNameFilter(): callable
     public static function constantNameFilter(): callable
     {
         return self::normalizeFilter(
+            new Filter\Word\SeparatorToSeparator(' ', '-'),
+            new Filter\Word\DashToCamelCase(),
             new Filter\Word\CamelCaseToUnderscore(),
             new Filter\StringToUpper()
         );
@@ -72,6 +79,8 @@ public static function constantNameFilter(): callable
     public static function constantValueFilter(): callable
     {
         return self::normalizeFilter(
+            new Filter\Word\SeparatorToSeparator(' ', '-'),
+            new Filter\Word\DashToCamelCase(),
             new Filter\Word\CamelCaseToUnderscore(),
             new Filter\StringToLower()
         );
@@ -84,7 +93,15 @@ public static function constantValueFilter(): callable
      */
     public static function propertyNameFilter(): callable
     {
-        return new LowerCaseFirst(self::normalizeFilter());
+        return new LowerCaseFirst(
+            self::normalizeFilter(
+                new Filter\Word\CamelCaseToUnderscore(),
+                new Filter\StringToLower(),
+                new Filter\Word\UnderscoreToCamelCase(),
+                new Filter\Word\SeparatorToSeparator(' ', '-'),
+                new Filter\Word\DashToCamelCase()
+            )
+        );
     }
 
     /**
@@ -94,7 +111,16 @@ public static function propertyNameFilter(): callable
      */
     public static function methodNameFilter(): callable
     {
-        return new LowerCaseFirst(self::normalizeFilter(new UpperToLower()));
+        return new LowerCaseFirst(
+            self::normalizeFilter(
+                new Filter\Word\CamelCaseToUnderscore(),
+                new Filter\StringToLower(),
+                new Filter\Word\UnderscoreToCamelCase(),
+                new Filter\Word\SeparatorToSeparator(' ', '-'),
+                new Filter\Word\DashToCamelCase(),
+                new UpperToLower()
+            )
+        );
     }
 
     /**

tests/FilterFactoryTest.php

@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * @see       https://github.com/open-code-modeling/php-filter for the canonical source repository
+ * @copyright https://github.com/open-code-modeling/php-filter/blob/master/COPYRIGHT.md
+ * @license   https://github.com/open-code-modeling/php-filter/blob/master/LICENSE.md MIT License
+ */
+
 declare(strict_types=1);
 
 namespace OpenCodeModelingTest\Filter;
@@ -15,6 +21,7 @@ final class FilterFactoryTest extends TestCase
      */
     public function providerForLabel(): Generator
     {
+        yield 'ADD_BUILDING' => ['ADD_BUILDING'];
         yield 'add building' => ['add building'];
         yield 'add_building' => ['add_building'];
         yield 'add-building' => ['add-building'];