Fix document type hinting

composer.json

@@ -13,10 +13,9 @@
     "require": {
         "php": "^7.1",
         "sylius/sylius": "^1.0",
-        "ongr/elasticsearch-dsl": "^5.0",
-        "ongr/elasticsearch-bundle": "^5.0",
+        "ongr/elasticsearch-bundle": "dev-6.0-dev",
         "simple-bus/symfony-bridge": "^4.1",
-        "ongr/filter-manager-bundle": "2.1.x-dev as v2.1.1",
+        "ongr/filter-manager-bundle": "dev-es-6.0",
         "ramsey/uuid": "^3.7"
     },
     "require-dev": {

src/Command/UpdateProductIndexCommand.php

@@ -12,7 +12,7 @@
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Sylius\Component\Locale\Model\LocaleInterface;
-use Sylius\ElasticSearchPlugin\Document\ProductDocument;
+use Sylius\ElasticSearchPlugin\Document\ProductDocumentInterface;
 use Sylius\ElasticSearchPlugin\Factory\Document\ProductDocumentFactoryInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -42,18 +42,20 @@ final class UpdateProductIndexCommand extends Command
     private $productDocumentFactory;
 
     /**
-     * @param ProductRepositoryInterface $productRepository
-     * @param Manager $elasticsearchManager
+     * @param ProductRepositoryInterface      $productRepository
+     * @param Manager                         $elasticsearchManager
      * @param ProductDocumentFactoryInterface $productDocumentFactory
+     * @param string                          $productDocumentClass
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
         Manager $elasticsearchManager,
-        ProductDocumentFactoryInterface $productDocumentFactory
+        ProductDocumentFactoryInterface $productDocumentFactory,
+        string $productDocumentClass
     ) {
         $this->productRepository = $productRepository;
         $this->elasticsearchManager = $elasticsearchManager;
-        $this->productDocumentRepository = $elasticsearchManager->getRepository(ProductDocument::class);
+        $this->productDocumentRepository = $elasticsearchManager->getRepository($productDocumentClass);
         $this->productDocumentFactory = $productDocumentFactory;
 
         parent::__construct('sylius:elastic-search:update-product-index');
@@ -81,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
             $search->setScroll('10m');
             $search->addSort(new FieldSort('synchronised_at', 'asc'));
 
-            /** @var DocumentIterator|ProductDocument[] $productDocuments */
+            /** @var DocumentIterator|ProductDocumentInterface[] $productDocuments */
             $productDocuments = $this->productDocumentRepository->findDocuments($search);
 
             foreach ($productDocuments as $productDocument) {
@@ -143,7 +145,7 @@ private function scheduleCreatingNewProductDocuments(string $productCode): void
 
     private function scheduleRemovingOldProductDocuments(string $productCode): void
     {
-        /** @var DocumentIterator|ProductDocument[] $currentProductDocuments */
+        /** @var DocumentIterator|ProductDocumentInterface[] $currentProductDocuments */
         $currentProductDocuments = $this->productDocumentRepository->findBy(['code' => $productCode]);
 
         foreach ($currentProductDocuments as $sameCodeProductDocument) {

src/Document/AttributeDocument.php

@@ -7,9 +7,9 @@
 use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
 
 /**
- * @ElasticSearch\Nested
+ * @ElasticSearch\NestedType
  */
-class AttributeDocument
+class AttributeDocument implements AttributeDocumentInterface
 {
     /**
      * @var string

src/Document/AttributeDocumentInterface.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ElasticSearchPlugin\Document;
+
+interface AttributeDocumentInterface
+{
+    /**
+     * @return string
+     */
+    public function getCode(): string;
+
+    /**
+     * @param string $code
+     */
+    public function setCode(string $code): void;
+
+    /**
+     * @return string
+     */
+    public function getName(): ?string;
+
+    /**
+     * @param string $name
+     */
+    public function setName(?string $name): void;
+
+    /**
+     * @return mixed
+     */
+    public function getValue();
+
+    /**
+     * @param mixed $value
+     */
+    public function setValue($value): void;
+}

src/Document/ImageDocument.php

@@ -7,9 +7,9 @@
 use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
 
 /**
- * @ElasticSearch\Object
+ * @ElasticSearch\ObjectType
  */
-class ImageDocument
+class ImageDocument implements ImageDocumentInterface
 {
     /**
      * @var string

src/Document/ImageDocumentInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ElasticSearchPlugin\Document;
+
+interface ImageDocumentInterface
+{
+    /**
+     * @return string
+     */
+    public function getCode(): ?string;
+
+    /**
+     * @param string $code
+     */
+    public function setCode(?string $code): void;
+
+    /**
+     * @return string
+     */
+    public function getPath(): string;
+
+    /**
+     * @param string $path
+     */
+    public function setPath(string $path): void;
+}

src/Document/OptionDocument.php

@@ -7,9 +7,9 @@
 use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
 
 /**
- * @ElasticSearch\Nested
+ * @ElasticSearch\NestedType
  */
-class OptionDocument
+class OptionDocument implements OptionDocumentInterface
 {
     /**
      * @var string

src/Document/OptionDocumentInterface.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ElasticSearchPlugin\Document;
+
+interface OptionDocumentInterface
+{
+    /**
+     * @return string
+     */
+    public function getCode(): string;
+
+    /**
+     * @param string $code
+     */
+    public function setCode(string $code): void;
+
+    /**
+     * @return string
+     */
+    public function getName(): string;
+
+    /**
+     * @param string $name
+     */
+    public function setName(string $name): void;
+
+    /**
+     * @return string
+     */
+    public function getValue(): string;
+
+    /**
+     * @param string $value
+     */
+    public function setValue(string $value): void;
+}

src/Document/PriceDocument.php

@@ -7,9 +7,9 @@
 use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
 
 /**
- * @ElasticSearch\Object
+ * @ElasticSearch\ObjectType
  */
-class PriceDocument
+class PriceDocument implements PriceDocumentInterface
 {
     /**
      * @var int
@@ -43,7 +43,7 @@ public function getAmount(): int
     /**
      * @param int $amount
      */
-    public function setAmount(int $amount): void
+    public function setAmount($amount): void
     {
         $this->amount = $amount;
     }

src/Document/PriceDocumentInterface.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ElasticSearchPlugin\Document;
+
+interface PriceDocumentInterface
+{
+    /**
+     * @return int
+     */
+    public function getAmount();
+
+    /**
+     * @param int $amount
+     */
+    public function setAmount($amount): void;
+
+    /**
+     * @return int
+     */
+    public function getOriginalAmount(): int;
+
+    /**
+     * @param int $originalAmount
+     */
+    public function setOriginalAmount(int $originalAmount = 0): void;
+
+    /**
+     * @return string
+     */
+    public function getCurrency(): string;
+
+    /**
+     * @param string $currency
+     */
+    public function setCurrency(string $currency): void;
+}