Skip to content

Commit af9df28

Browse files
authored
Merge branch 'main' into feature/IBX-10186
2 parents 8a99030 + 75a933c commit af9df28

File tree

1,886 files changed

+16492
-30395
lines changed

Some content is hidden

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

1,886 files changed

+16492
-30395
lines changed

.eslintrc.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
php:
17-
- '8.0'
17+
- '8.3'
1818
steps:
1919
- uses: actions/checkout@v4
2020

@@ -26,13 +26,38 @@ jobs:
2626
extensions: 'pdo_sqlite, gd'
2727
tools: cs2pr
2828

29-
- uses: "ramsey/composer-install@v3"
29+
- uses: ramsey/composer-install@v3
3030
with:
31-
dependency-versions: "highest"
31+
dependency-versions: highest
3232

3333
- name: Run code style check
3434
run: composer run-script check-cs -- --format=checkstyle | cs2pr
3535

36+
rector:
37+
name: Run rector
38+
runs-on: "ubuntu-22.04"
39+
strategy:
40+
matrix:
41+
php:
42+
- '8.3'
43+
steps:
44+
- uses: actions/checkout@v4
45+
46+
- name: Setup PHP Action
47+
uses: shivammathur/setup-php@v2
48+
with:
49+
php-version: ${{ matrix.php }}
50+
coverage: none
51+
extensions: 'pdo_sqlite, gd'
52+
tools: cs2pr
53+
54+
- uses: ramsey/composer-install@v3
55+
with:
56+
dependency-versions: highest
57+
58+
- name: Run rector
59+
run: vendor/bin/rector process --dry-run --ansi
60+
3661
tests:
3762
name: Tests
3863
runs-on: "ubuntu-24.04"
@@ -42,9 +67,7 @@ jobs:
4267
fail-fast: false
4368
matrix:
4469
php:
45-
- '7.4'
46-
- '8.0'
47-
- '8.1'
70+
- '8.3'
4871

4972
steps:
5073
- uses: actions/checkout@v4
@@ -57,10 +80,9 @@ jobs:
5780
extensions: pdo_sqlite, gd
5881
tools: cs2pr
5982

60-
- uses: "ramsey/composer-install@v3"
83+
- uses: ramsey/composer-install@v3
6184
with:
62-
dependency-versions: "highest"
63-
composer-options: "--prefer-dist --no-progress"
85+
dependency-versions: highest
6486

6587
- name: Setup problem matchers for PHPUnit
6688
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -94,12 +116,10 @@ jobs:
94116
strategy:
95117
matrix:
96118
php:
97-
- '7.4'
98-
- '8.0'
99-
- '8.1'
119+
- '8.3'
100120

101121
steps:
102-
- uses: actions/checkout@v3
122+
- uses: actions/checkout@v4
103123

104124
- name: Setup PHP Action
105125
uses: shivammathur/setup-php@v2
@@ -109,9 +129,9 @@ jobs:
109129
extensions: pdo_pgsql, gd
110130
tools: cs2pr
111131

112-
- uses: ramsey/composer-install@v2
132+
- uses: ramsey/composer-install@v3
113133
with:
114-
dependency-versions: "highest"
134+
dependency-versions: highest
115135

116136
- name: Setup problem matchers for PHPUnit
117137
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -149,12 +169,10 @@ jobs:
149169
fail-fast: false
150170
matrix:
151171
php:
152-
- '7.4'
153-
- '8.0'
154-
- '8.1'
172+
- '8.3'
155173

156174
steps:
157-
- uses: actions/checkout@v3
175+
- uses: actions/checkout@v4
158176

159177
- name: Setup PHP Action
160178
uses: shivammathur/setup-php@v2
@@ -164,9 +182,9 @@ jobs:
164182
extensions: pdo_mysql, gd
165183
tools: cs2pr
166184

167-
- uses: ramsey/composer-install@v2
185+
- uses: ramsey/composer-install@v3
168186
with:
169-
dependency-versions: "highest"
187+
dependency-versions: highest
170188

171189
- name: Setup problem matchers for PHPUnit
172190
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

.github/workflows/frontend-ci.yaml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@ name: Frontend build
22

33
on:
44
push:
5+
paths:
6+
- "**.cjs"
7+
- "**.mjs"
8+
- "**.js"
9+
- "**.jsx"
10+
- "**.ts"
11+
- "**.tsx"
12+
- "**.scss"
513
branches:
614
- main
715
- '[0-9]+.[0-9]+'
8-
pull_request: ~
16+
pull_request:
17+
paths:
18+
- "**.cjs"
19+
- "**.mjs"
20+
- "**.js"
21+
- "**.jsx"
22+
- "**.ts"
23+
- "**.tsx"
24+
- "**.scss"
925

1026
jobs:
1127
frontend-test:
@@ -14,9 +30,9 @@ jobs:
1430
timeout-minutes: 5
1531

