Handle ObjectType & replace deprecated Collection when generating documents (#857)

Author: jcerri

Command/DocumentGenerateCommand.php

@@ -636,7 +636,7 @@ private function getPropertyTypes()
      */
     private function getDocumentAnnotations()
     {
-        return ['document', 'nested', 'object'];
+        return ['document', 'nested', 'object_type'];
     }
 
     /**

Generator/DocumentGenerator.php

@@ -187,7 +187,7 @@ private function generateDocumentConstructor(array $metadata)
 
         foreach ($metadata['properties'] as $prop) {
             if ($prop['annotation'] == 'embedded' && isset($prop['property_multiple']) && $prop['property_multiple']) {
-                $fields[] = sprintf('%s$this->%s = new Collection();', $this->spaces, $prop['field_name']);
+                $fields[] = sprintf('%s$this->%s = new ArrayCollection();', $this->spaces, $prop['field_name']);
             }
         }
 
@@ -255,7 +255,8 @@ private function generatePropertyDocBlock(array $metadata)
             $column[] = 'options={' . $metadata['property_options'] . '}';
         }
 
-        $lines[] = $this->spaces . ' * @ES\\' . ucfirst($metadata['annotation']) . '(' . implode(', ', $column) . ')';
+        $lines[] = $this->spaces . ' * @ES\\' . Inflector::classify($metadata['annotation'])
+            . '(' . implode(', ', $column) . ')';
 
         $lines[] = $this->spaces . ' */';
 
@@ -275,9 +276,8 @@ private function generateDocumentDocBlock(array $metadata)
             ['<className>', '<annotation>', '<options>'],
             [
                 $this->getClassName($metadata),
-                ucfirst($metadata['annotation']),
-                $metadata['annotation'] != 'object' ? ($metadata['type'] != lcfirst($this->getClassName($metadata))
-                    ? sprintf('type="%s"', $metadata['type']) : '') : '',
+                Inflector::classify($metadata['annotation']),
+                $this->getAnnotationOptions($metadata),
             ],
             '/**
  * <className>
@@ -318,6 +318,26 @@ private function getClassName(array $metadata)
             ? substr($metadata['name'], $pos + 1, strlen($metadata['name'])) : $metadata['name'];
     }
 
+    /**
+     * Returns annotation options
+     *
+     * @param array $metadata
+     *
+     * @return string
+     */
+    private function getAnnotationOptions(array $metadata)
+    {
+        if (in_array($metadata['annotation'], ['object', 'object_type'])) {
+            return '';
+        }
+
+        if ($metadata['type'] === Inflector::tableize($this->getClassName($metadata))) {
+            return '';
+        }
+
+        return sprintf('type="%s"', $metadata['type']);
+    }
+
     /**
      * Generates document use statements
      *
@@ -330,7 +350,7 @@ private function generateDocumentUse(array $metadata)
         $uses = ['use ONGR\ElasticsearchBundle\Annotation as ES;'];
 
         if ($this->hasMultipleEmbedded($metadata)) {
-            $uses[] = 'use ONGR\ElasticsearchBundle\Collection\Collection;';
+            $uses[] = 'use Doctrine\Common\Collections\ArrayCollection;';
         }
 
         return implode("\n", $uses) . "\n";