@@ -170,6 +170,9 @@ discard block |
||
170 | 170 | return $collection; |
171 | 171 | } |
172 | 172 | |
173 | + /** |
|
174 | + * @param ReadCriteria $criteria |
|
175 | + */ |
|
173 | 176 | private function joinBasic(?Criteria $criteria, string $definition, Context $context, string $root, QueryBuilder $query, FieldCollection $fields, bool $raw = false): void |
174 | 177 | { |
175 | 178 | /** @var EntityDefinition $definition */ |
@@ -484,6 +487,9 @@ discard block |
||
484 | 487 | return false; |
485 | 488 | } |
486 | 489 | |
490 | + /** |
|
491 | + * @param EntityCollection $details |
|
492 | + */ |
|
487 | 493 | private function removeInheritance(string $definition, $details): void |
488 | 494 | { |
489 | 495 | /** @var string|EntityDefinition $definition */ |
@@ -7,6 +7,7 @@ discard block |
||
7 | 7 | use Shopware\Core\Framework\ORM\Entity; |
8 | 8 | use Shopware\Core\Framework\ORM\EntityCollection; |
9 | 9 | use Shopware\Core\Framework\ORM\EntityDefinition; |
10 | +use Shopware\Core\Framework\ORM\FieldCollection; |
|
10 | 11 | use Shopware\Core\Framework\ORM\Field\AssociationInterface; |
11 | 12 | use Shopware\Core\Framework\ORM\Field\ChildrenAssociationField; |
12 | 13 | use Shopware\Core\Framework\ORM\Field\Field; |
@@ -14,7 +15,6 @@ discard block |
||
14 | 15 | use Shopware\Core\Framework\ORM\Field\ManyToOneAssociationField; |
15 | 16 | use Shopware\Core\Framework\ORM\Field\OneToManyAssociationField; |
16 | 17 | use Shopware\Core\Framework\ORM\Field\TranslatedField; |
17 | -use Shopware\Core\Framework\ORM\FieldCollection; |
|
18 | 18 | use Shopware\Core\Framework\ORM\Read\EntityReaderInterface; |
19 | 19 | use Shopware\Core\Framework\ORM\Read\ReadCriteria; |
20 | 20 | use Shopware\Core\Framework\ORM\Search\Criteria; |
@@ -13,13 +13,13 @@ |
||
13 | 13 | use Shopware\Core\Framework\ORM\EntityDefinition; |
14 | 14 | use Shopware\Core\Framework\ORM\Event\EntityWrittenContainerEvent; |
15 | 15 | use Shopware\Core\Framework\ORM\Event\EntityWrittenEvent; |
16 | +use Shopware\Core\Framework\ORM\FieldCollection; |
|
16 | 17 | use Shopware\Core\Framework\ORM\Field\AssociationInterface; |
17 | 18 | use Shopware\Core\Framework\ORM\Field\Field; |
18 | 19 | use Shopware\Core\Framework\ORM\Field\ManyToManyAssociationField; |
19 | 20 | use Shopware\Core\Framework\ORM\Field\ManyToOneAssociationField; |
20 | 21 | use Shopware\Core\Framework\ORM\Field\OneToManyAssociationField; |
21 | 22 | use Shopware\Core\Framework\ORM\Field\TranslationsAssociationField; |
22 | -use Shopware\Core\Framework\ORM\FieldCollection; |
|
23 | 23 | use Shopware\Core\Framework\ORM\Write\Flag\Inherited; |
24 | 24 | use Shopware\Core\Framework\Struct\Uuid; |
25 | 25 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
@@ -13,8 +13,8 @@ |
||
13 | 13 | use Shopware\Core\Framework\ORM\Search\AggregatorResult; |
14 | 14 | use Shopware\Core\Framework\ORM\Search\Criteria; |
15 | 15 | use Shopware\Core\Framework\ORM\Search\EntityAggregatorInterface; |
16 | -use Shopware\Core\Framework\ORM\Search\EntitySearcherInterface; |
|
17 | 16 | use Shopware\Core\Framework\ORM\Search\EntitySearchResult; |
17 | +use Shopware\Core\Framework\ORM\Search\EntitySearcherInterface; |
|
18 | 18 | use Shopware\Core\Framework\ORM\Write\WriteContext; |
19 | 19 | use Shopware\Core\Framework\Struct\ArrayStruct; |
20 | 20 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
@@ -3,12 +3,12 @@ |
||
3 | 3 | namespace Shopware\Core\Framework\ORM\Search\Term; |
4 | 4 | |
5 | 5 | use Shopware\Core\Framework\ORM\EntityDefinition; |
6 | +use Shopware\Core\Framework\ORM\FieldCollection; |
|
6 | 7 | use Shopware\Core\Framework\ORM\Field\AssociationInterface; |
7 | 8 | use Shopware\Core\Framework\ORM\Field\Field; |
8 | 9 | use Shopware\Core\Framework\ORM\Field\ManyToManyAssociationField; |
9 | 10 | use Shopware\Core\Framework\ORM\Field\StringField; |
10 | 11 | use Shopware\Core\Framework\ORM\Field\TranslatedField; |
11 | -use Shopware\Core\Framework\ORM\FieldCollection; |
|
12 | 12 | use Shopware\Core\Framework\ORM\Search\Query\MatchQuery; |
13 | 13 | use Shopware\Core\Framework\ORM\Search\Query\ScoreQuery; |
14 | 14 | use Shopware\Core\Framework\ORM\Search\Query\TermQuery; |
@@ -17,7 +17,6 @@ |
||
17 | 17 | use Shopware\Core\Framework\ORM\Search\Query\TermQuery; |
18 | 18 | use Shopware\Core\Framework\ORM\Search\Sorting\FieldSorting; |
19 | 19 | use Shopware\Core\PlatformRequest; |
20 | -use Shopware\Storefront\Exception\CustomerNotFoundException; |
|
21 | 20 | use Shopware\Storefront\Page\Account\AccountService; |
22 | 21 | use Shopware\Storefront\Page\Account\AddressSaveRequest; |
23 | 22 | use Shopware\Storefront\Page\Account\EmailSaveRequest; |
@@ -23,10 +23,10 @@ |
||
23 | 23 | use Shopware\Core\Framework\Struct\Collection; |
24 | 24 | use Shopware\Core\Framework\Struct\Struct; |
25 | 25 | use Shopware\Core\Framework\Struct\Uuid; |
26 | -use Shopware\Core\Framework\Version\Aggregate\VersionCommit\VersionCommitCollection; |
|
27 | -use Shopware\Core\Framework\Version\Aggregate\VersionCommit\VersionCommitDefinition; |
|
28 | 26 | use Shopware\Core\Framework\Version\Aggregate\VersionCommitData\VersionCommitDataDefinition; |
29 | 27 | use Shopware\Core\Framework\Version\Aggregate\VersionCommitData\VersionCommitDataStruct; |
28 | +use Shopware\Core\Framework\Version\Aggregate\VersionCommit\VersionCommitCollection; |
|
29 | +use Shopware\Core\Framework\Version\Aggregate\VersionCommit\VersionCommitDefinition; |
|
30 | 30 | use Shopware\Core\Framework\Version\VersionDefinition; |
31 | 31 | use Shopware\Core\PlatformRequest; |
32 | 32 | use Symfony\Component\HttpFoundation\RequestStack; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Shopware\Core\Framework\Routing\Exception\TouchpointNotFoundException; |
7 | 7 | use Shopware\Core\Framework\Struct\Uuid; |
8 | 8 | use Shopware\Core\PlatformRequest; |
9 | -use Symfony\Component\HttpFoundation\Request; |
|
10 | 9 | use Symfony\Component\HttpFoundation\Request as SymfonyRequest; |
11 | 10 | |
12 | 11 | class TouchpointRequestContextResolver implements RequestContextResolverInterface |
@@ -12,6 +12,7 @@ discard block |
||
12 | 12 | use Shopware\Core\Framework\ORM\EntityDefinition; |
13 | 13 | use Shopware\Core\Framework\ORM\Event\EntityWrittenContainerEvent; |
14 | 14 | use Shopware\Core\Framework\ORM\Exception\DefinitionNotFoundException; |
15 | +use Shopware\Core\Framework\ORM\FieldCollection; |
|
15 | 16 | use Shopware\Core\Framework\ORM\Field\AssociationInterface; |
16 | 17 | use Shopware\Core\Framework\ORM\Field\Field; |
17 | 18 | use Shopware\Core\Framework\ORM\Field\ManyToManyAssociationField; |
@@ -20,7 +21,6 @@ discard block |
||
20 | 21 | use Shopware\Core\Framework\ORM\Field\ReferenceVersionField; |
21 | 22 | use Shopware\Core\Framework\ORM\Field\TenantIdField; |
22 | 23 | use Shopware\Core\Framework\ORM\Field\VersionField; |
23 | -use Shopware\Core\Framework\ORM\FieldCollection; |
|
24 | 24 | use Shopware\Core\Framework\ORM\Read\ReadCriteria; |
25 | 25 | use Shopware\Core\Framework\ORM\RepositoryInterface; |
26 | 26 | use Shopware\Core\Framework\ORM\Search\Criteria; |
@@ -37,7 +37,6 @@ discard block |
||
37 | 37 | use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; |
38 | 38 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
39 | 39 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
40 | -use Symfony\Component\Serializer\Exception\InvalidArgumentException; |
|
41 | 40 | use Symfony\Component\Serializer\Exception\UnexpectedValueException; |
42 | 41 | use Symfony\Component\Serializer\Serializer; |
43 | 42 |
@@ -11,7 +11,6 @@ |
||
11 | 11 | use Shopware\Core\Checkout\Order\Exception\CustomerNotLoggedInException; |
12 | 12 | use Shopware\Core\Checkout\Payment\Exception\PaymentMethodNotFoundHttpException; |
13 | 13 | use Shopware\Core\Framework\Struct\Uuid; |
14 | -use Shopware\Storefront\Exception\CustomerNotFoundException; |
|
15 | 14 | use Shopware\Storefront\Page\Account\AccountService; |
16 | 15 | use Shopware\Storefront\Page\Account\AddressSaveRequest; |
17 | 16 | use Shopware\Storefront\Page\Account\CustomerAddressPageLoader; |