Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 3 additions & 8 deletions src/DataProvider/Provider/Data/CategoryAssociationProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -37,9 +36,7 @@
$criteria = new Criteria();
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('afterCategoryId', null),
]));
$criteria->addFilter(new NotEqualsFilter('afterCategoryId', null));

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/class.notFound

Instantiated class Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter not found. Tip: Learn more at https://phpstan.org/user-guide/discovering-symbols

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/argument.type

Parameter #1 ...$queries of method Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria::addFilter() expects Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\Filter, Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter given.
$criteria->addSorting(
new FieldSorting('level'),
new FieldSorting('autoIncrement')
Expand All @@ -61,9 +58,7 @@
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('afterCategoryId', null),
]));
$criteria->addFilter(new NotEqualsFilter('afterCategoryId', null));

Check failure on line 61 in src/DataProvider/Provider/Data/CategoryAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/class.notFound

Instantiated class Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter not found. Tip: Learn more at https://phpstan.org/user-guide/discovering-symbols

Check failure on line 61 in src/DataProvider/Provider/Data/CategoryAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/argument.type

Parameter #1 ...$queries of method Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria::addFilter() expects Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\Filter, Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter given.

return $this->readTotalFromRepo($this->categoryRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -37,9 +36,7 @@
$criteria = new Criteria();
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('cmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('cmsPageId', null));

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryCmsPageAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/class.notFound

Instantiated class Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter not found. Tip: Learn more at https://phpstan.org/user-guide/discovering-symbols

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryCmsPageAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/argument.type

Parameter #1 ...$queries of method Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria::addFilter() expects Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\Filter, Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter given.
$criteria->addSorting(
new FieldSorting('level'),
new FieldSorting('autoIncrement')
Expand All @@ -60,9 +57,7 @@
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('cmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('cmsPageId', null));

Check failure on line 60 in src/DataProvider/Provider/Data/CategoryCmsPageAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/class.notFound

Instantiated class Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter not found. Tip: Learn more at https://phpstan.org/user-guide/discovering-symbols

Check failure on line 60 in src/DataProvider/Provider/Data/CategoryCmsPageAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/argument.type

Parameter #1 ...$queries of method Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria::addFilter() expects Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\Filter, Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter given.

return $this->readTotalFromRepo($this->categoryRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -37,9 +36,7 @@
$criteria = new Criteria();
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('productStreamId', null),
]));
$criteria->addFilter(new NotEqualsFilter('productStreamId', null));

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryProductStreamAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/class.notFound

Instantiated class Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter not found. Tip: Learn more at https://phpstan.org/user-guide/discovering-symbols

Check failure on line 39 in src/DataProvider/Provider/Data/CategoryProductStreamAssociationProvider.php

View workflow job for this annotation

GitHub Actions / Extension Verifier (lowest)

phpstan/argument.type

Parameter #1 ...$queries of method Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria::addFilter() expects Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\Filter, Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter given.
$criteria->addSorting(
new FieldSorting('level'),
new FieldSorting('autoIncrement')
Expand All @@ -61,9 +58,7 @@
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('productStreamId', null),
]));
$criteria->addFilter(new NotEqualsFilter('productStreamId', null));

return $this->readTotalFromRepo($this->categoryRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -39,7 +38,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addSorting(new FieldSorting('id'));
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [new EqualsFilter('referencedDocumentId', null)]));
$criteria->addFilter(new NotEqualsFilter('referencedDocumentId', null));

$searchResult = $this->documentRepo->search($criteria, $context);

Expand All @@ -58,7 +57,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [new EqualsFilter('referencedDocumentId', null)]));
$criteria->addFilter(new NotEqualsFilter('referencedDocumentId', null));

return $this->readTotalFromRepo($this->documentRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -38,7 +37,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addSorting(new FieldSorting('id'));
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [new EqualsFilter('parentId', null)]));
$criteria->addFilter(new NotEqualsFilter('parentId', null));
$result = $context->scope(Context::SYSTEM_SCOPE, function (Context $context) use ($criteria) {
return $this->mediaFolderRepo->search($criteria, $context);
});
Expand All @@ -57,7 +56,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [new EqualsFilter('parentId', null)]));
$criteria->addFilter(new NotEqualsFilter('parentId', null));

return $context->scope(Context::SYSTEM_SCOPE, function (Context $context) use ($criteria) {
return $this->readTotalFromRepo($this->mediaFolderRepo, $context, $criteria);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand Down Expand Up @@ -40,9 +39,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$this->addBundleExclusionFilter($criteria);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('canonicalProductId', null),
]));
$criteria->addFilter(new NotEqualsFilter('canonicalProductId', null));
$criteria->addSorting(new FieldSorting('id'));
$result = $this->productRepo->search($criteria, $context)->getEntities();

Expand All @@ -62,9 +59,7 @@ public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$this->addBundleExclusionFilter($criteria);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('canonicalProductId', null),
]));
$criteria->addFilter(new NotEqualsFilter('canonicalProductId', null));

