Skip to content

Commit d30f7ad

Browse files
committed
Merge branch '4.6' into ibx_9060
2 parents 1d7ee73 + 969d2ec commit d30f7ad

File tree

67 files changed

+416
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+416
-272
lines changed

.github/workflows/reviewers.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: On PR Review Requested
2+
3+
on:
4+
pull_request:
5+
types: [review_requested]
6+
7+
jobs:
8+
call-expand-team-reviewers:
9+
if: ${{ github.event.requested_team }}
10+
uses: ibexa/gh-workflows/.github/workflows/expand-team-reviewers.yml@main
11+
with:
12+
requested_team: ${{ github.event.requested_team.slug }}
13+
pull_request_number: ${{ github.event.pull_request.number }}
14+
repository: ${{ github.repository }}
15+
secrets: inherit

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"ibexa/rest": "~4.6.0@dev",
5656
"ibexa/polyfill-php82": "^1.0",
5757
"ibexa/search": "~4.6.x-dev",
58+
"ibexa/twig-components": "~4.6.x-dev",
5859
"babdev/pagerfanta-bundle": "^2.1",
5960
"knplabs/knp-menu-bundle": "^3.0",
6061
"mck89/peast": "^1.9",

phpstan-baseline.neon

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,12 +1728,6 @@ parameters:
17281728
count: 1
17291729
path: src/bundle/View/Template/EzPagerfantaTemplate.php
17301730

1731-
-
1732-
message: '#^Method Ibexa\\Contracts\\AdminUi\\Component\\Renderable\:\:render\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
1733-
identifier: missingType.iterableValue
1734-
count: 1
1735-
path: src/contracts/Component/Renderable.php
1736-
17371731
-
17381732
message: '#^Method Ibexa\\Contracts\\AdminUi\\Component\\Renderer\\RendererInterface\:\:renderGroup\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
17391733
identifier: missingType.iterableValue
@@ -4266,36 +4260,12 @@ parameters:
42664260
count: 1
42674261
path: src/lib/Component/LinkComponent.php
42684262

4269-
-
4270-
message: '#^Cannot access offset string on Ibexa\\Contracts\\AdminUi\\Component\\Renderable\.$#'
4271-
identifier: offsetAccess.nonOffsetAccessible
4272-
count: 1
4273-
path: src/lib/Component/Registry.php
4274-
4275-
-
4276-
message: '#^Method Ibexa\\AdminUi\\Component\\Registry\:\:getComponents\(\) should return array\<Ibexa\\Contracts\\AdminUi\\Component\\Renderable\> but returns array\|Ibexa\\Contracts\\AdminUi\\Component\\Renderable\.$#'
4277-
identifier: return.type
4278-
count: 1
4279-
path: src/lib/Component/Registry.php
4280-
42814263
-
42824264
message: '#^Method Ibexa\\AdminUi\\Component\\Registry\:\:setComponents\(\) has no return type specified\.$#'
42834265
identifier: missingType.return
42844266
count: 1
42854267
path: src/lib/Component/Registry.php
42864268

4287-
-
4288-
message: '#^Method Ibexa\\AdminUi\\Component\\Registry\:\:setComponents\(\) has parameter \$components with no value type specified in iterable type array\.$#'
4289-
identifier: missingType.iterableValue
4290-
count: 1
4291-
path: src/lib/Component/Registry.php
4292-
4293-
-
4294-
message: '#^Property Ibexa\\AdminUi\\Component\\Registry\:\:\$components \(array\<Ibexa\\Contracts\\AdminUi\\Component\\Renderable\>\) does not accept array\<array\|Ibexa\\Contracts\\AdminUi\\Component\\Renderable\>\.$#'
4295-
identifier: assign.propertyType
4296-
count: 1
4297-
path: src/lib/Component/Registry.php
4298-
42994269
-
43004270
message: '#^Method Ibexa\\AdminUi\\Component\\Renderer\\DefaultRenderer\:\:renderGroup\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
43014271
identifier: missingType.iterableValue
@@ -4320,30 +4290,12 @@ parameters:
43204290
count: 1
43214291
path: src/lib/Component/Renderer/DefaultRenderer.php
43224292

4323-
-
4324-
message: '#^Property Ibexa\\AdminUi\\Component\\Renderer\\DefaultRenderer\:\:\$eventDispatcher has no type specified\.$#'
4325-
identifier: missingType.property
4326-
count: 1
4327-
path: src/lib/Component/Renderer/DefaultRenderer.php
4328-
4329-
-
4330-
message: '#^Property Ibexa\\AdminUi\\Component\\Renderer\\DefaultRenderer\:\:\$registry has no type specified\.$#'
4331-
identifier: missingType.property
4332-
count: 1
4333-
path: src/lib/Component/Renderer/DefaultRenderer.php
4334-
43354293
-
43364294
message: '#^Method Ibexa\\AdminUi\\Component\\ScriptComponent\:\:render\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
43374295
identifier: missingType.iterableValue
43384296
count: 1
43394297
path: src/lib/Component/ScriptComponent.php
43404298

