8000 Release 1.8.1 (#52) · jderusse/symfony-bundle-test@5d82bed · GitHub
[go: up one dir, main page]
Skip to content

Commit 5d82bed

Browse files
NyholmNyholm
authored
Release 1.8.1 (SymfonyTest#52)
* Release 1.8.1 * Fixed routes * fix
1 parent b3e6ae4 commit 5d82bed

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

‎Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 1.8.1
6+
7+
### Fixed
8+
9+
- Symfony 6 compatibility issues
10+
511
## 1.8.0
612

713
### Added

‎psalm.baseline.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<files psalm-version="4.8.1@f73f2299dbc59a3e6c4d66cff4605176e728ee69">
3+
<file src="src/AppKernel.php">
4+
<InvalidReturnStatement occurrences="1">
5+
<code>$bundles</code>
6+
</InvalidReturnStatement>
7+
<InvalidReturnType occurrences="1">
8+
<code>iterable</code>
9+
</InvalidReturnType>
10+
<ReservedWord occurrences="1">
11+
<code>$loader-&gt;getResolver()-&gt;resolve($file, 'php')</code>
12+
</ReservedWord>
13+
<UndefinedClass occurrences="1">
14+
<code>RouteCollectionBuilder</code>
15+
</UndefinedClass>
16+
</file>
317
<file src="src/BaseBundleTestCase.php">
418
<UndefinedClass occurrences="1">
519
<code>ResettableContainerInterface</code>

‎src/AppKernel.php

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
99
use Symfony\Component\DependencyInjection\ContainerBuilder;
1010
use Symfony\Component\HttpKernel\Kernel;
11+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
12+
use Symfony\Component\Routing\Loader\PhpFileLoader as RoutingPhpFileLoader;
13+
use Symfony\Component\Routing\RouteCollection;
1114
use Symfony\Component\Routing\RouteCollectionBuilder;
1215

1316
/**
@@ -168,15 +171,34 @@ public function registerContainerConfiguration(LoaderInterface $loader)
168171
*/
169172
public function loadRoutes(LoaderInterface $loader)
170173
{
171-
$routes = new RouteCollectionBuilder($loader);
174+
if (class_exists(RoutingConfigurator::class)) {
175+
$file = (new \ReflectionObject($this))->getFileName();
176+
/** @var RoutingPhpFileLoader $kernelLoader */
177+
$kernelLoader = $loader->getResolver()->resolve($file, 'php');
178+
$kernelLoader->setCurrentDir(\dirname($file));
179+
180+
$collection = new RouteCollection();
181+
$configurator = new RoutingConfigurator($collection, $kernelLoader, $file, $file, $this->getEnvironment());
182+
183+
if ($this->routingFile) {
184+
$configurator->import($this->routingFile);
185+
} else {
186+
$configurator->import(__DIR__.'/config/routing.yml');
187+
}
172188

173-
if ($this->routingFile) {
174-
$routes->import($this->routingFile);
189+
return $collection;
175190
} else {
176-
$routes->import(__DIR__.'/config/routing.yml');
177-
}
191+
// Legacy
192+
$routes = new RouteCollectionBuilder($loader);
178193

179-
return $routes->build();
194+
if ($this->routingFile) {
195+
$routes->import($this->routingFile);
196+
} else {
197+
$routes->import(__DIR__.'/config/routing.yml');
198+
}
199+
200+
return $routes->build();
201+
}
180202
}
181203

182204
/**

0 commit comments

Comments
 (0)
0