return $this->readTotalFromRepo($this->productRepo, $context, $criteria);
}
Expand All @@ -75,9 +70,7 @@ private function addBundleExclusionFilter(Criteria $criteria): void
return;
}

$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('type', self::BUNDLE_PRODUCT_TYPE),
]));
$criteria->addFilter(new NotEqualsFilter('type', self::BUNDLE_PRODUCT_TYPE));
}

private function hasTypeColumn(): bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand Down Expand Up @@ -40,9 +39,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$this->addBundleExclusionFilter($criteria);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('cmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('cmsPageId', null));
$criteria->addSorting(new FieldSorting('id'));
$result = $this->productRepo->search($criteria, $context)->getEntities();

Expand All @@ -62,9 +59,7 @@ public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$this->addBundleExclusionFilter($criteria);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('cmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('cmsPageId', null));

return $this->readTotalFromRepo($this->productRepo, $context, $criteria);
}
Expand All @@ -75,9 +70,7 @@ private function addBundleExclusionFilter(Criteria $criteria): void
return;
}

$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('type', self::BUNDLE_PRODUCT_TYPE),
]));
$criteria->addFilter(new NotEqualsFilter('type', self::BUNDLE_PRODUCT_TYPE));
}

private function hasTypeColumn(): bool
Expand Down
7 changes: 2 additions & 5 deletions src/DataProvider/Provider/Data/ProductProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand Down Expand Up @@ -130,9 +129,7 @@ private function addBundleExclusionFilter(Criteria $criteria): void
}

$criteria->addFilter(
new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('type', self::BUNDLE_PRODUCT_TYPE),
])
new NotEqualsFilter('type', self::BUNDLE_PRODUCT_TYPE)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
Expand All @@ -38,9 +37,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addSorting(new FieldSorting('id'));
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [
new EqualsFilter('parentId', null),
]));
$criteria->addFilter(new NotEqualsFilter('parentId', null));
$result = $this->productStreamFilterRepo->search($criteria, $context);

$cleanResult = $this->cleanupSearchResult($result, [
Expand All @@ -60,9 +57,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_OR, [
new EqualsFilter('parentId', null),
]));
$criteria->addFilter(new NotEqualsFilter('parentId', null));

return $this->readTotalFromRepo($this->productStreamFilterRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Sorting\FieldSorting;
use Shopware\Core\Framework\Log\Package;
use Shopware\Core\System\SalesChannel\SalesChannelCollection;
Expand All @@ -37,9 +36,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
$criteria = new Criteria();
$criteria->setLimit($limit);
$criteria->setOffset($offset);
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('homeCmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('homeCmsPageId', null));
$criteria->addSorting(new FieldSorting('id'));
$result = $this->salesChannelRepo->search($criteria, $context)->getEntities();

Expand All @@ -58,9 +55,7 @@ public function getProvidedData(int $limit, int $offset, Context $context): arra
public function getProvidedTotal(Context $context): int
{
$criteria = new Criteria();
$criteria->addFilter(new NotFilter(NotFilter::CONNECTION_AND, [
new EqualsFilter('homeCmsPageId', null),
]));
$criteria->addFilter(new NotEqualsFilter('homeCmsPageId', null));

return $this->readTotalFromRepo($this->salesChannelRepo, $context, $criteria);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Migration\Connection\SwagMigrationConnectionCollection;

Expand All @@ -39,9 +38,7 @@ public function searchDuplicates(?string $fingerprint, Context $context, ?string
$criteria->addFilter(new EqualsFilter('sourceSystemFingerprint', $fingerprint));

if (isset($excludeConnectionId)) {
$criteria->addFilter(new NotFilter(MultiFilter::CONNECTION_AND, [
new EqualsFilter('id', $excludeConnectionId),
]));
$criteria->addFilter(new NotEqualsFilter('id', $excludeConnectionId));
}

return $this->connectionRepo->searchIds($criteria, $context)->getTotal() > 0;
Expand Down
7 changes: 2 additions & 5 deletions src/Migration/Connection/MigrationConnectionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\MultiFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotEqualsFilter;
use Shopware\Core\Framework\Log\Package;
use SwagMigrationAssistant\Exception\MigrationException;
use SwagMigrationAssistant\Migration\Connection\Fingerprint\MigrationFingerprintServiceInterface;
Expand Down Expand Up @@ -54,9 +53,7 @@ public function validate(
// check that the connection name is unique
$criteria = new Criteria();
$criteria->addFilter(new EqualsFilter('name', $connectionEntity->getName()));
$criteria->addFilter(new NotFilter(MultiFilter::CONNECTION_AND, [
new EqualsFilter('id', $connectionEntity->getId()),
]));
$criteria->addFilter(new NotEqualsFilter('id', $connectionEntity->getId()));
$existingConnection = $this->migrationConnectionRepo->search($criteria, $context)->getEntities()->first();
if ($existingConnection !== null) {
throw MigrationException::connectionNameNotUnique();
Expand Down
Loading