singularize all words not just last one (#6)

* singularize all words not just last one
dodo-it · Mar 6, 2019 · 96c1f9b · 96c1f9b
1 parent f4dc65d
commit 96c1f9b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/Generator/Generator.php b/src/Generator/Generator.php
@@ -84,7 +84,7 @@ protected function getClassName(string $table): string
 		if (isset($this->config->replacements[$table])) {
 			return $this->config->replacements[$table];
 		}
-		return $this->config->prefix . Inflector::singularize(Inflector::classify($table)) . $this->config->suffix;
+		return $this->config->prefix . Helper::camelize($table) . $this->config->suffix;
 	}
 
 	/**

diff --git a/src/Generator/Helper.php b/src/Generator/Helper.php
@@ -2,6 +2,8 @@
 
 namespace DodoIt\EntityGenerator\Generator;
 
+use Doctrine\Common\Inflector\Inflector;
+
 class Helper
 {
 
@@ -20,4 +22,14 @@ public static function multiArrayFlip(array $array): array
 		return $result;
 	}
 
+	public static function camelize(string $input, string $separator = '_'): string
+	{
+		$words = explode($separator, $input);
+		$result = '';
+		foreach ($words as $word) {
+			$result .= Inflector::singularize(ucfirst($word));
+		}
+		return $result;
+	}
+
 }
diff --git a/tests/Generator/HelperTest.php b/tests/Generator/HelperTest.php
@@ -22,4 +22,10 @@ public function testMultiArrayFlip(): void
 		]);
 	}
 
+	public function testCamelize()
+	{
+		$this->assertEquals('User', Helper::camelize('users'));
+		$this->assertEquals('UserLogin', Helper::camelize('users_logins'));
+	}
+
 }