Skip to content

Commit 227d54c

Browse files
committed
Merge branch 'master' into enh-languagecode
2 parents 3764e59 + 7f22a70 commit 227d54c

File tree

36 files changed

+74
-524
lines changed

36 files changed

+74
-524
lines changed

code_samples/api/public_php_api/src/Command/ViewContentMetaDataCommand.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
5353
$user = $this->userService->loadUserByLogin('admin');
5454
$this->permissionResolver->setCurrentUserReference($user);
5555

56-
$contentId = $input->getArgument('contentId');
56+
$contentId = (int) $input->getArgument('contentId');
5757

5858
// Metadata
5959
$contentInfo = $this->contentService->loadContentInfo($contentId);
@@ -99,10 +99,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
9999

100100
// Relations
101101
$versionInfo = $this->contentService->loadVersionInfo($contentInfo);
102-
$relations = $this->contentService->loadRelations($versionInfo);
103-
foreach ($relations as $relation) {
104-
$name = $relation->destinationContentInfo->name;
105-
$output->writeln('Relation to content ' . $name);
102+
$relationCount = $this->contentService->countRelations($versionInfo);
103+
$relationList = $this->contentService->loadRelationList($versionInfo, 0, $relationCount);
104+
foreach ($relationList as $relationListItem) {
105+
$name = $relationListItem->hasRelation() ? $relationListItem->getRelation()->destinationContentInfo->name : '(Unauthorized)';
106+
$output->writeln("Relation to content '$name'");
106107
}
107108

108109
// Owner

code_samples/front/embed_content/src/Controller/RelationController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public function showContentAction(View $view, $locationId): View
2525
$location = $this->locationService->loadLocation($locationId);
2626
$contentInfo = $location->getContentInfo();
2727
$versionInfo = $this->contentService->loadVersionInfo($contentInfo);
28-
$relations = $this->contentService->loadRelations($versionInfo);
28+
$relationList = $this->contentService->loadRelationList($versionInfo);
2929

3030
$items = [];
3131

32-
foreach ($relations as $relation) {
33-
if (in_array($relation->getDestinationContentInfo()->getContentType()->identifier, $acceptedContentTypes)) {
34-
$items[] = $this->contentService->loadContentByContentInfo($relation->getDestinationContentInfo());
32+
foreach ($relationList as $relationListItem) {
33+
if ($relationListItem->hasRelation() && in_array($relationListItem->getRelation()->getDestinationContentInfo()->getContentType()->identifier, $acceptedContentTypes)) {
34+
$items[] = $this->contentService->loadContentByContentInfo($relationListItem->getRelation()->getDestinationContentInfo());
3535
}
3636
}
3737

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-ActivityLog-Values-ActivityLog-ActivityGroupListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36269,24 +36269,7 @@ <h1 id="ActivityGroupListInterface">
3626936269

3627036270

3627136271

36272-
36273-
<h5 class="phpdocumentor-tag-list__heading">
36274-
Tags
36275-
<a href="classes/Ibexa-Contracts-ActivityLog-Values-ActivityLog-ActivityGroupListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36276-
36277-
</h5>
36278-
<dl class="phpdocumentor-tag-list">
36279-
<dt class="phpdocumentor-tag-list__entry">
36280-
<span class="phpdocumentor-tag__name">Extends</span>
36281-
</dt>
36282-
<dd class="phpdocumentor-tag-list__definition">
36283-
<section class="phpdocumentor-description">
36284-
<p>IteratorAggregate&lt;\Ibexa\Contracts\ActivityLog\Values\ActivityLog\ActivityLogGroupInterface&gt;</p>
36285-
36286-
</section>
36287-
36288-
</dd>
36289-
</dl>
36272+
3629036273

3629136274

3629236275

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Cart-Value-CartListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36264,24 +36264,7 @@ <h1 id="CartListInterface">
3626436264

3626536265

3626636266

36267-
36268-
<h5 class="phpdocumentor-tag-list__heading">
36269-
Tags
36270-
<a href="classes/Ibexa-Contracts-Cart-Value-CartListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36271-
36272-
</h5>
36273-
<dl class="phpdocumentor-tag-list">
36274-
<dt class="phpdocumentor-tag-list__entry">
36275-
<span class="phpdocumentor-tag__name">Extends</span>
36276-
</dt>
36277-
<dd class="phpdocumentor-tag-list__definition">
36278-
<section class="phpdocumentor-description">
36279-
<p>\IteratorAggregate&lt;\Ibexa\Contracts\Cart\Value\CartInterface&gt;</p>
36280-
36281-
</section>
36282-
36283-
</dd>
36284-
</dl>
36267+
3628536268

3628636269

3628736270

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Checkout-Value-PaymentMethod-PaymentMethodListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36268,24 +36268,7 @@ <h1 id="PaymentMethodListInterface">
3626836268

3626936269

3627036270

36271-
36272-
<h5 class="phpdocumentor-tag-list__heading">
36273-
Tags
36274-
<a href="classes/Ibexa-Contracts-Checkout-Value-PaymentMethod-PaymentMethodListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36275-
36276-
</h5>
36277-
<dl class="phpdocumentor-tag-list">
36278-
<dt class="phpdocumentor-tag-list__entry">
36279-
<span class="phpdocumentor-tag__name">Extends</span>
36280-
</dt>
36281-
<dd class="phpdocumentor-tag-list__definition">
36282-
<section class="phpdocumentor-description">
36283-
<p>IteratorAggregate&lt;\Ibexa\Contracts\Checkout\Value\PaymentMethod\PaymentMethodInterface&gt;</p>
36284-
36285-
</section>
36286-
36287-
</dd>
36288-
</dl>
36271+
3628936272

3629036273

3629136274

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-CorePersistence-Gateway-AbstractTranslationGateway.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36268,24 +36268,7 @@ <h1 id="AbstractTranslationGateway">
3626836268

3626936269

3627036270

36271-
36272-
<h5 class="phpdocumentor-tag-list__heading">
36273-
Tags
36274-
<a href="classes/Ibexa-Contracts-CorePersistence-Gateway-AbstractTranslationGateway.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36275-
36276-
</h5>
36277-
<dl class="phpdocumentor-tag-list">
36278-
<dt class="phpdocumentor-tag-list__entry">
36279-
<span class="phpdocumentor-tag__name">Extends</span>
36280-
</dt>
36281-
<dd class="phpdocumentor-tag-list__definition">
36282-
<section class="phpdocumentor-description">
36283-
<p>\Ibexa\Contracts\CorePersistence\Gateway\AbstractDoctrineDatabase&lt;T&gt;</p>
36284-
36285-
</section>
36286-
36287-
</dd>
36288-
</dl>
36271+
3628936272

3629036273

3629136274

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Measurement-Product-Query-Criterion-AbstractMeasurementAttribute.html

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36273,27 +36273,7 @@ <h1 id="AbstractMeasurementAttribute">
3627336273

3627436274

3627536275

36276-
36277-
<h5 class="phpdocumentor-tag-list__heading">
36278-
Tags
36279-
<a href="classes/Ibexa-Contracts-Measurement-Product-Query-Criterion-AbstractMeasurementAttribute.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36280-
36281-
</h5>
36282-
<dl class="phpdocumentor-tag-list">
36283-
<dt class="phpdocumentor-tag-list__entry">
36284-
<span class="phpdocumentor-tag__name">Extends</span>
36285-
</dt>
36286-
<dd class="phpdocumentor-tag-list__definition">
36287-
<section class="phpdocumentor-description">
36288-
<p>\Ibexa\Contracts\ProductCatalog\Values\Product\Query\Criterion\AbstractAttribute&lt;
36289-
\Ibexa\Contracts\Measurement\Value\SimpleValueInterface,</p>
36290-
<blockquote>
36291-
</blockquote>
36292-
36293-
</section>
36294-
36295-
</dd>
36296-
</dl>
36276+
3629736277

3629836278

3629936279

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-OrderManagement-Value-Order-OrderListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36268,24 +36268,7 @@ <h1 id="OrderListInterface">
3626836268

3626936269

3627036270

36271-
36272-
<h5 class="phpdocumentor-tag-list__heading">
36273-
Tags
36274-
<a href="classes/Ibexa-Contracts-OrderManagement-Value-Order-OrderListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36275-
36276-
</h5>
36277-
<dl class="phpdocumentor-tag-list">
36278-
<dt class="phpdocumentor-tag-list__entry">
36279-
<span class="phpdocumentor-tag__name">Extends</span>
36280-
</dt>
36281-
<dd class="phpdocumentor-tag-list__definition">
36282-
<section class="phpdocumentor-description">
36283-
<p>IteratorAggregate&lt;\Ibexa\Contracts\OrderManagement\Value\Order\OrderInterface&gt;</p>
36284-
36285-
</section>
36286-
36287-
</dd>
36288-
</dl>
36271+
3628936272

3629036273

3629136274

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Personalization-Value-ItemGroupListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36263,24 +36263,7 @@ <h1 id="ItemGroupListInterface">
3626336263

3626436264

3626536265

36266-
36267-
<h5 class="phpdocumentor-tag-list__heading">
36268-
Tags
36269-
<a href="classes/Ibexa-Contracts-Personalization-Value-ItemGroupListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36270-
36271-
</h5>
36272-
<dl class="phpdocumentor-tag-list">
36273-
<dt class="phpdocumentor-tag-list__entry">
36274-
<span class="phpdocumentor-tag__name">Extends</span>
36275-
</dt>
36276-
<dd class="phpdocumentor-tag-list__definition">
36277-
<section class="phpdocumentor-description">
36278-
<p>Traversable&lt;\Ibexa\Contracts\Personalization\Value\ItemGroupInterface&gt;</p>
36279-
36280-
</section>
36281-
36282-
</dd>
36283-
</dl>
36266+
3628436267

3628536268

3628636269

docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Personalization-Value-ItemListInterface.html

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36263,24 +36263,7 @@ <h1 id="ItemListInterface">
3626336263

3626436264

3626536265

36266-
36267-
<h5 class="phpdocumentor-tag-list__heading">
36268-
Tags
36269-
<a href="classes/Ibexa-Contracts-Personalization-Value-ItemListInterface.html#tags" class="headerlink"><i class="fas fa-link"></i></a>
36270-
36271-
</h5>
36272-
<dl class="phpdocumentor-tag-list">
36273-
<dt class="phpdocumentor-tag-list__entry">
36274-
<span class="phpdocumentor-tag__name">Extends</span>
36275-
</dt>
36276-
<dd class="phpdocumentor-tag-list__definition">
36277-
<section class="phpdocumentor-description">
36278-
<p>Traversable&lt;\Ibexa\Contracts\Personalization\Value\ItemInterface&gt;</p>
36279-
36280-
</section>
36281-
36282-
</dd>
36283-
</dl>
36266+
3628436267

3628536268

3628636269

0 commit comments

Comments
 (0)