4341-
-
4342-
message: '#^Method Ibexa\\AdminUi\\Component\\Search\\GlobalSearchTwigComponent\:\:render\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
4343-
identifier: missingType.iterableValue
4344-
count: 1
4345-
path: src/lib/Component/Search/GlobalSearchTwigComponent.php
4346-
43474299
-
43484300
message: '#^Method Ibexa\\AdminUi\\Component\\TabsComponent\:\:__construct\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
43494301
identifier: missingType.iterableValue
@@ -4368,12 +4320,6 @@ parameters:
43684320
count: 1
43694321
path: src/lib/Component/TabsComponent.php
43704322

4371-
-
4372-
message: '#^Method Ibexa\\AdminUi\\Component\\TabsComponent\:\:render\(\) has parameter \$parameters with no value type specified in iterable type array\.$#'
4373-
identifier: missingType.iterableValue
4374-
count: 1
4375-
path: src/lib/Component/TabsComponent.php
4376-
43774323
-
43784324
message: '#^Property Ibexa\\AdminUi\\Component\\TabsComponent\:\:\$parameters type has no value type specified in iterable type array\.$#'
43794325
identifier: missingType.iterableValue
@@ -5202,12 +5148,6 @@ parameters:
52025148
count: 1
52035149
path: src/lib/Form/Data/ContentType/Translation/TranslationRemoveData.php
52045150

5205-
-
5206-
message: '#^Property Ibexa\\AdminUi\\Form\\Data\\ContentTypeData\:\:\$isNew in isset\(\) is not nullable nor uninitialized\.$#'
5207-
identifier: isset.initializedProperty
5208-
count: 1
5209-
path: src/lib/Form/Data/ContentTypeData.php
5210-
52115151
-
52125152
message: '#^Method Ibexa\\AdminUi\\Form\\Data\\ContentTypeGroup\\ContentTypeGroupCreateData\:\:setIdentifier\(\) has no return type specified\.$#'
52135153
identifier: missingType.return
@@ -14460,18 +14400,6 @@ parameters:
1446014400
count: 1
1446114401
path: src/lib/View/Provider/ContentTranslateView/Configured.php
1446214402

14463-
-
14464-
message: '#^Method Ibexa\\Tests\\Bundle\\AdminUi\\DependencyInjection\\Compiler\\ComponentPassTest\:\:testProcess\(\) has no return type specified\.$#'
14465-
identifier: missingType.return
14466-
count: 1
14467-
path: tests/bundle/DependencyInjection/Compiler/ComponentPassTest.php
14468-
14469-
-
14470-
message: '#^Method Ibexa\\Tests\\Bundle\\AdminUi\\DependencyInjection\\Compiler\\ComponentPassTest\:\:testProcessWithNoGroup\(\) has no return type specified\.$#'
14471-
identifier: missingType.return
14472-
count: 1
14473-
path: tests/bundle/DependencyInjection/Compiler/ComponentPassTest.php
14474-
1447514403
-
1447614404
message: '#^Method Ibexa\\Tests\\Bundle\\AdminUi\\DependencyInjection\\Compiler\\FieldTypeFormMapperDispatcherPassTest\:\:tagsProvider\(\) return type has no value type specified in iterable type array\.$#'
1447714405
identifier: missingType.iterableValue

src/bundle/DependencyInjection/Compiler/ComponentPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616

