Skip to content

Commit fbac77e

Browse files
committed
Merge remote-tracking branch 'origin/5.0' into rector-symfony-7.2
2 parents de050cd + bd703e1 commit fbac77e

File tree

35 files changed

+913
-459
lines changed

35 files changed

+913
-459
lines changed
Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
ibexa_twig_components:
22
admin-ui-user-menu:
3-
custom-html-component:
4-
type: html
5-
arguments:
6-
content: '<b>Hello world!</b>'
7-
custom-template-component:
8-
type: template
9-
arguments:
10-
template: '@ibexadesign/ui/component/user_thumbnail/user_thumbnail.html.twig'
11-
parameters:
12-
user_content:
13-
name: "Thumbnail"
14-
thumbnail:
15-
resource: https://placecats.com/100/100
163
custom-controller-component:
174
type: controller
185
arguments:
196
controller: '\App\Controller\MyController::requestAction'
207
parameters:
218
parameter1: 'custom'
229
parameter2: true
23-
admin-ui-stylesheet-head:
24-
custom-link-component:
25-
type: stylesheet
10+
custom-html-component:
11+
type: html
12+
priority: 0
2613
arguments:
27-
href: 'https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i%7CRoboto+Mono:400,400i,700,700i&amp;display=fallback'
28-
rel: stylesheet
29-
crossorigin: anonymous
30-
integrity: sha384-LN/mLhO/GN6Ge8ZPvI7uRsZpiXmtSkep+aFlJcHa8by4TvA34o1am9sa88eUzKTD
31-
type: text/css
14+
content: '<b>Hello world!</b>'
15+
admin-ui-user-menu:
16+
duplicated_user_menu:
17+
type: menu
18+
arguments:
19+
name: ezplatform_admin_ui.menu.user
20+
template: '@ibexadesign/ui/menu/user.html.twig'
21+
depth: 1
3222
admin-ui-script-head:
3323
custom-script-component:
3424
type: script
@@ -39,3 +29,23 @@ ibexa_twig_components:
3929
async: true
4030
integrity: sha384-Ewi2bBDtPbbu4/+fs8sIbBJ3zVl0LDOSznfhFR/JBK+SzggdRdX8XQKauWmI9HH2
4131
type: text/javascript
32+
admin-ui-stylesheet-head:
33+
custom-link-component:
34+
type: stylesheet
35+
arguments:
36+
href: 'https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i%7CRoboto+Mono:400,400i,700,700i&amp;display=fallback'
37+
rel: stylesheet
38+
crossorigin: anonymous
39+
integrity: sha384-LN/mLhO/GN6Ge8ZPvI7uRsZpiXmtSkep+aFlJcHa8by4TvA34o1am9sa88eUzKTD
40+
type: text/css
41+
admin-ui-global-search:
42+
custom-template-component:
43+
type: template
44+
priority: 50
45+
arguments:
46+
template: '@ibexadesign/ui/component/user_thumbnail/user_thumbnail.html.twig'
47+
parameters:
48+
user_content:
49+
name: "Thumbnail"
50+
thumbnail:
51+
resource: https://placecats.com/100/100
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
type: discount_code
2+
mode: create
3+
code: summer10
4+
global_usage_limit: 100 # Optional
5+
user_usage_limit: 5 # Optional
6+
created_at: '2023-01-01T12:00:00+00:00' # Optional
7+
creator_id: 42 # Optional

