Merge remote-tracking branch 'remotes/upstream/1.2' into 5.0

# Conflicts: # Service/ExportService.php # Test/AbstractElasticsearchTestCase.php # Tests/Functional/Command/IndexImportCommandTest.php
ongr-io · Jan 30, 2017 · d03398d · d03398d
2 parents 58fa62d + 61188a7
commit d03398d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/Annotation/Version.php b/Annotation/Version.php
@@ -0,0 +1,37 @@
+<?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\Annotation;
+
+/**
+ * Associates document property with _version meta-field.
+ *
+ * @Annotation
+ * @Target("PROPERTY")
+ */
+final class Version implements MetaField
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return '_version';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSettings()
+    {
+        return [];
+    }
+}
diff --git a/Mapping/DocumentParser.php b/Mapping/DocumentParser.php
@@ -35,6 +35,7 @@ class DocumentParser
     const ID_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Id';
     const PARENT_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\ParentDocument';
     const ROUTING_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Routing';
+    const VERSION_ANNOTATION = 'ONGR\ElasticsearchBundle\Annotation\Version';
 
     /**
      * @var Reader Used to read document annotations.
@@ -181,6 +182,7 @@ private function getMetaFieldAnnotationData($property)
         $annotation = $this->reader->getPropertyAnnotation($property, self::ID_ANNOTATION);
         $annotation = $annotation ?: $this->reader->getPropertyAnnotation($property, self::PARENT_ANNOTATION);
         $annotation = $annotation ?: $this->reader->getPropertyAnnotation($property, self::ROUTING_ANNOTATION);
+        $annotation = $annotation ?: $this->reader->getPropertyAnnotation($property, self::VERSION_ANNOTATION);
 
         if ($annotation === null) {
             return null;
@@ -361,6 +363,7 @@ private function registerAnnotations()
             'Id',
             'ParentDocument',
             'Routing',
+            'Version',
         ];
 
         foreach ($annotations as $annotation) {

diff --git a/Tests/Functional/Command/CacheClearCommandTest.php b/Tests/Functional/Command/CacheClearCommandTest.php
@@ -21,6 +21,14 @@ class CacheClearCommandTest extends AbstractElasticsearchTestCase
 
     const COMMAND_NAME = 'ongr:es:cache:clear';
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDataArray()
+    {
+        return ['default' => []];
+    }
+
     /**
      * Tests if command is being executed.
      */