Cleanup styles, leave only Standard and Plural

Author: alganet

src/Styles/AbstractStyle.php

@@ -4,7 +4,6 @@
 
 namespace Respect\Data\Styles;
 
-use function preg_match;
 use function preg_quote;
 use function preg_replace;
 use function preg_replace_callback;
@@ -27,34 +26,4 @@ protected function separatorToCamelCase(string $name, string $separator = '_'):
             $name,
         );
     }
-
-    protected function pluralToSingular(string $name): string
-    {
-        $replacements = [
-            '/^(.+)ies$/' => '$1y',
-            '/^(.+)s$/' => '$1',
-        ];
-        foreach ($replacements as $key => $value) {
-            if (preg_match($key, $name)) {
-                return (string) preg_replace($key, $value, $name);
-            }
-        }
-
-        return $name;
-    }
-
-    protected function singularToPlural(string $name): string
-    {
-        $replacements = [
-            '/^(.+)y$/' => '$1ies',
-            '/^(.+)([^s])$/' => '$1$2s',
-        ];
-        foreach ($replacements as $key => $value) {
-            if (preg_match($key, $name)) {
-                return (string) preg_replace($key, $value, $name);
-            }
-        }
-
-        return $name;
-    }
 }

src/Styles/CakePHP.php

@@ -7,6 +7,8 @@
 use function array_map;
 use function explode;
 use function implode;
+use function preg_match;
+use function preg_replace;
 use function strtolower;
 use function substr;
 use function ucfirst;
@@ -52,4 +54,34 @@ public function composed(string $left, string $right): string
     {
         return $this->singularToPlural($left) . '_' . $this->singularToPlural($right);
     }
+
+    private function pluralToSingular(string $name): string
+    {
+        $replacements = [
+            '/^(.+)ies$/' => '$1y',
+            '/^(.+)s$/' => '$1',
+        ];
+        foreach ($replacements as $key => $value) {
+            if (preg_match($key, $name)) {
+                return (string) preg_replace($key, $value, $name);
+            }
+        }
+
+        return $name;
+    }
+
+    private function singularToPlural(string $name): string
+    {
+        $replacements = [
+            '/^(.+)y$/' => '$1ies',
+            '/^(.+)([^s])$/' => '$1$2s',
+        ];
+        foreach ($replacements as $key => $value) {
+            if (preg_match($key, $name)) {
+                return (string) preg_replace($key, $value, $name);
+            }
+        }
+
+        return $name;
+    }
 }

src/Styles/NorthWind.php

@@ -10,7 +10,7 @@
 use ReflectionObject;
 use Respect\Data\Collections\Collection;
 use Respect\Data\Hydrators\Nested;
-use Respect\Data\Styles\CakePHP;
+use Respect\Data\Styles\Plural;
 use Respect\Data\Styles\Standard;
 use SplObjectStorage;
 
@@ -92,7 +92,7 @@ public function getStyleShouldReturnSameInstanceOnSubsequentCalls(): void
     #[Test]
     public function styleShouldComeFromEntityFactory(): void
     {
-        $style = new CakePHP();
+        $style = new Plural();
         $mapper = new class (new Nested(new EntityFactory(style: $style))) extends AbstractMapper {
             public function flush(): void
             {

src/Styles/Plural.php

@@ -129,7 +129,7 @@ public function createAndCopySkipsUninitializedSourceProperties(): void
     #[Test]
     public function getStyleReturnsConfiguredStyle(): void
     {
-        $style = new Styles\CakePHP();
+        $style = new Styles\Plural();
         $factory = new EntityFactory(style: $style);
         $this->assertSame($style, $factory->style);
     }

src/Styles/Sakila.php

@@ -74,18 +74,6 @@ public function isRelationProperty(string $name): bool
         };
     }
 
-    /** @return array<array{string, string}> */
-    public static function singularPluralProvider(): array
-    {
-        return [
-            ['post', 'posts'],
-            ['comment', 'comments'],
-            ['category', 'categories'],
-            ['tag', 'tags'],
-            ['entity', 'entities'],
-        ];
-    }
-
     /** @return array<array{string, string, string}> */
     public static function camelCaseToSeparatorProvider(): array
     {
@@ -96,16 +84,6 @@ public static function camelCaseToSeparatorProvider(): array
         ];
     }
 
-    #[DataProvider('singularPluralProvider')]
-    public function testPluralToSingularAndViceVersa(string $singular, string $plural): void
-    {
-        $pluralToSingular = new ReflectionMethod($this->style, 'pluralToSingular');
-        $this->assertEquals($singular, $pluralToSingular->invoke($this->style, $plural));
-
-        $singularToPlural = new ReflectionMethod($this->style, 'singularToPlural');
-        $this->assertEquals($plural, $singularToPlural->invoke($this->style, $singular));
-    }
-
     #[DataProvider('camelCaseToSeparatorProvider')]
     public function testCamelCaseToSeparatorAndViceVersa(
         string $separator,
@@ -124,16 +102,4 @@ public function testCamelCaseToSeparatorAndViceVersa(
             $separatorToCamelCaseMethod->invoke($this->style, $separated, $separator),
         );
     }
-
-    public function testPluralToSingularReturnsUnchangedWhenNoMatch(): void
-    {
-        $method = new ReflectionMethod($this->style, 'pluralToSingular');
-        $this->assertEquals('fox', $method->invoke($this->style, 'fox'));
-    }
-
-    public function testSingularToPluralReturnsUnchangedWhenNoMatch(): void
-    {
-        $method = new ReflectionMethod($this->style, 'singularToPlural');
-        $this->assertEquals('news', $method->invoke($this->style, 'news'));
-    }
 }