code_samples/discounts/src/Command/ManageDiscountsCommand.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4646
$discountCodeCreateStruct = new DiscountCodeCreateStruct(
4747
'summer10',
4848
10, // Global usage limit
49-
null, // Unlimited usage
49+
null, // Unlimited usage per customer
5050
$this->permissionResolver->getCurrentUserReference()->getUserId(),
5151
$now
5252
);
@@ -69,7 +69,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
6969
$discountCode->getCode(),
7070
$discountCode->getGlobalLimit(),
7171
$discountCode->getUsedLimit()
72-
), ])
72+
),
73+
])
7374
->setTranslations([
7475
new DiscountTranslationStruct('eng-GB', 'Discount name', 'This is a discount description', 'Promotion Label', 'Promotion Description'),
7576
new DiscountTranslationStruct('ger-DE', 'Discount name (German)', 'Description (German)', 'Promotion Label (German)', 'Promotion Description (German)'),

code_samples/forms/custom_form_attribute/config/custom_services.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
$typeIdentifier: 'checkbox_with_richtext_description'
1919
$twig: '@twig'
2020
tags:
21-
- { name: ibexa.form_builder.field_submission_converter }
21+
- { name: ibexa.form_builder.field.submission.converter }

code_samples/front/render_content_in_php/src/Command/ViewCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4141

4242
$viewParameters = [
4343
'viewType' => $input->getOption('view-type'),
44-
'_controller' => 'ibexa_content:viewAction',
44+
'_controller' => 'ibexa_content::viewAction',
4545
];
4646

4747
if (!empty($locationId)) {

code_samples/search/custom/config/field_mapper_services.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
services:
2-
App\Search\Mapper\WebinarEventTitleFulltextFieldMapper:
2+
App\Search\FieldMapper\WebinarEventParentNameFieldMapper:
33
arguments:
44
- '@Ibexa\Contracts\Core\Persistence\Content\Handler'
55
- '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler'
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Ibexa\Contracts\Core\Search;
99
use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper;
1010

11-
class WebinarEventTitleFulltextFieldMapper extends ContentFieldMapper
11+
class WebinarEventParentNameFieldMapper extends ContentFieldMapper
1212
{
1313
public function __construct(
1414
protected ContentHandler $contentHandler,
@@ -20,9 +20,12 @@ public function __construct(
2020
public function accept(Content $content): bool
2121
{
2222
// ContentType with ID 42 is webinar event
23-
return $content->versionInfo->contentInfo->contentTypeId == 42;
23+
return $content->versionInfo->contentInfo->contentTypeId === 42;
2424
}
2525

26+
/**
27+
* @return \Ibexa\Contracts\Core\Search\Field[]
28+
*/
2629
public function mapFields(Content $content): array
2730
{
2831
$mainLocationId = $content->versionInfo->contentInfo->mainLocationId;
@@ -32,9 +35,9 @@ public function mapFields(Content $content): array
3235

3336
return [
3437
new Search\Field(
35-
'fulltext',
38+
'parent_name',
3639
$parentContentInfo->name,
37-
new Search\FieldType\FullTextField()
40+
new Search\FieldType\StringField()
3841
),
3942
];
4043
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CREATE TABLE ibexa_product_specification_attribute_symbol (id INT NOT NULL, value VARCHAR(160) DEFAULT NULL, INDEX ibexa_product_specification_attribute_symbol_value_idx (value), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_520_ci` ENGINE = InnoDB;
2+
ALTER TABLE ibexa_product_specification_attribute_symbol ADD CONSTRAINT ibexa_product_specification_attribute_symbol_fk FOREIGN KEY (id) REFERENCES ibexa_product_specification_attribute (id) ON UPDATE CASCADE ON DELETE CASCADE
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CREATE TABLE ibexa_product_specification_attribute_symbol (id INT NOT NULL, value VARCHAR(160) DEFAULT NULL, PRIMARY KEY(id));
2+
CREATE INDEX ibexa_product_specification_attribute_symbol_value_idx ON ibexa_product_specification_attribute_symbol (value);
3+
ALTER TABLE ibexa_product_specification_attribute_symbol ADD CONSTRAINT ibexa_product_specification_attribute_symbol_fk FOREIGN KEY (id) REFERENCES ibexa_product_specification_attribute (id) ON UPDATE CASCADE ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div class="row">
22
<div class="block-form {{ block_class }}">
33
{{ ibexa_http_cache_tag_relation_location_ids(locationId) }}
4-
{{ render(controller('ibexa_content:viewAction', {
4+
{{ render(controller('ibexa_content::viewAction', {
55
'contentId': contentId,
66
'locationId': locationId,
77
'viewType': 'embed'
88
})) }}
99
<style type="text/css">{{ block_style|raw }}</style>
1010
</div>
11-
</div>
11+
</div>

0 commit comments

Comments
 (0)