fix: remove columnPrefix (replaced by attributes) (#387)

Author: alanpoulain

phpstan.neon

@@ -17,7 +17,6 @@ parameters:
                 required: ?boolean,
                 unique: boolean,
                 embedded: boolean,
-                columnPrefix: false|string,
                 attributes: array<string, (int|bool|null|string|string[]|string[][]|\Nette\PhpGenerator\Literal)[]|null>
             }
         '''

src/AttributeGenerator/DoctrineOrmAttributeGenerator.php

@@ -178,7 +178,7 @@ public function generatePropertyAttributes(Property $property, string $className
         }
 
         if ($property->isEmbedded) {
-            return [new Attribute('ORM\Embedded', ['class' => $relationName, 'columnPrefix' => $property->columnPrefix])];
+            return [new Attribute('ORM\Embedded', ['class' => $relationName])];
         }
 
         $relationTableName = $this->generateIdentifierName($className.ucfirst($property->reference->name()).ucfirst($property->name()), 'join_table', $this->config);

src/Model/Property.php

@@ -41,8 +41,6 @@ abstract class Property
     public bool $isEmbedded = false;
     public ?string $mappedBy = null;
     public ?string $inversedBy = null;
-    /** @var string|bool */
-    public $columnPrefix = false;
     public bool $isId = false;
     public ?string $typeHint = null;
     public bool $isEnum = false;

src/Schema/PropertyGenerator/PropertyGenerator.php

@@ -145,13 +145,6 @@ public function __invoke(string $name, array $config, Class_ $class, array $cont
             CardinalitiesExtractor::CARDINALITY_1_N,
         ], true));
 
-        $columnPrefix = false;
-        $isEmbedded = $propertyConfig['embedded'] ?? false;
-
-        if (true === $isEmbedded) {
-            $columnPrefix = $propertyConfig['columnPrefix'] ?? false;
-        }
-
         $schemaProperty->resource = $typeProperty;
         $schemaProperty->range = $range;
         $schemaProperty->rangeName = $rangeName;
@@ -162,8 +155,7 @@ public function __invoke(string $name, array $config, Class_ $class, array $cont
         $schemaProperty->isNullable = $isNullable;
         $schemaProperty->isRequired = $propertyConfig['required'] ?? false;
         $schemaProperty->isUnique = $propertyConfig['unique'] ?? false;
-        $schemaProperty->isEmbedded = $isEmbedded;
-        $schemaProperty->columnPrefix = $columnPrefix;
+        $schemaProperty->isEmbedded = $propertyConfig['embedded'] ?? false;
         $schemaProperty->mappedBy = $propertyConfig['mappedBy'] ?? null;
         $schemaProperty->inversedBy = $propertyConfig['inversedBy'] ?? null;
         $schemaProperty->groups = $propertyConfig['groups'] ?? [];

src/SchemaGeneratorConfiguration.php

@@ -245,7 +245,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                                         ->booleanNode('required')->defaultTrue()->info('Is the property required?')->end()
                                         ->booleanNode('unique')->defaultFalse()->info('The property unique')->end()
                                         ->booleanNode('embedded')->defaultFalse()->info('Is the property embedded?')->end()
-                                        ->scalarNode('columnPrefix')->defaultFalse()->info('The property columnPrefix')->end()
                                         ->append($attributesNode())
                                     ->end()
                                 ->end()

tests/AttributeGenerator/DoctrineOrmAttributeGeneratorTest.php

@@ -82,7 +82,6 @@ protected function setUp(): void
         $weightProperty->type = 'nonPositiveInteger';
         $vehicle->addProperty($weightProperty);
         $prefixedWeightProperty = new Property('prefixedWeight');
-        $prefixedWeightProperty->columnPrefix = 'weight_';
         $prefixedWeightProperty->isEmbedded = true;
         $prefixedWeightProperty->rangeName = 'QuantitativeValue';
         $prefixedWeightProperty->range = new RdfResource('https://schema.org/QuantitativeValue');
@@ -204,7 +203,7 @@ public function testGeneratePropertyAttributes(): void
             $this->generator->generatePropertyAttributes($this->classMap['Vehicle']->getPropertyByName('weight'), 'Vehicle')
         );
         $this->assertEquals(
-            [new Attribute('ORM\Embedded', ['class' => 'App\Entity\QuantitativeValue', 'columnPrefix' => 'weight_'])],
+            [new Attribute('ORM\Embedded', ['class' => 'App\Entity\QuantitativeValue'])],
             $this->generator->generatePropertyAttributes($this->classMap['Vehicle']->getPropertyByName('prefixedWeight'), 'Vehicle')
         );
         $this->assertEquals(

tests/Command/DumpConfigurationTest.php

@@ -249,9 +249,6 @@ interface:            null
                     # Is the property embedded?
                     embedded:             false
 
-                    # The property columnPrefix
-                    columnPrefix:         false
-
                     # Attributes (merged with generated attributes)
                     attributes:           []