Skip to content

Commit d234ce5

Browse files
Merge branch '5.4' into 6.0
* 5.4: CS fixes 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 74c40c9 + 6e4bc6e commit d234ce5

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
@@ -740,7 +740,7 @@ public function testGenerateRelativePath()
740740
['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
741741
);
742742
$this->assertSame('https://example.com/app.php/bernhard/blog', $generator->generate('scheme',
743-
['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
743+
['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
744744
);
745745
$this->assertSame('../../about', $generator->generate('unrelated',
746746
[], UrlGeneratorInterface::RELATIVE_PATH)

0 commit comments

Comments
 (0)