dev

drago-ex · Jan 31, 2024 · 9ad8a02 · 9ad8a02
1 parent 7c8a59d
commit 9ad8a02
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 59 deletions.
diff --git a/src/Drago/Generator/Attribute.php b/src/Drago/Generator/Attribute.php
diff --git a/src/Drago/Generator/Base.php b/src/Drago/Generator/Base.php
@@ -44,7 +44,7 @@ public function filename(string $name, string $suffix): string
 	 */
 	public function validateColumn(string $table, string $column): void
 	{
-		if (Strings::contains($column, '(')) {
+		if (str_contains($column, '(')) {
 			throw new ValidateColumnException('Wrong column name ' . $column . ' in table ' .
 				$table . ', change name or use AS');
 		}

diff --git a/src/Drago/Generator/Generator/DataClassGenerator.php b/src/Drago/Generator/Generator/DataClassGenerator.php
@@ -94,7 +94,7 @@ public function createPhpFile(string $table): void
 					->setPublic();
 
 				// Add to constant column length information.
-				if ($options->constantLengthDataClass) {
+				if ($options->constantSizeDataClass) {
 					if (!$attr->isAutoIncrement() && $attr->getSize() > 0) {
 						$class->addConstant($constant . 'Size', $attr->getSize())
 							->setPublic();

diff --git a/src/Drago/Generator/Generator/EntityGenerator.php b/src/Drago/Generator/Generator/EntityGenerator.php
@@ -107,8 +107,8 @@ public function createPhpFile(string $table): void
 						->setPublic();
 				}
 
-				// Add to constant column length information
-				if ($options->constantLength) {
+				// Add to constant column size information
+				if ($options->constantSize) {
 					if (!$attr->isAutoIncrement() && $attr->getSize() > 0) {
 						$class->addConstant($constant . 'Size', $attr->getSize())
 							->setPublic();
@@ -123,7 +123,7 @@ public function createPhpFile(string $table): void
 			if ($attr->isAutoIncrement()) {
 				$create = $class->addProperty($column)
 					->setType($detectType)
-					->setNullable(true)
+					->setNullable()
 					->setPublic();
 
 			} else {

diff --git a/src/Drago/Generator/Options.php b/src/Drago/Generator/Options.php
@@ -43,8 +43,8 @@ class Options
 	/** Add the name before the constant. */
 	public string|null $constantPrefix = null;
 
-	/** Allow constant column length. */
-	public bool $constantLength = false;
+	/** Allow constant column size. */
+	public bool $constantSize = false;
 
 	/** Allow table references in the property */
 	public bool $references = false;
@@ -72,8 +72,8 @@ class Options
 	/** Allow constant. */
 	public bool $constantDataClass = true;
 
-	/** Allow constant column length. */
-	public bool $constantLengthDataClass = true;
+	/** Allow constant column size. */
+	public bool $constantSizeDataClass = true;
 
 	/** Add the name before the constant. */
 	public string|null $constantDataPrefix = null;

diff --git a/src/Drago/Generator/Type.php b/src/Drago/Generator/Type.php