Skip to content
This repository was archived by the owner on Aug 3, 2018. It is now read-only.

Repleaced ONGR Collection in favour of Doctine ArrayCollection #99

Open
DpVic wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Repleaced ONGR Collection in favour of Doctine ArrayCollection #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf57637
Repleaced ONGR Collection in favour of Doctine ArrayCollection
DpVic Jul 1, 2018
951a48b
Fixed bad usage of Doctrine's Collection
DpVic Jul 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions spec/Document/ProductDocumentSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace spec\Sylius\ElasticSearchPlugin\Document;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use PhpSpec\ObjectBehavior;
use Sylius\ElasticSearchPlugin\Document\PriceDocument;
use Sylius\ElasticSearchPlugin\Document\ProductDocument;
Expand Down Expand Up @@ -70,15 +70,15 @@ function it_has_main_taxon()

function it_has_taxons()
{
$taxons = new Collection();
$taxons = new ArrayCollection();
$this->setTaxons($taxons);

$this->getTaxons()->shouldReturn($taxons);
}

function it_has_attributes()
{
$attributeValues = new Collection();
$attributeValues = new ArrayCollection();
$this->setAttributes($attributeValues);

$this->getAttributes()->shouldReturn($attributeValues);
Expand All @@ -93,7 +93,7 @@ function it_has_slug()

function it_has_images()
{
$images = new Collection();
$images = new ArrayCollection();
$this->setImages($images);

$this->getImages()->shouldReturn($images);
Expand Down
4 changes: 2 additions & 2 deletions spec/Document/TaxonDocumentSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace spec\Sylius\ElasticSearchPlugin\Document;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use PhpSpec\ObjectBehavior;
use Sylius\ElasticSearchPlugin\Document\TaxonDocument;

Expand All @@ -31,7 +31,7 @@ function it_has_slug()

function it_has_images()
{
$images = new Collection();
$images = new ArrayCollection();
$this->setImages($images);

$this->getImages()->shouldReturn($images);
Expand Down
21 changes: 11 additions & 10 deletions src/Document/ProductDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

namespace Sylius\ElasticSearchPlugin\Document;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
use ONGR\ElasticsearchBundle\Collection\Collection;

/**
* @ElasticSearch\Document(type="product")
Expand Down Expand Up @@ -101,21 +102,21 @@ class ProductDocument
protected $mainTaxon;

/**
* @var Collection|TaxonDocument[]
* @var ArrayCollection|TaxonDocument[]
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\TaxonDocument", multiple=true)
*/
protected $taxons;

/**
* @var Collection
* @var ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\AttributeDocument", multiple=true)
*/
protected $attributes;

/**
* @var Collection
* @var ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\ImageDocument", multiple=true)
*/
Expand All @@ -134,7 +135,7 @@ class ProductDocument
protected $createdAt;

/**
* @var Collection
* @var ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\VariantDocument", multiple=true)
*/
Expand All @@ -149,10 +150,10 @@ class ProductDocument

public function __construct()
{
$this->attributes = new Collection();
$this->taxons = new Collection();
$this->images = new Collection();
$this->variants = new Collection();
$this->attributes = new ArrayCollection();
$this->taxons = new ArrayCollection();
$this->images = new ArrayCollection();
$this->variants = new ArrayCollection();
}

/**
Expand Down Expand Up @@ -342,7 +343,7 @@ public function getTaxons(): Collection
/**
* @param Collection|TaxonDocument[] $taxons
*/
public function setTaxons($taxons): void
public function setTaxons(Collection $taxons): void
{
$this->taxons = $taxons;
}
Expand Down
7 changes: 4 additions & 3 deletions src/Document/TaxonDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

namespace Sylius\ElasticSearchPlugin\Document;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
use ONGR\ElasticsearchBundle\Collection\Collection;

/**
* @ElasticSearch\Nested()
Expand Down Expand Up @@ -34,7 +35,7 @@ class TaxonDocument
protected $position = 0;

/**
* @var ImageDocument[]|Collection
* @var ImageDocument[]|ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\ImageDocument", multiple=true)
*/
Expand All @@ -49,7 +50,7 @@ class TaxonDocument

public function __construct()
{
$this->images = new Collection();
$this->images = new ArrayCollection();
}

/**
Expand Down
11 changes: 6 additions & 5 deletions src/Document/VariantDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

namespace Sylius\ElasticSearchPlugin\Document;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use ONGR\ElasticsearchBundle\Annotation as ElasticSearch;
use ONGR\ElasticsearchBundle\Collection\Collection;

/**
* @ElasticSearch\Nested
Expand All @@ -20,7 +21,7 @@ class VariantDocument
protected $id;

/**
* @var Collection
* @var ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\ImageDocument", multiple=true)
*/
Expand Down Expand Up @@ -62,16 +63,16 @@ class VariantDocument
protected $isTracked;

/**
* @var Collection
* @var ArrayCollection
*
* @ElasticSearch\Embedded(class="Sylius\ElasticSearchPlugin\Document\OptionDocument", multiple=true)
*/
protected $options;

public function __construct()
{
$this->images = new Collection();
$this->options = new Collection();
$this->images = new ArrayCollection();
$this->options = new ArrayCollection();
}

/**
Expand Down
10 changes: 5 additions & 5 deletions src/Factory/Document/ProductDocumentFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace Sylius\ElasticSearchPlugin\Factory\Document;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection as DoctrineCollection;
use ONGR\ElasticsearchBundle\Collection\Collection;
use Ramsey\Uuid\Uuid;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\ChannelPricingInterface;
Expand Down Expand Up @@ -145,10 +145,10 @@ function (ProductVariantInterface $a, ProductVariantInterface $b) {
$productDocument->setCreatedAt($product->getCreatedAt());
$productDocument->setSynchronisedAt(new \DateTime('now'));
$productDocument->setAverageReviewRating($product->getAverageRating());
$productDocument->setVariants(new Collection($variantDocuments));
$productDocument->setImages(new Collection($imageDocuments));
$productDocument->setTaxons(new Collection($taxonDocuments));
$productDocument->setAttributes(new Collection($attributeDocuments));
$productDocument->setVariants(new ArrayCollection($variantDocuments));
$productDocument->setImages(new ArrayCollection($imageDocuments));
$productDocument->setTaxons(new ArrayCollection($taxonDocuments));
$productDocument->setAttributes(new ArrayCollection($attributeDocuments));

/**
* Set smallest product variant price, used for search by price
Expand Down
4 changes: 2 additions & 2 deletions src/Factory/Document/TaxonDocumentFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Sylius\ElasticSearchPlugin\Factory\Document;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Sylius\Component\Core\Model\TaxonInterface;
use Sylius\Component\Locale\Model\LocaleInterface;
use Sylius\Component\Taxonomy\Model\TaxonTranslationInterface;
Expand Down Expand Up @@ -54,7 +54,7 @@ public function create(TaxonInterface $taxon, LocaleInterface $localeCode, ?int
foreach ($taxon->getImages() as $image) {
$images[] = $this->imageDocumentFactory->create($image);
}
$taxonDocument->setImages(new Collection($images));
$taxonDocument->setImages(new ArrayCollection($images));

return $taxonDocument;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Factory/Document/VariantDocumentFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Sylius\ElasticSearchPlugin\Factory\Document;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\ChannelPricingInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
Expand Down Expand Up @@ -74,14 +74,14 @@ public function create(
$variant->setPrice($price);
$variant->setStock($productVariant->getOnHand() - $productVariant->getOnHold());
$variant->setIsTracked($productVariant->isTracked());
$variant->setOptions(new Collection($options));
$variant->setOptions(new ArrayCollection($options));
if ($productVariant->getImages()->count() > 0) {
/** @var ImageDocument[] $images */
$images = [];
foreach ($productVariant->getImages() as $image) {
$images[] = $this->imageDocumentFactory->create($image);
}
$variant->setImages(new Collection($images));
$variant->setImages(new ArrayCollection($images));
}

return $variant;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/View/ProductListViewFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Sylius\ElasticSearchPlugin\Factory\View;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\Collection;
use ONGR\FilterManagerBundle\Search\SearchResponse;
use Sylius\ElasticSearchPlugin\Controller\AttributeView;
use Sylius\ElasticSearchPlugin\Controller\ImageView;
Expand Down
10 changes: 5 additions & 5 deletions tests/Factory/ProductDocumentFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Tests\Sylius\ElasticSearchPlugin\Factory;

use ONGR\ElasticsearchBundle\Collection\Collection;
use Doctrine\Common\Collections\ArrayCollection;
use Sylius\Bundle\ChannelBundle\Doctrine\ORM\ChannelRepository;
use Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductRepository;
use Sylius\Component\Core\Model\Channel;
Expand Down Expand Up @@ -106,7 +106,7 @@ public function it_creates_product_document_from_sylius_product_model()
$this->assertEquals($product->getCode(), $product->getCode());
$this->assertEquals($product->getName(), $product->getName());
$this->assertEquals('en_GB', $product->getLocaleCode());
$this->assertEquals(new Collection($productAttributes), $product->getAttributes());
$this->assertEquals(new ArrayCollection($productAttributes), $product->getAttributes());
$this->assertEquals(1000, $product->getPrice()->getAmount());
$this->assertEquals('GBP', $product->getPrice()->getCurrency());
$this->assertEquals('en_GB', $product->getLocaleCode());
Expand All @@ -116,7 +116,7 @@ public function it_creates_product_document_from_sylius_product_model()
$this->assertEquals($createdAt, $product->getCreatedAt());
$this->assertEquals('Logan Mug', $product->getDescription());
$this->assertEquals($taxon, $product->getMainTaxon());
$this->assertEquals(new Collection($productTaxons), $product->getTaxons());
$this->assertEquals(new ArrayCollection($productTaxons), $product->getTaxons());
$this->assertEquals(0.0, $product->getAverageReviewRating());
}

Expand Down Expand Up @@ -170,7 +170,7 @@ public function it_creates_product_document_only_with_whitelisted_attributes()
$this->assertEquals($product->getName(), $product->getName());
$this->assertEquals('en_GB', $product->getLocaleCode());
$this->assertEquals(
new Collection([$productAttribute]),
new ArrayCollection([$productAttribute]),
$product->getAttributes()
);
$this->assertEquals(1000, $product->getPrice()->getAmount());
Expand All @@ -182,7 +182,7 @@ public function it_creates_product_document_only_with_whitelisted_attributes()
$this->assertEquals($createdAt, $product->getCreatedAt());
$this->assertEquals('Logan Mug', $product->getDescription());
$this->assertEquals($taxon, $product->getMainTaxon());
$this->assertEquals(new Collection($productTaxons), $product->getTaxons());
$this->assertEquals(new ArrayCollection($productTaxons), $product->getTaxons());
$this->assertEquals(0.0, $product->getAverageReviewRating());
}

Expand Down