Skip to content

Commit 1de1f0b

Browse files
committed
Merge pull request #481 from ip512/fix-web-profiler-bundle-routing-conf-in-tests
fix: update routing configuration to use PHP files for WebProfilerBundle
2 parents 23dcb4f + 420d3ec commit 1de1f0b

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
- dependencies: "php-http/guzzle7-adapter"
4141
php-version: "8.4"
4242
symfony-deprecations-helper: "weak"
43+
- dependencies: "php-http/guzzle7-adapter"
44+
php-version: "8.5"
45+
symfony-deprecations-helper: "weak"
4346

4447
# Test with httplug 2.x clients
4548
- dependencies: "php-http/guzzle7-adapter php-http/curl-client:^2.0.0 php-http/vcr-plugin:^1.0@dev php-http/socket-client:^2.0"
@@ -48,11 +51,11 @@ jobs:
4851

4952
# Latest commit to master
5053
- dependencies: "php-http/guzzle7-adapter php-http/vcr-plugin:^1.0@dev"
51-
php-version: "8.2"
54+
php-version: "8.5"
5255
stability: "dev"
5356
symfony-deprecations-helper: "weak"
5457
- dependencies: "php-http/guzzle7-adapter"
55-
php-version: "8.2"
58+
php-version: "8.5"
5659
stability: "dev"
5760
symfony-deprecations-helper: "weak"
5861

@@ -65,9 +68,9 @@ jobs:
6568
symfony-require: "6.4.*"
6669
php-version: "8.2"
6770
symfony-deprecations-helper: "weak"
68-
- dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.1"
69-
symfony-require: "7.1.*"
70-
php-version: "8.2"
71+
- dependencies: "php-http/guzzle7-adapter symfony/http-client:^7.4"
72+
symfony-require: "7.4.*"
73+
php-version: "8.5"
7174
symfony-deprecations-helper: "weak"
7275

7376
steps:
@@ -90,6 +93,7 @@ jobs:
9093

9194
- name: "Add dependencies and enable flex"
9295
run: |
96+
composer config allow-plugins.symfony/flex true
9397
composer require --no-update ${{ matrix.dependencies }}
9498
9599
- name: "Install dependencies with Composer"

tests/Resources/app/AppKernel.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
6666
$collection->add('/', new Route('/', ['_controller' => 'kernel::indexAction']));
6767

6868
$routes = new RoutingConfigurator($collection, $kernelLoader, $file, $file);
69-
$routes->import('@WebProfilerBundle/Resources/config/routing/wdt.xml')->prefix('_wdt');
70-
$routes->import('@WebProfilerBundle/Resources/config/routing/profiler.xml')->prefix('_profiler');
69+
// TODO hardcode xml when we support only Symfony 7.3 or higher.
70+
$extension = self::MAJOR_VERSION >= 7 ? 'php' : 'xml';
71+
$routes->import('@WebProfilerBundle/Resources/config/routing/wdt.'.$extension)->prefix('_wdt');
72+
$routes->import('@WebProfilerBundle/Resources/config/routing/profiler.'.$extension)->prefix('_profiler');
7173

7274
return $collection;
7375
}

0 commit comments

Comments
 (0)