Skip to content

Commit ca166ae

Browse files
Merge pull request #2932 from dpfaffenbauer/tests
[Test] run tests with lowest requirements
2 parents d1abb85 + 906e7e1 commit ca166ae

File tree

26 files changed

+117
-240
lines changed

26 files changed

+117
-240
lines changed

.github/workflows/behat.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ jobs:
5757
pimcore: ^12.3
5858
dependencies: highest
5959
allow-failure: false
60-
- php: 8.3
61-
pimcore: ^12.3
62-
dependencies: lowest
63-
allow-failure: false
6460
- php: 8.4
6561
pimcore: ^12.3
6662
dependencies: highest

.github/workflows/behat_ui.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ jobs:
5858
pimcore: ^12.3
5959
dependencies: highest
6060
allow-failure: false
61-
- php: 8.3
62-
pimcore: ^12.3
63-
dependencies: lowest
64-
allow-failure: false
6561
- php: 8.4
6662
pimcore: ^12.3
6763
dependencies: highest

composer.json

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@
8787
"require": {
8888
"php": "^8.3",
8989
"ext-json": "*",
90-
"doctrine/data-fixtures": "^1.5",
90+
"doctrine/data-fixtures": "^1.8",
9191
"doctrine/dbal": "^4.2",
9292
"doctrine/doctrine-bundle": "^2.4",
9393
"doctrine/doctrine-fixtures-bundle": "^3.4",
9494
"doctrine/orm": "^3.0",
9595
"fakerphp/faker": "^1.16",
9696
"gedmo/doctrine-extensions": "^3.11",
97-
"jms/serializer-bundle": "^5.0",
98-
"knplabs/knp-menu-bundle": "^3.1",
97+
"jms/serializer-bundle": "^5.5",
98+
"knplabs/knp-menu-bundle": "^3.7",
9999
"payum/payum": "1.7.x-dev",
100-
"payum/payum-bundle": "^2.6",
100+
"payum/payum-bundle": "^2.6.2",
101101
"php-http/guzzle7-adapter": "^1.0",
102102
"php-http/message-factory": "^1.1",
103103
"pimcore/admin-ui-classic-bundle": "^2.0",
@@ -106,9 +106,9 @@
106106
"pimcore/pimcore": "^12.3",
107107
"rinvex/countries": "^9.0",
108108
"sebastian/diff": "^4.0 | ^5.0 | ^6.0",
109-
"stof/doctrine-extensions-bundle": "^1.6",
109+
"stof/doctrine-extensions-bundle": "^1.14",
110110
"sylius/theme-bundle": "^2.2",
111-
"symfony/config": "^7.4",
111+
"symfony/config": "^6.3 || ^7.4",
112112
"symfony/dotenv": "^6.3 || ^7.0",
113113
"symfony/form": "^6.3 || ^7.0",
114114
"symfony/http-client": "^6.3 || ^7.0",
@@ -118,32 +118,37 @@
118118
"symfony/serializer": "^6.3 || ^7.0",
119119
"symfony/twig-bundle": "^6.3 || ^7.0",
120120
"symfony/webpack-encore-bundle": "^2.4",
121-
"webmozart/assert": "^1.10"
121+
"webmozart/assert": "^1.12"
122122
},
123123
"suggest": {
124124
"pimcore/opensearch-client": "Allows to use OpenSearch as your index engine."
125125
},
126+
"conflict": {
127+
"ezimuel/ringphp": "<1.4"
128+
},
126129
"require-dev": {
127-
"behat/behat": "^3.22",
128-
"behat/mink": "^1.12",
129-
"chrome-php/chrome": "^1.11",
130-
"dbrekelmans/bdi": "^1.0",
131-
"friends-of-behat/mink-debug-extension": "^2.0",
132-
"friends-of-behat/mink-extension": "^2.4",
130+
"behat/behat": "^3.27",
131+
"behat/mink": "^1.13",
132+
"chrome-php/chrome": "^1.14",
133+
"dbrekelmans/bdi": "^1.4",
134+
"friends-of-behat/mink-debug-extension": "^2.1",
135+
"friends-of-behat/mink-extension": "^2.7",
133136
"friends-of-behat/page-object-extension": "^0.3.2",
134-
"friends-of-behat/symfony-extension": "^2.1",
137+
"friends-of-behat/symfony-extension": "^2.6",
135138
"gotenberg/gotenberg-php": "^2.6",
136139
"lendable/composer-license-checker": "^1.2",
137140
"phpstan/phpstan": "^2.1",
138141
"phpstan/phpstan-doctrine": "^2.0",
139142
"phpstan/phpstan-symfony": "^2.0",
140143
"phpstan/phpstan-webmozart-assert": "^2.0",
141144
"phpunit/phpunit": "^10.0",
142-
"pimcore/opensearch-client": "^2.0",
143-
"robertfausk/behat-panther-extension": "^1.0",
144-
"symfony/panther": "^2.2",
145-
"symfony/browser-kit": "^7.0",
145+
"pimcore/opensearch-client": "^2.1",
146+
"robertfausk/behat-panther-extension": "^1.2",
147+
"symfony/panther": "^2.3",
148+
"php-webdriver/webdriver": "^1.15",
149+
"symfony/browser-kit": "^6.3 || ^7.0",
146150
"symfony/runtime": "^6.4 || ^7.0",
151+
"symfony/css-selector": "^6.4 || ^7.0",
147152
"symplify/easy-coding-standard": "^11.1",
148153
"vimeo/psalm": "^6.10"
149154
},

