Skip to content

Commit 1133d7d

Browse files
Merge branch '6.1' into 6.2
* 6.1: CS fixes Bump Symfony version to 6.1.3 Update VERSION for 6.1.2 Update CHANGELOG for 6.1.2 Bump Symfony version to 6.0.11 Update VERSION for 6.0.10 Update CHANGELOG for 6.0.10 Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 2a69fa8 + 56a4411 commit 1133d7d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Router.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface
352352

353353
private static function getCompiledRoutes(string $path): array
354354
{
355-
if ([] === self::$cache && \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
355+
if ([] === self::$cache && \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
356356
self::$cache = null;
357357
}
358358

Tests/Generator/UrlGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ public function testGenerateRelativePath()
772772
['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
773773
);
774774
$this->assertSame('https://example.com/app.php/bernhard/blog', $generator->generate('scheme',
775-
['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
775+
['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
776776
);
777777
$this->assertSame('../../about', $generator->generate('unrelated',
778778
[], UrlGeneratorInterface::RELATIVE_PATH)

0 commit comments

Comments
 (0)