Merge pull request #44 from keyermann/master

Custom @Orm\Column annotation

Author: dunglas

src/AnnotationGenerator/DoctrineOrmAnnotationGenerator.php

@@ -106,40 +106,44 @@ public function generateFieldAnnotations($className, $fieldName)
             $annotation = '@ORM\Column';
             $isColumnHasProperties = false;
 
-            if ($type !== 'string' || $field['isNullable'] || $field['isUnique']) {
-                $isColumnHasProperties = true;
-            }
+            if ($field['ormColumn']) {
+                $annotation .= '('.$field['ormColumn'].')';
+            } else {
+                if ($type !== 'string' || $field['isNullable'] || $field['isUnique']) {
+                    $isColumnHasProperties = true;
+                }
 
-            if ($field['isArray']) {
-                $type = 'simple_array';
-            }
+                if ($field['isArray']) {
+                    $type = 'simple_array';
+                }
 
-            if ($isColumnHasProperties) {
-                $annotation .= '(';
-            }
+                if ($isColumnHasProperties) {
+                    $annotation .= '(';
+                }
 
-            if ($type !== 'string') {
-                $annotation .= sprintf('type="%s"', $type);
-            }
+                if ($type !== 'string') {
+                    $annotation .= sprintf('type="%s"', $type);
+                }
 
-            if ($type !== 'string' && $field['isNullable']) {
-                $annotation .= ', ';
-            }
+                if ($type !== 'string' && $field['isNullable']) {
+                    $annotation .= ', ';
+                }
 
-            if ($field['isNullable']) {
-                $annotation .= 'nullable=true';
-            }
+                if ($field['isNullable']) {
+                    $annotation .= 'nullable=true';
+                }
 
-            if ($field['isUnique'] && $field['isNullable']) {
-                $annotation .= ', ';
-            }
+                if ($field['isUnique'] && $field['isNullable']) {
+                    $annotation .= ', ';
+                }
 
-            if ($field['isUnique']) {
-                $annotation .= 'unique=true';
-            }
+                if ($field['isUnique']) {
+                    $annotation .= 'unique=true';
+                }
 
-            if ($isColumnHasProperties) {
-                $annotation .= ')';
+                if ($isColumnHasProperties) {
+                    $annotation .= ')';
+                }
             }
 
             $annotations[] = $annotation;

src/TypesGenerator.php

@@ -303,6 +303,7 @@ public function generate($config)
                             'resource' => null,
                             'range' => 'Integer',
                             'cardinality' => CardinalitiesExtractor::CARDINALITY_1_1,
+                            'ormColumn' => null,
                             'isArray' => false,
                             'isNullable' => false,
                             'isUnique' => false,
@@ -587,6 +588,8 @@ private function generateField(array $config, array $class, \EasyRdf_Resource $t
                 $cardinality = $property ? $this->cardinalities[$propertyName] : CardinalitiesExtractor::CARDINALITY_1_1;
             }
 
+            $ormColumn = isset($propertyConfig['ormColumn']) ? $propertyConfig['ormColumn'] : null;
+
             $isArray = in_array($cardinality, [
                 CardinalitiesExtractor::CARDINALITY_1_N,
                 CardinalitiesExtractor::CARDINALITY_N_N,
@@ -613,6 +616,7 @@ private function generateField(array $config, array $class, \EasyRdf_Resource $t
                 'resource' => $property,
                 'range' => $ranges[0],
                 'cardinality' => $cardinality,
+                'ormColumn' => $ormColumn,
                 'isArray' => $isArray,
                 'isNullable' => $isNullable,
                 'isUnique' => isset($propertyConfig['unique']) && $propertyConfig['unique'],
@@ -796,8 +800,7 @@ private function generateClassUses($annotationGenerators, $classes, $className)
     {
         $uses = $classes[$className]['uses'];
 
-        if (
-            isset($classes[$className]['interfaceNamespace'])
+        if (isset($classes[$className]['interfaceNamespace'])
             && $classes[$className]['interfaceNamespace'] !== $classes[$className]['namespace']
         ) {
             $uses[] = sprintf(

src/TypesGeneratorConfiguration.php

@@ -129,6 +129,7 @@ function ($rdfa) {
                                             CardinalitiesExtractor::CARDINALITY_N_N,
                                             CardinalitiesExtractor::CARDINALITY_UNKNOWN,
                                         ])->end()
+                                        ->scalarNode('ormColumn')->defaultNull()->info('The doctrine column annotation content')->example('type="decimal", precision=5, scale=1, options={"comment" = "my comment"}')->end()
                                         ->arrayNode('groups')
                                             ->info('Symfony Serialization Groups')
                                             ->prototype('scalar')->end()

tests/config/address-book.yml

@@ -18,7 +18,8 @@ types:
       additionalName: ~
       gender: ~
       address: { range: PostalAddress }
-      birthDate: ~
+      # Custom range and custom ORM\Column content
+      birthDate: { range: DateTime, ormColumn: 'type="datetimetz", nullable=true, options={"comment" = "Birthdate with timezone."}' }
       telephone: ~
       email: ~
       jobTitle: ~
@@ -45,3 +46,5 @@ types:
     parent: false
     properties:
       name: ~
+      # Custom property with custom ORM\Column content
+      adminCode: {range: Text, ormColumn: 'type="string", length=3, unique=true, nullable=false, options={"comment" = "A code for central administration."}' }