phpstan.neon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ parameters:
1111
# Makes PHPStan crash
1212
- '**/DependencyInjection/Configuration.php'
1313
- '**/Migrations/Version*.php'
14-
# Ignore cause the file uses external dependencies and will only be used if those dependencies are met
15-
- '**/ProcessManager/IndexListener.php'
16-
- '**/ProcessManager/IndexProcess.php'
1714
- '**/DataHub/*.php'
1815
- src/CoreShop/Component/Pimcore/SplPriorityQueue.php
1916
- src/CoreShop/Component/Pimcore/PriorityQueue.php

psalm.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<directory name="src/CoreShop/Behat" />
2222

2323
<directory name="src/CoreShop/Bundle/FrontendBundle" />
24-
<directory name="src/CoreShop/Bundle/IndexBundle/ProcessManager" />
2524
<directory name="vendor" />
2625

2726
<file name="src/CoreShop/Component/Pimcore/SplPriorityQueue.php" />

src/CoreShop/Bundle/CoreBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"coreshop/messenger-bundle": "^5.0",
5353
"coreshop/class-definition-patch-bundle": "^5.0",
5454
"coreshop/core": "^5.0",
55-
"doctrine/data-fixtures": "^1.5",
55+
"doctrine/data-fixtures": "^1.8",
5656
"doctrine/doctrine-fixtures-bundle": "^3.4",
5757
"fakerphp/faker": "^1.16",
5858
"rinvex/countries": "^9.0",

src/CoreShop/Bundle/IndexBundle/DependencyInjection/CoreShopIndexExtension.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ public function load(array $configs, ContainerBuilder $container): void
7575

7676
$loader->load('services.yml');
7777

78-
if (array_key_exists('ProcessManagerBundle', $bundles)) {
79-
$loader->load('services/process_manager.yml');
80-
}
81-
8278
if (!array_key_exists('CoreShopCoreBundle', $bundles)) {
8379
$loader->load('services/menu.yml');
8480
$loader->load('services/installer.yml');

src/CoreShop/Bundle/IndexBundle/ProcessManager/Form/Type/CoreShopIndexProcessType.php

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

src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexListener.php

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

src/CoreShop/Bundle/IndexBundle/ProcessManager/IndexProcess.php

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

0 commit comments

Comments
 (0)