Skip to content

Commit 2d145d9

Browse files
committed
Merge with master
2 parents e340850 + fe2978c commit 2d145d9

4 files changed

Lines changed: 2127 additions & 2247 deletions

File tree

‎.valet-sh.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ services:
22
composer:
33
version: 2
44
php:
5-
version: 8.1
5+
version: 8.3

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
## Bugfixes
1313

14+
* Fix composer dependency, remove phpcpd
15+
1416
* **import-ee:**
1517
* Fix table alias for category entity_id
1618

‎composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@
4949
"pdepend/pdepend": "^2.16.2",
5050
"phpmd/phpmd": "^2.15.0",
5151
"phpunit/phpunit": "~9.5.0|~10.5.0|~11.2.5",
52-
"sebastian/phpcpd": "~6.0",
5352
"squizlabs/php_codesniffer": "^3.10.1",
5453
"consolidation/robo": "~4.0.2",
5554
"mikey179/vfsstream": "~1.6.11",
5655
"symfony/dotenv": "~6.0.19",
57-
"symfony/http-kernel": "~4.4.51",
56+
"symfony/http-kernel": "^5.4|^6.4",
5857
"behat/mink-extension": "^2.3.1",
5958
"dmore/chrome-mink-driver": "^2.9.3",
6059
"dmore/behat-chrome-extension": "^1.4.0",

0 commit comments

Comments
 (0)