Merge remote-tracking branch 'origin/master'

dodo-it · Mar 6, 2019 · 8e9d90d · 8e9d90d
2 parents 55abec7 + 96c1f9b
commit 8e9d90d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/src/Generator/Config.php b/src/Generator/Config.php
@@ -75,6 +75,16 @@ public function __construct(?array $config = null)
 	 */
 	public $generateSetters = true;
 
+	/**
+	 * @var string
+	 */
+	public $getterVisibility = 'public';
+
+	/**
+	 * @var string
+	 */
+	public $setterVisibility = 'public';
+
 	/**
 	 * @var bool
 	 */

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;
 	}
 
 	/**
@@ -125,15 +125,15 @@ protected function generateColumn(ClassType $entity, Column $column): void
 
 		if ($this->config->generateGetters) {
 			$getter = $entity->addMethod('get' . Inflector::classify($column->getField()));
-			$getter->setVisibility('public')
+			$getter->setVisibility($this->config->getterVisibility)
 				->addBody('return $this->' . $column->getField() . ';')
 				->setReturnType($type)
 				->setReturnNullable($column->isNullable());
 		}
 
 		if ($this->config->generateSetters) {
 			$setter = $entity->addMethod('set' . Inflector::classify($column->getField()));
-			$setter->setVisibility('public');
+			$setter->setVisibility($this->config->setterVisibility);
 			$setter->addParameter('value')->setTypeHint($type)->setNullable($column->isNullable());
 			$setter->addBody('$this[\'' . $column->getField() . '\'] = $value;');
 			$setter->addBody('return $this;');

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'));
+	}
+
 }