Merge remote-tracking branch 'origin/0.1.x-merge-up-into-0.2.x_60245b040bc558.02334330' into 0.2.x

# Conflicts:
#	CHANGELOG.md
#	composer.json

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,25 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.1.2 - 2021-02-10
+
+
+-----
+
+### Release Notes for [0.1.2](https://github.com/open-code-modeling/php-filter/milestone/5)
+
+0.1.x bugfix release (patch)
+
+### 0.1.2
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+- [12: Improve default filters to match more cases](https://github.com/open-code-modeling/php-filter/issues/12) thanks to @sandrokeil
+
 ## 0.1.1 - 2020-12-03
 
 

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);
@@ -66,7 +63,15 @@ public static function pascalCaseFilter(): 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()
+            )
+        );
     }
 
     /**
@@ -77,6 +82,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()
         );
@@ -90,6 +97,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()
         );
@@ -102,7 +111,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()
+            )
+        );
     }
 
     /**
@@ -112,7 +129,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

@@ -21,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'];