Skip to content

Commit 529c7c7

Browse files
mnoconmnocon
committed
Merge remote-tracking branch 'origin/release-4.6.22' into solr9
2 parents 13ce071 + e934874 commit 529c7c7

File tree

32 files changed

+962
-75
lines changed

32 files changed

+962
-75
lines changed

‎code_samples/back_office/components/twig_components.yaml‎

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

‎code_samples/back_office/search/src/Query/SymbolAttributeTypeQuery.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php declare(strict_types=1);
2+
3+
use Ibexa\Contracts\ProductCatalog\Values\Product\ProductQuery;
4+
use Ibexa\Contracts\ProductCatalogSymbolAttribute\Search\Criterion\SymbolAttribute;
5+
6+
$query = new ProductQuery();
7+
$query->setFilter(new SymbolAttribute('ean', ['5023920187205']));
8+
/** @var \Ibexa\Contracts\ProductCatalog\ProductServiceInterface $productService */
9+
$results = $productService->findProducts($query);

‎code_samples/data_migration/examples/delete_content.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-
2+
type: content
3+
mode: delete
4+
match:
5+
field: content_remote_id
6+
value: __REMOTE_ID__
7+
only_visible_content: true # Optional, default: true. If set to true, only visible content will be deleted.
8+
allow_no_delete: false # Optional, default: false. If set to true, the migration will not fail if no content is found using the specified criteria.

‎code_samples/pim/Symbol/Format/Checksum/LuhnChecksum.php‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\PIM\Symbol\Format\Checksum;
6+
7+
use Ibexa\Contracts\ProductCatalog\Values\AttributeDefinitionInterface;
8+
use Ibexa\Contracts\ProductCatalogSymbolAttribute\Value\ChecksumInterface;
9+
10+
final class LuhnChecksum implements ChecksumInterface
11+
{
12+
public function validate(AttributeDefinitionInterface $attributeDefinition, string $value): bool
13+
{
14+
$digits = $this->getDigits($value);
15+
16+
$count = count($digits);
17+
$total = 0;
18+
for ($i = $count - 2; $i >= 0; $i -= 2) {
19+
$digit = $digits[$i];
20+
if ($i % 2 === 0) {
21+
$digit *= 2;
22+
}
23+
24+
$total += $digit > 9 ? $digit - 9 : $digit;
25+
}
26+
27+
$checksum = $digits[$count - 1];
28+
29+
return $total + $checksum === 0;
30+
}
31+
32+
/**
33+
* Returns an array of digits from the given value (skipping any formatting characters).
34+
*
35+
* @return int[]
36+
*/
37+
private function getDigits(string $value): array
38+
{
39+
$chars = array_filter(
40+
str_split($value),
41+
static fn (string $char): bool => $char !== '-'
42+
);
43+
44+
return array_map('intval', array_values($chars));
45+
}
46+
}

‎code_samples/symbol_attribute/config/mysql/symbol_attribute.sql‎

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

‎code_samples/symbol_attribute/config/postgresql/symbol_attribute.sql‎

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;

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
"ibexa/twig-components": "~4.6.x-dev",
7171
"ibexa/tree-builder": "~4.6.x-dev",
7272
"ibexa/discounts": "~4.6.x-dev",
73-
"ibexa/discounts-codes": "~4.6.x-dev"
73+
"ibexa/discounts-codes": "~4.6.x-dev",
74+
"ibexa/product-catalog-symbol-attribute": "~4.6.x-dev"
7475
},
7576
"scripts": {
7677
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",

‎docs/administration/back_office/back_office_elements/custom_components.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ The available groups for the back office are:
4747
|`admin-ui-systeminfo-tab-groups`| `vendor/ibexa/system-info/src/bundle/Resources/views/themes/admin/system_info/info.html.twig` |
4848
|`admin-ui-user-menu`| `vendor/ibexa/admin-ui-ui/src/bundle/Resources/views/themes/admin/ui/layout.html.twig` |
4949
|`admin-ui-user-profile-blocks`| `vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig` |
50+
|`admin-ui-versions-table-before`|`vendor/ibexa/admin-ui/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig`|
5051

5152
For more information, see [this example using few of those components](components.md#example).
5253

‎docs/content_management/data_migration/importing_data.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,12 @@ In this case you assign the `parent_folder_location_id` reference name to the lo
243243
[[= include_file('code_samples/data_migration/examples/create_parent_and_child_content.yaml') =]]
244244
```
245245

246+
Use the `delete` mode to delete content items:
247+
248+
``` yaml
249+
[[= include_file('code_samples/data_migration/examples/delete_content.yaml') =]]
250+
```
251+
246252
### Images
247253

248254
The following example shows how to migrate an `example-image.png` located in `public/var/site/storage/images/3/8/3/0/383-1-eng-GB` without manually placing it in the appropriate path.

‎docs/ibexa_products/editions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ The features brought by LTS Updates become standard parts of the next LTS releas
6565
| [AI Actions](ai_actions_guide.md) | &#10004; | &#10004; | &#10004; |
6666
| [Date and time attribute type](date_and_time.md) | &#10004; | &#10004; | &#10004; |
6767
| [Discounts](discounts.md) | | | &#10004; |
68+
| [Symbol attribute type](symbol_attribute_type.md) | &#10004; | &#10004; | &#10004; |

0 commit comments

Comments
 (0)