Skip to content

Commit 6e4bc6e

Browse files
Merge branch '4.4' into 5.4
* 4.4: CS fixes 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 e07817b + 2365bd7 commit 6e4bc6e

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
@@ -376,7 +376,7 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface
376376

377377
private static function getCompiledRoutes(string $path): array
378378
{
379-
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))) {
379+
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))) {
380380
self::$cache = null;
381381
}
382382

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)