Skip to content

Commit 549e888

Browse files
committed
Merge branch 'develop'
2 parents 3e38393 + 46b570c commit 549e888

12 files changed

+1411
-1573
lines changed

.github/workflows/pr.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
php: ['8.1']
27+
php: ['8.2']
2828
steps:
2929
- uses: actions/checkout@master
3030
- name: Setup PHP, with composer and extensions
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
php: ['8.1']
53+
php: ['8.2']
5454
steps:
5555
- uses: actions/checkout@master
5656
- name: Setup PHP, with composer and extensions
@@ -78,7 +78,7 @@ jobs:
7878
strategy:
7979
fail-fast: false
8080
matrix:
81-
php: ['8.1']
81+
php: ['8.2']
8282
steps:
8383
- uses: actions/checkout@master
8484
- name: Setup PHP, with composer and extensions
@@ -105,9 +105,9 @@ jobs:
105105
runs-on: ubuntu-20.04
106106
steps:
107107
- uses: actions/checkout@master
108-
- uses: actions/setup-node@v1
108+
- uses: actions/setup-node@v3
109109
with:
110-
node-version: '18.x'
110+
node-version: 20
111111
- name: install
112112
run: yarn install
113113
- name: JS coding standards

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
## [1.6.5] - 2023-10-10
12+
13+
* [PR-77](https://github.com/itk-dev/kunstdatabasen/pull/77)
14+
Applied search filter on export
15+
* [PR-76](https://github.com/itk-dev/kunstdatabasen/pull/76)
16+
Updated composer packages
17+
1118
## [1.6.4] - 2023-09-18
1219

1320
* [PR-74](https://github.com/itk-dev/kunstdatabasen/pull/74)
@@ -52,7 +59,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
5259

5360
## [1.0.0] - yyyy-mm-dd
5461

55-
[Unreleased]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.4...HEAD
62+
[Unreleased]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.5...HEAD
63+
[1.6.5]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.4...1.6.5
5664
[1.6.4]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.4...1.6.3
5765
[1.6.3]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.3...1.6.2
5866
[1.6.2]: https://github.com/itk-dev/kunstdatabasen/compare/1.6.2...1.6.1

composer.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@
77
"php": ">=8.1",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
10-
"cweagans/composer-patches": "^1.7",
1110
"doctrine/doctrine-bundle": "^2.10",
1211
"doctrine/doctrine-migrations-bundle": "^3.2",
1312
"doctrine/orm": "^2.15",
1413
"itk-dev/web-accessibility-statement-bundle": "^1.1",
15-
"knplabs/knp-paginator-bundle": "*",
16-
"liip/imagine-bundle": "*",
14+
"knplabs/knp-paginator-bundle": "^6.2",
15+
"liip/imagine-bundle": "^2.12",
1716
"ocramius/doctrine-batch-utils": "^2.5",
1817
"openspout/openspout": "^4.15",
1918
"phpdocumentor/reflection-docblock": "^5.3",
2019
"phpoffice/phpspreadsheet": "^1.29",
2120
"phpstan/phpdoc-parser": "^1.23",
22-
"stof/doctrine-extensions-bundle": "*",
21+
"stof/doctrine-extensions-bundle": "^1.8",
2322
"symfony/console": "6.3.*",
2423
"symfony/dotenv": "6.3.*",
2524
"symfony/flex": "^2",
@@ -32,7 +31,7 @@
3231
"symfony/serializer": "6.3.*",
3332
"symfony/twig-bundle": "6.3.*",
3433
"symfony/validator": "6.3.*",
35-
"symfony/webpack-encore-bundle": "*",
34+
"symfony/webpack-encore-bundle": "^2.1",
3635
"symfony/yaml": "6.3.*",
3736
"twig/extra-bundle": "^2.12|^3.0",
3837
"twig/twig": "^2.12|^3.0",
@@ -41,8 +40,8 @@
4140
"require-dev": {
4241
"friendsofphp/php-cs-fixer": "^3.22",
4342
"friendsoftwig/twigcs": "^6.2",
44-
"hautelook/alice-bundle": "*",
45-
"symfony/maker-bundle": "*",
43+
"hautelook/alice-bundle": "^2.12",
44+
"symfony/maker-bundle": "^1.51",
4645
"symfony/web-profiler-bundle": "6.3.*"
4746
},
4847
"config": {
@@ -114,11 +113,6 @@
114113
"symfony": {
115114
"allow-contrib": true,
116115
"require": "6.3.*"
117-
},
118-
"patches": {
119-
"gedmo/doctrine-extensions": {
120-
"https://github.com/doctrine-extensions/DoctrineExtensions/pull/2651": "patches/doctrine-extension1.patch"
121-
}
122116
}
123117
}
124118
}

0 commit comments

Comments
 (0)