17+
/**
18+
* @deprecated 4.6.19 The {@see \Ibexa\Bundle\AdminUi\DependencyInjection\Compiler\ComponentPass} class is deprecated, will be removed in 5.0.
19+
* Use {@see \Ibexa\Bundle\TwigComponents\DependencyInjection\Compiler\ComponentPass} instead
20+
*/
1721
class ComponentPass implements CompilerPassInterface
1822
{
1923
use PriorityTaggedServiceTrait;

src/bundle/Resources/config/services/components.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ services:
4242
Ibexa\Contracts\AdminUi\Component\Renderer\RendererInterface: '@Ibexa\AdminUi\Component\Renderer\DefaultRenderer'
4343

4444
ibexa.adminui.layout.content.after:
45-
parent: Ibexa\AdminUi\Component\TwigComponent
45+
parent: Ibexa\TwigComponents\Component\TemplateComponent
4646
arguments:
4747
$template: '@@ibexadesign/ui/layout_content_after.html.twig'
4848
tags:
49-
- { name: ibexa.admin_ui.component, group: 'layout-content-after' }
49+
- { name: ibexa.twig.component, group: 'admin-ui-layout-content-after' }
50+
51+
Ibexa\AdminUi\Component\EventSubscriber\RenderEventSubscriber:
52+
tags:
53+
- { name: kernel.event_subscriber }

src/bundle/Resources/config/services/components/content/edit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services:
66

77
Ibexa\AdminUi\Component\Content\PreviewUnavailableTwigComponent:
88
tags:
9-
- { name: ibexa.admin_ui.component, group: 'content-edit-form-before' }
9+
- { name: ibexa.twig.component, group: 'admin-ui-content-edit-form-before' }
1010

1111
Ibexa\AdminUi\Component\Content\ContentEditMetaFieldsComponent:
1212
tags:
13-
- { name: ibexa.admin_ui.component, group: 'content-edit-sections' }
13+
- { name: ibexa.twig.component, group: 'admin-ui-content-edit-sections' }

src/bundle/Resources/config/services/components/content_type/edit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ services:
66

77
Ibexa\AdminUi\Component\ContentType\ContentTypeEditMetaFieldsComponent:
88
tags:
9-
- { name: ibexa.admin_ui.component, group: 'content-type-edit-sections' }
9+
- { name: ibexa.twig.component, group: 'admin-ui-content-type-edit-sections' }

src/bundle/Resources/config/services/components/layout.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ services:
88
autowire: true
99
public: false
1010
tags:
11-
- { name: ibexa.admin_ui.component, group: global-search }
11+
- { name: ibexa.twig.component, group: admin-ui-global-search }
1212

1313
ibexa.admin_ui.component.user_menu:
14-
class: Ibexa\AdminUi\Component\TwigComponent
14+
parent: Ibexa\TwigComponents\Component\TemplateComponent
1515
arguments:
1616
$template: '@@ibexadesign/ui/user_menu.html.twig'
1717
tags:
18-
- { name: ibexa.admin_ui.component, group: user-menu }
18+
- { name: ibexa.twig.component, group: admin-ui-user-menu }
1919

2020
ibexa.search.autocomplete.content_template:
2121
parent: Ibexa\AdminUi\Component\TabsComponent
2222
arguments:
2323
$template: '@@ibexadesign/ui/global_search_autocomplete_content_template.html.twig'
2424
$groupIdentifier: 'global-search-autocomplete-content'
2525
tags:
26-
- { name: ibexa.admin_ui.component, group: global-search-autocomplete-templates }
26+
- { name: ibexa.twig.component, group: admin-ui-global-search-autocomplete-templates }

src/bundle/Resources/config/services/dashboard.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,29 @@ services:
5050
public: false
5151

5252
ibexa.adminui.dashboard.me:
53-
parent: Ibexa\AdminUi\Component\TwigComponent
53+
parent: Ibexa\TwigComponents\Component\TemplateComponent
5454
arguments:
5555
$template: '@@ibexadesign/ui/dashboard/block/me.html.twig'
5656
tags:
57-
- { name: ibexa.admin_ui.component, group: 'dashboard-blocks' }
57+
- { name: ibexa.twig.component, group: 'admin-ui-dashboard-blocks' }
5858

5959
ibexa.adminui.dashboard.all:
60-
parent: Ibexa\AdminUi\Component\TwigComponent
60+
parent: Ibexa\TwigComponents\Component\TemplateComponent
6161
arguments:
6262
$template: '@@ibexadesign/ui/dashboard/block/all.html.twig'
6363
tags:
64-
- { name: ibexa.admin_ui.component, group: 'dashboard-blocks' }
64+
- { name: ibexa.twig.component, group: 'admin-ui-dashboard-blocks' }
6565

6666
ibexa.adminui.dashboard.my.tab_groups:
6767
parent: Ibexa\AdminUi\Component\TabsComponent
6868
arguments:
6969
$groupIdentifier: 'dashboard-my'
7070
tags:
71-
- { name: ibexa.admin_ui.component, group: 'dashboard-my-tab-groups' }
71+
- { name: ibexa.twig.component, group: 'admin-ui-dashboard-my-tab-groups' }
7272

7373
ibexa.adminui.dashboard.all.tab_groups:
7474
parent: Ibexa\AdminUi\Component\TabsComponent
7575
arguments:
7676
$groupIdentifier: 'dashboard-everyone'
7777
tags:
78-
- { name: ibexa.admin_ui.component, group: 'dashboard-all-tab-groups' }
78+
- { name: ibexa.twig.component, group: 'admin-ui-dashboard-all-tab-groups' }

src/bundle/Resources/config/services/tabs/content_type.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ services:
1212
$template: '@@ibexadesign/ui/tab/content_type.html.twig'
1313
$groupIdentifier: 'content-type'
1414
tags:
15-
- { name: ibexa.admin_ui.component, group: 'content-type-tab-groups' }
15+
- { name: ibexa.twig.component, group: 'admin-ui-content-type-tab-groups' }

0 commit comments

Comments
 (0)