@@ -32,9 +32,9 @@ |
||
32 | 32 | use Shopware\Core\Framework\ORM\Write\FieldException\InvalidFieldException; |
33 | 33 | use Shopware\Core\Framework\ORM\Write\Flag\Required; |
34 | 34 | use Shopware\Core\Framework\Struct\Uuid; |
35 | -use Symfony\Component\Validator\Constraints\Choice; |
|
36 | 35 | use Symfony\Component\Validator\ConstraintViolation; |
37 | 36 | use Symfony\Component\Validator\ConstraintViolationList; |
37 | +use Symfony\Component\Validator\Constraints\Choice; |
|
38 | 38 | |
39 | 39 | class CatalogField extends FkField |
40 | 40 | { |
@@ -143,7 +143,7 @@ |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
146 | - * @param string|EntityDefinition $definition |
|
146 | + * @param string $definition |
|
147 | 147 | * @param array $primaryKey |
148 | 148 | * @param WriteCommandQueue $commandQueue |
149 | 149 | * |
@@ -36,6 +36,7 @@ |
||
36 | 36 | { |
37 | 37 | /** |
38 | 38 | * {@inheritdoc} |
39 | + * @param string $view |
|
39 | 40 | */ |
40 | 41 | protected function renderStorefront($view, array $parameters = [], Response $response = null): Response |
41 | 42 | { |
@@ -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; |
@@ -15,7 +16,6 @@ discard block |
||
15 | 16 | use Shopware\Core\Framework\ORM\Field\OneToManyAssociationField; |
16 | 17 | use Shopware\Core\Framework\ORM\Field\SearchKeywordAssociationField; |
17 | 18 | use Shopware\Core\Framework\ORM\Field\TranslatedField; |
18 | -use Shopware\Core\Framework\ORM\FieldCollection; |
|
19 | 19 | use Shopware\Core\Framework\ORM\Read\EntityReaderInterface; |
20 | 20 | use Shopware\Core\Framework\ORM\Read\ReadCriteria; |
21 | 21 | 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; |
@@ -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; |
@@ -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 |
@@ -39,6 +39,9 @@ |
||
39 | 39 | */ |
40 | 40 | protected $versionReference; |
41 | 41 | |
42 | + /** |
|
43 | + * @param string $storageName |
|
44 | + */ |
|
42 | 45 | public function __construct(string $definition, ?string $storageName = null) |
43 | 46 | { |
44 | 47 | /** @var string|EntityDefinition $definition */ |
@@ -52,6 +52,7 @@ |
||
52 | 52 | /** |
53 | 53 | * @param string $definition |
54 | 54 | * @param string ...$identifierOrder |
55 | + * @param string[] $identifierOrder |
|
55 | 56 | */ |
56 | 57 | public function setOrder(string $definition, string ...$identifierOrder): void |
57 | 58 | { |