Merge 5.2 branch to 6.0-dev

Author: Simonas Šerlinskas

Event/PrePersistEvent.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class PrePersistEvent extends Event
+{
+    /**
+     * @var object
+     */
+    private $document;
+
+    /**
+     * PrePersistEvent constructor.
+     * @param $document
+     */
+    public function __construct($document)
+    {
+        $this->document = $document;
+    }
+
+    /**
+     * @return object
+     */
+    public function getDocument()
+    {
+        return $this->document;
+    }
+
+    /**
+     * @param object $document
+     */
+    public function setDocument($document)
+    {
+        $this->document = $document;
+    }
+}

Generator/DocumentGenerator.php

@@ -171,7 +171,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']);
             }
         }
 
@@ -239,7 +239,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 . ' */';
 
@@ -259,9 +260,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>
@@ -302,6 +302,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
      *
@@ -314,7 +334,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";

Tests/Functional/Command/GenerateDocumentCommandTest.php

@@ -3,9 +3,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Functional\Command;
 
 use ONGR\ElasticsearchBundle\Command\DocumentGenerateCommand;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
+use ONGR\ElasticsearchBundle\Tests\WebTestCase;
 
 class GenerateDocumentCommandTest extends WebTestCase
 {

Tests/Unit/DependencyInjection/Compiler/MappingPassTest.php

@@ -12,6 +12,7 @@
 namespace ONGR\ElasticsearchBundle\Tests\Unit\DependencyInjection\Compiler;
 
 use ONGR\ElasticsearchBundle\DependencyInjection\Compiler\MappingPass;
+use Symfony\Component\DependencyInjection\Alias;
 
 /**
  * Unit tests for MappingPass.
@@ -103,6 +104,21 @@ function ($parameter) use ($metadataCollectorMock) {
             )
             ->willReturn(null);
 
+        $containerMock
+            ->expects($this->exactly(1))
+            ->method('setAlias')
+            ->withConsecutive(
+                [$this->equalTo('es.manager')],
+                [$this->equalTo('es.manager.default')]
+            )
+            ->willReturn(new Alias('es.manager', 'es.manager.default'));
+
+        $containerMock
+            ->expects($this->any())
+            ->method('getAlias')
+            ->with('es.manager')
+            ->willReturn(new Alias('es.manager', 'es.manager.default'));
+
         return $containerMock;
     }
 

Tests/Unit/Event/PrePersistEventTest.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Tests\Unit\Event;
+
+use ONGR\ElasticsearchBundle\Event\PrePersistEvent;
+use ONGR\ElasticsearchBundle\Tests\app\fixture\TestBundle\Document\Product;
+
+class PrePersistEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetters()
+    {
+        $entity = new Product();
+        $event = new PrePersistEvent($entity);
+
+        $this->assertInstanceOf(Product::class, $event->getDocument());
+    }
+}

Tests/WebTestCase.php

@@ -0,0 +1,12 @@
+<?php
+namespace ONGR\ElasticsearchBundle\Tests;
+
+class WebTestCase extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
+{
+    public static function getKernelClass()
+    {
+        require_once __DIR__.'/app/AppKernel.php';
+
+        return \AppKernel::class;
+    }
+}