1632
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/setup-node@v2
33+
- uses: actions/checkout@v4
34+
- uses: actions/setup-node@v4
1935
with:
20-
node-version: '18'
36+
node-version: '20'
2137
- run: yarn install
2238
- run: yarn test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ package-lock.json
1010
.phpunit.result.cache
1111
composer.lock
1212
/var
13+
tsconfig.json

behat_suites.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ browser:
6464
admin-ui-full:
6565
paths:
6666
- '%paths.base%/vendor/ibexa/admin-ui/features/'
67-
contexts:
67+
contexts:
6868
- Ibexa\Behat\API\Context\ContentContext
6969
- Ibexa\Behat\API\Context\ContentTypeContext
7070
- Ibexa\Behat\API\Context\RoleContext

composer.json

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@
1010
"psr-4": {
1111
"Ibexa\\AdminUi\\": "src/lib/",
1212
"Ibexa\\Bundle\\AdminUi\\": "src/bundle/",
13-
"Ibexa\\Contracts\\AdminUi\\": "src/contracts/",
14-
"EzSystems\\EzPlatformAdminUiBundle\\": "src/bundle/",
15-
"EzSystems\\EzPlatformAdminUi\\": "src/lib/",
16-
"EzSystems\\EzPlatformEncoreBundle\\": "src/bundle/",
17-
"Ibexa\\Platform\\Bundle\\Assets\\": "src/bundle/",
18-
"Ibexa\\Platform\\Assets\\": "src/lib/"
13+
"Ibexa\\Contracts\\AdminUi\\": "src/contracts/"
1914
}
2015
},
2116
"autoload-dev": {
@@ -26,66 +21,65 @@
2621
}
2722
},
2823
"require": {
29-
"php": "^7.4 || ^8.0",
24+
"php": " >=8.3",
3025
"ext-json": "*",
31-
"symfony/deprecation-contracts": "^2.5",
32-
"symfony/http-foundation": "^5.0",
33-
"symfony/security-core": "^5.0",
34-
"symfony/security-http": "^5.0",
35-
"symfony/translation": "^5.0",
36-
"symfony/validator": "^5.0",
37-
"symfony/form": "^5.0",
38-
"symfony/http-kernel": "^5.0",
39-
"symfony/config": "^5.0",
40-
"symfony/dependency-injection": "^5.0",
41-
"symfony/console": "^5.0",
42-
"symfony/event-dispatcher": "^5.0",
43-
"symfony/filesystem": "^5.0",
44-
"symfony/routing": "^5.0",
45-
"symfony/options-resolver": "^5.0",
46-
"symfony/asset": "^5.0",
47-
"symfony/yaml": "^5.0",
48-
"symfony/webpack-encore-bundle": "^v1.17",
49-
"jms/translation-bundle": "^1.5",
50-
"ibexa/core": "~4.6.0@dev",
51-
"ibexa/content-forms": "~4.6.0@dev",
52-
"ibexa/design-engine": "~4.6.0@dev",
53-
"ibexa/user": "~4.6.0@dev",
54-
"ibexa/fieldtype-richtext": "~4.6.0@dev",
55-
"ibexa/rest": "~4.6.0@dev",
26+
"babdev/pagerfanta-bundle": "^4.5",
27+
"ibexa/content-forms": "~5.0.x-dev",
28+
"ibexa/core": "~5.0.x-dev",
29+
"ibexa/design-engine": "~5.0.x-dev",
5630
"ibexa/polyfill-php82": "^1.0",
57-
"ibexa/search": "~4.6.x-dev",
58-
"ibexa/twig-components": "~4.6.x-dev",
59-
"babdev/pagerfanta-bundle": "^2.1",
31+
"ibexa/rest": "~5.0.x-dev",
32+
"ibexa/search": "~5.0.x-dev",
33+
"ibexa/twig-components": "~5.0.x-dev",
34+
"ibexa/user": "~5.0.x-dev",
35+
"jms/translation-bundle": "^2.4",
6036
"knplabs/knp-menu-bundle": "^3.0",
6137
"mck89/peast": "^1.9",
62-
"willdurand/js-translation-bundle": "^4.0",
63-
"twig/twig": "^3.0",
38+
"symfony/asset": "^7.2",
39+
"symfony/config": "^7.2",
40+
"symfony/console": "^7.2",
41+
"symfony/dependency-injection": "^7.2",
42+
"symfony/deprecation-contracts": "^2.5 || ^3.0",
43+
"symfony/event-dispatcher": "^7.2",
44+
"symfony/filesystem": "^7.2",
45+
"symfony/form": "^7.2",
46+
"symfony/http-foundation": "^7.2",
47+
"symfony/http-kernel": "^7.2",
48+
"symfony/options-resolver": "^7.2",
49+
"symfony/routing": "^7.2",
50+
"symfony/security-core": "^7.2",
51+
"symfony/security-http": "^7.2",
52+
"symfony/translation": "^7.2",
53+
"symfony/validator": "^7.2",
54+
"symfony/webpack-encore-bundle": "^2.2",
55+
"symfony/yaml": "^7.2",
6456
"twig/intl-extra": "^3.0",
65-
"twig/string-extra": "^3.0"
57+
"twig/string-extra": "^3.0",
58+
"twig/twig": "^3.0",
59+
"willdurand/js-translation-bundle": "^6.1"
6660
},
6761
"require-dev": {
6862
"ext-zip": "*",
69-
"dama/doctrine-test-bundle": "^v6.7",
70-
"ibexa/ci-scripts": "^0.2@dev",
71-
"ibexa/behat": "~4.6.0@dev",
72-
"friendsofphp/php-cs-fixer": "^3.0",
73-
"phpunit/phpunit": "^9.5",
74-
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
75-
"ibexa/doctrine-schema": "~4.6.0@dev",
76-
"ibexa/http-cache": "~4.6.0@dev",
77-
"ibexa/code-style": "^1.3.x-dev",
78-
"ibexa/notifications": "~4.6.0@dev",
79-
"ibexa/test-rest": "^0.1.x-dev",
80-
"ibexa/test-core": "^0.1.x-dev",
63+
"dama/doctrine-test-bundle": "^8.2",
64+
"ibexa/behat": "~5.0.x-dev",
65+
"ibexa/code-style": "~2.0.0",
66+
"ibexa/doctrine-schema": "~5.0.x-dev",
67+
"ibexa/http-cache": "~5.0.x-dev",
68+
"ibexa/notifications": "~5.0.x-dev",
69+
"ibexa/rector": "~5.0.x-dev",
70+
"ibexa/test-core": "~5.0.x-dev",
71+
"ibexa/test-rest": "~5.0.x-dev",
72+
"matthiasnoback/symfony-dependency-injection-test": "^5.0",
8173
"phpstan/phpstan": "^2.0",
8274
"phpstan/phpstan-phpunit": "^2.0",
83-
"phpstan/phpstan-symfony": "^2.0"
75+
"phpstan/phpstan-symfony": "^2.0",
76+
"phpunit/phpunit": "^9.5"
8477
},
8578
"config": {
8679
"allow-plugins": {
8780
"*": false
88-
}
81+
},
82+
"sort-packages": true
8983
},
9084
"scripts": {
9185
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
@@ -100,7 +94,7 @@
10094
},
10195
"extra": {
10296
"branch-alias": {
103-
"dev-main": "4.6.x-dev"
97+
"dev-main": "5.0.x-dev"
10498
}
10599
}
106100
}

