Merge pull request #11 from open-code-modeling/0.1.x-merge-up-into-0.2.x_5fc918124cc192.82611642

Merge release 0.1.1 into 0.2.x

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.1 - 2020-12-03
+
+
+-----
+
+### Release Notes for [0.1.1](https://github.com/open-code-modeling/php-filter/milestone/2)
+
+0.1.x bugfix release (patch)
+
+### 0.1.1
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [10: Method name filter and upper letters issue](https://github.com/open-code-modeling/php-filter/issues/10) thanks to @sandrokeil
+
 ## 0.1.0 - 2020-11-30
 
 

src/Filter/UpperToLower.php

@@ -0,0 +1,25 @@
+<?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 OpenCodeModeling\Filter\Filter;
+
+final class UpperToLower extends AbstractFilter
+{
+    public function __invoke(string $value): string
+    {
+        $value = ($this->filter)($value);
+
+        if (1 === \preg_match('/^[A-Z]+$/', $value)) {
+            return \strtolower($value);
+        }
+
+        return $value;
+    }
+}

src/FilterFactory.php

@@ -16,6 +16,7 @@
 use OpenCodeModeling\Filter\Filter\LowerCaseFirst;
 use OpenCodeModeling\Filter\Filter\NormalizeLabel;
 use OpenCodeModeling\Filter\Filter\UpperCaseFirst;
+use OpenCodeModeling\Filter\Filter\UpperToLower;
 
 final class FilterFactory
 {
@@ -93,7 +94,7 @@ public static function propertyNameFilter(): callable
      */
     public static function methodNameFilter(): callable
     {
-        return new LowerCaseFirst(self::normalizeFilter());
+        return new LowerCaseFirst(self::normalizeFilter(new UpperToLower()));
     }
 
     /**

tests/FilterFactoryTest.php

@@ -36,6 +36,15 @@ public function it_filters_method_name(string $label): void
         $this->assertSame('addBuilding', ($filter)($label));
     }
 
+    /**
+     * @test
+     */
+    public function it_filters_method_name_with_only_upper_letters(): void
+    {
+        $filter = FilterFactory::methodNameFilter();
+        $this->assertSame('ny', ($filter)('NY'));
+    }
+
     /**
      * @test
      * @dataProvider providerForLabel