Skip to content

Commit 46edda7

Browse files
committed
Merge branch '4.6' into ibx_9060
2 parents b173a02 + 79197e4 commit 46edda7

File tree

53 files changed

+1161
-211
lines changed

Some content is hidden

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

53 files changed

+1161
-211
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
cs-fix:
1212
name: Run code style check
13-
runs-on: "ubuntu-22.04"
13+
runs-on: "ubuntu-24.04"
1414
strategy:
1515
matrix:
1616
php:
@@ -35,7 +35,7 @@ jobs:
3535

3636
tests:
3737
name: Tests
38-
runs-on: "ubuntu-22.04"
38+
runs-on: "ubuntu-24.04"
3939
timeout-minutes: 10
4040

4141
strategy:
@@ -88,7 +88,7 @@ jobs:
8888
--health-timeout 5s
8989
--health-retries 5
9090
--tmpfs /var/lib/postgresql/data
91-
runs-on: "ubuntu-22.04"
91+
runs-on: "ubuntu-24.04"
9292
timeout-minutes: 20
9393

9494
strategy:
@@ -142,7 +142,7 @@ jobs:
142142
--health-timeout=5s
143143
--health-retries=5
144144
--tmpfs=/var/lib/mysql
145-
runs-on: "ubuntu-22.04"
145+
runs-on: "ubuntu-24.04"
146146
timeout-minutes: 20
147147

148148
strategy:

.github/workflows/frontend-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
frontend-test:
1212
name: Frontend build test
13-
runs-on: 'ubuntu-20.04'
13+
runs-on: 'ubuntu-24.04'
1414
timeout-minutes: 5
1515

1616
steps:

features/standard/ContentDraft.feature

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ Feature: Content items creation
3030
And there's draft "TestDraft" on Dashboard list
3131
When I start editing content draft "TestDraft"
3232
And I perform the "Delete draft" action
33-
Then I should be on Content view Page for root
34-
And I open the "Dashboard" page in admin SiteAccess
33+
Then I open the "Dashboard" page in admin SiteAccess
3534
And there's no draft "TestDraft" on Dashboard list
3635

3736
@javascript

phpstan-baseline.neon

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5208,6 +5208,12 @@ parameters:
52085208
count: 1
52095209
path: src/lib/Form/Data/ContentType/Translation/TranslationRemoveData.php
52105210

5211+
-
5212+
message: '#^Property Ibexa\\AdminUi\\Form\\Data\\ContentTypeData\:\:\$isNew in isset\(\) is not nullable nor uninitialized\.$#'
5213+
identifier: isset.initializedProperty
5214+
count: 1
5215+
path: src/lib/Form/Data/ContentTypeData.php
5216+
52115217
-
52125218
message: '#^Method Ibexa\\AdminUi\\Form\\Data\\ContentTypeGroup\\ContentTypeGroupCreateData\:\:setIdentifier\(\) has no return type specified\.$#'
52135219
identifier: missingType.return

src/bundle/Resources/config/services.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ imports:
44
- { resource: services/controller_argument_resolvers.yaml }
55
- { resource: services/controllers.yaml }
66
- { resource: services/tabs.yaml }
7+
- { resource: services/action_menu.yaml }
78
- { resource: services/menu.yaml }
89
- { resource: services/pagination.yaml }
910
- { resource: services/ui_config/* }
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
services:
2+
_defaults:
3+
autowire: true
4+
autoconfigure: true
5+
public: false
6+
7+
Ibexa\AdminUi\Menu\Action\DraftListActionMenuBuilder:
8+
tags:
9+
- { name: knp_menu.menu_builder, method: build, alias: ibexa.admin_ui.action.draft_list }
10+
11+
Ibexa\AdminUi\Menu\Action\VersionListActionMenuBuilder:
12+
tags:
13+
- { name: knp_menu.menu_builder, method: build, alias: ibexa.admin_ui.action.version_list }
14+
15+
ibexa.adminui.listener.draft_list_action_menu.reorder_by_order_number:
16+
class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener
17+
tags:
18+
- { name: kernel.event_listener, event: Ibexa\AdminUi\Menu\Action\DraftListActionMenuBuilder, method: reorderMenuItems, priority: -50 }
19+
20+
ibexa.adminui.listener.version_list_action_menu.reorder_by_order_number:
21+
class: Ibexa\AdminUi\Menu\Listener\ReorderByOrderNumberListener
22+
tags:
23+
- { name: kernel.event_listener, event: Ibexa\AdminUi\Menu\Action\VersionListActionMenuBuilder, method: reorderMenuItems, priority: -50 }

src/bundle/Resources/public/img/ibexa-icons.svg

Lines changed: 38 additions & 1 deletion
Loading
Lines changed: 13 additions & 0 deletions
Loading
Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)