Merge pull request #190 from Deuchnord/do-not-singularize-two-letter-words

Singularize/pluralize 3+ letter long words only in the property names

Author: dunglas

src/TypesGenerator.php

@@ -653,7 +653,7 @@ private function generateField(array $config, array $class, \EasyRdf_Resource $t
             }
 
             $class['fields'][$propertyName] = [
-                'name' => $isArray ? Inflector::pluralize($propertyName) : Inflector::singularize($propertyName),
+                'name' => $this->getFieldName($propertyName, $isArray),
                 'resource' => $property,
                 'range' => $ranges[0],
                 'cardinality' => $cardinality,
@@ -873,4 +873,18 @@ private function fixCs(array $files): void
         );
         $runner->fix();
     }
+
+    private function getFieldName(string $propertyName, bool $isArray): string
+    {
+        $snakeProperty = preg_replace('/([A-Z])/', '_$1', $propertyName);
+        $exploded = explode('_', $snakeProperty);
+
+        if (2 < \strlen($word = $exploded[\count($exploded) - 1])) {
+            $exploded[\count($exploded) - 1] = $isArray ? Inflector::pluralize($word) : Inflector::singularize($word);
+
+            return implode('', $exploded);
+        }
+
+        return $propertyName;
+    }
 }

tests/Command/GenerateTypesCommandTest.php

@@ -175,13 +175,15 @@ public function testReadableWritable(): void
         $this->assertEquals(0, $commandTester->execute(['output' => $outputDir, 'config' => $config]));
 
         $person = file_get_contents("$outputDir/AppBundle/Entity/Person.php");
+        $this->assertStringContainsString('private $sameAs;', $person);
         $this->assertStringContainsString('public function getId(', $person);
         $this->assertStringNotContainsString('function setId(', $person);
         $this->assertStringContainsString('public function getName(', $person);
         $this->assertStringNotContainsString('function setName(', $person);
         $this->assertStringContainsString('public function getFriends(', $person);
         $this->assertStringNotContainsString('function addFriend(', $person);
         $this->assertStringNotContainsString('function removeFriend(', $person);
+        $this->assertStringNotContainsString('function setSameAs(', $person);
     }
 
     public function testGeneratedId(): void

tests/config/readable-writable.yaml

@@ -4,3 +4,4 @@ types:
       name: { writable: false }
       familyName: { readable: false }
       friends: { range: "Person", cardinality: (0..*), writable: false }
+      sameAs: { writable: false }