docs/field-type-validator-usage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Field Type Validator is a base class to validate inputs in a Field Type.
55
## How to use it?
66

77
```javascript
8-
class Validator extends window.eZ.BaseFieldValidator {
8+
class Validator extends window.ibexa.BaseFieldValidator {
99
validateInput(event) {
1010
// validation
1111

@@ -39,15 +39,15 @@ The `BaseFieldValidator` class has a few required properties. All of them are li
3939

4040
**classInvalid** _{String}_ - CSS class name to be added when field is invalid, example: 'is-invalid'.
4141

42-
**fieldSelector** _{String}_ - CSS selector of the field, example: '.ez-field-edit-ezstring',
42+
**fieldSelector** _{String}_ - CSS selector of the field, example: '.ez-field-edit-ibexa_string',
4343

4444
**eventsMap** _{Array}_ - events config:
45-
- **selector** _{String}_ - CSS selector of input (where to add an event listener), example: '.ez-field-edit-ezstring input'.
45+
- **selector** _{String}_ - CSS selector of input (where to add an event listener), example: '.ez-field-edit-ibexa_string input'.
4646
- **eventName** _{String}_ - event name, example: 'blur'.
4747
- **callback** _{String}_ - callback for event listener, example: 'validateInput', should return object with two params:
4848
- **isError** _{Boolean}_ - indicator of error state (true/false).
4949
- **errorMessage** _{String}_ - text of the error.
50-
- **invalidStateSelectors** {Array} - CSS selectors where to add invalid class, example: ['.ez-field-edit-ezstring'].
50+
- **invalidStateSelectors** {Array} - CSS selectors where to add invalid class, example: ['.ez-field-edit-ibexa_string'].
5151
- **errorNodeSelectors** {Array} - CSS selectors where to append an error message, example: ['.ez-field-edit-text-zone'].
5252

5353
## Useful methods

eslint.config.mjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import getIbexaConfig from '@ibexa/eslint-config/eslint';
2+
3+
export default [
4+
...getIbexaConfig(),
5+
];

features/standard/ContentTranslation.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ Feature: Content item transation
5151
And content attributes equal
5252
| label | value | fieldTypeIdentifier |
5353
| Name | Folder | |
54-
| Short name | This field is empty | ezstring |
55-
| Short description | This field is empty | ezrichtext |
56-
| Description | This field is empty | ezrichtext |
54+
| Short name | This field is empty | ibexa_string |
55+
| Short description | This field is empty | ibexa_richtext |
56+
| Description | This field is empty | ibexa_richtext |

0 commit comments

Comments
 (0)