Merge pull request #34 from onmoon/fix-underscore-props

Fix underscore props
onmoon · Mar 1, 2020 · 10931fd · 10931fd
2 parents cf2e714 + 12c648c
commit 10931fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/CodeGenerator/Dto/PhpParserDtoFactory.php b/src/CodeGenerator/Dto/PhpParserDtoFactory.php
@@ -588,19 +588,22 @@ private function generateMethodParameter(MethodParameterDefinition $definition)
     {
         return $this
             ->factory
-            ->param($definition->name())
+            ->param($this->namingStrategy->stringToMethodName($definition->name()))
             ->setType($definition->iterableType() !== null ? 'array' : $definition->type());
     }
 
     private function getAssignmentDefinition(string $name) : Assign
     {
-        return new Assign(new Variable('this->' . $name), new Variable($name));
+        return new Assign(
+            new Variable('this->' . $name),
+            new Variable($this->namingStrategy->stringToMethodName($name))
+        );
     }
 
     private function generateGetter(GetterMethodDefinition $definition) : Method
     {
         $method = $this->factory
-            ->method('get' . ucfirst($definition->name()))
+            ->method('get' . ucfirst($this->namingStrategy->stringToMethodName($definition->name())))
             ->makePublic()
             ->setReturnType(
                 ($definition->isNullable() && $definition->defaultValue() === null ? '?' : '') .
@@ -626,7 +629,7 @@ private function generateSetter(SetterMethodDefinition $definition) : Method
         $methodParameterDefinition = new MethodParameterDefinition($definition->name(), $definition->type());
         $methodParameterDefinition->setIterableType($definition->iterableType());
         $method = $this->factory
-            ->method('set' . ucfirst($definition->name()))
+            ->method('set' . ucfirst($this->namingStrategy->stringToMethodName($definition->name())))
             ->makePublic()
             ->setReturnType('self')
             ->addParam($this->generateMethodParameter($methodParameterDefinition))

diff --git a/src/CodeGenerator/Naming/DefaultNamingStrategy.php b/src/CodeGenerator/Naming/DefaultNamingStrategy.php
@@ -103,7 +103,7 @@ public function buildPath(string ...$parts) : string
     private function prepareTextForPhp(string $text) : string
     {
         /** @var string $filteredText */
-        $filteredText = preg_replace('/[^\w]/', ' ', $text);
+        $filteredText = preg_replace('/[^A-Z0-9]/i', ' ', $text);
 
         return str_replace(' ', '', ucwords($filteredText));
     }