diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
index a26dfb5adc612..cc2810fc6dbb4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
@@ -110,7 +110,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
->set('url_helper', UrlHelper::class)
->args([
service('request_stack'),
- service('router.request_context')->ignoreOnInvalid(),
+ service('router')->ignoreOnInvalid(),
])
->alias(UrlHelper::class, 'url_helper')
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 089e2e0827fea..19da8ab3b66d6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -24,7 +24,7 @@
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/event-dispatcher": "^5.1|^6.0",
"symfony/error-handler": "^4.4.1|^5.0.1|^6.0",
- "symfony/http-foundation": "^5.3|^6.0",
+ "symfony/http-foundation": "^5.4.24|^6.2.11",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.16",
diff --git a/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php b/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
index 2057dd7097cc8..25640402af238 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/UrlHelperTest.php
@@ -16,6 +16,7 @@
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\UrlHelper;
use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RequestContextAwareInterface;
class UrlHelperTest extends TestCase
{
@@ -69,6 +70,40 @@ public function testGenerateAbsoluteUrlWithRequestContext($path, $baseUrl, $host
$this->assertEquals($expected, $helper->getAbsoluteUrl($path));
}
+ /**
+ * @dataProvider getGenerateAbsoluteUrlRequestContextData
+ */
+ public function testGenerateAbsoluteUrlWithRequestContextAwareInterface($path, $baseUrl, $host, $scheme, $httpPort, $httpsPort, $expected)
+ {
+ if (!class_exists(RequestContext::class)) {
+ $this->markTestSkipped('The Routing component is needed to run tests that depend on its request context.');
+ }
+
+ $requestContext = new RequestContext($baseUrl, 'GET', $host, $scheme, $httpPort, $httpsPort, $path);
+ $contextAware = new class($requestContext) implements RequestContextAwareInterface {
+ private $requestContext;
+
+ public function __construct($requestContext)
+ {
+ $this->requestContext = $requestContext;
+ }
+
+ public function setContext(RequestContext $context)
+ {
+ $this->requestContext = $context;
+ }
+
+ public function getContext()
+ {
+ return $this->requestContext;
+ }
+ };
+
+ $helper = new UrlHelper(new RequestStack(), $contextAware);
+
+ $this->assertEquals($expected, $helper->getAbsoluteUrl($path));
+ }
+
/**
* @dataProvider getGenerateAbsoluteUrlRequestContextData
*/
diff --git a/src/Symfony/Component/HttpFoundation/UrlHelper.php b/src/Symfony/Component/HttpFoundation/UrlHelper.php
index c15f101cdf80b..90659947dba6d 100644
--- a/src/Symfony/Component/HttpFoundation/UrlHelper.php
+++ b/src/Symfony/Component/HttpFoundation/UrlHelper.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpFoundation;
use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RequestContextAwareInterface;
/**
* A helper service for manipulating URLs within and outside the request scope.
@@ -23,8 +24,15 @@ final class UrlHelper
private $requestStack;
private $requestContext;
- public function __construct(RequestStack $requestStack, RequestContext $requestContext = null)
+ /**
+ * @param RequestContextAwareInterface|RequestContext|null $requestContext
+ */
+ public function __construct(RequestStack $requestStack, $requestContext = null)
{
+ if (null !== $requestContext && !$requestContext instanceof RequestContext && !$requestContext instanceof RequestContextAwareInterface) {
+ throw new \TypeError(__METHOD__.': Argument #2 ($requestContext) must of type Symfony\Component\Routing\RequestContextAwareInterface|Symfony\Component\Routing\RequestContext|null, '.get_debug_type($requestContext).' given.');
+ }
+
$this->requestStack = $requestStack;
$this->requestContext = $requestContext;
}
@@ -73,28 +81,36 @@ public function getRelativePath(string $path): string
private function getAbsoluteUrlFromContext(string $path): string
{
- if (null === $this->requestContext || '' === $host = $this->requestContext->getHost()) {
+ if (null === $context = $this->requestContext) {
+ return $path;
+ }
+
+ if ($context instanceof RequestContextAwareInterface) {
+ $context = $context->getContext();
+ }
+
+ if ('' === $host = $context->getHost()) {
return $path;
}
- $scheme = $this->requestContext->getScheme();
+ $scheme = $context->getScheme();
$port = '';
- if ('http' === $scheme && 80 !== $this->requestContext->getHttpPort()) {
- $port = ':'.$this->requestContext->getHttpPort();
- } elseif ('https' === $scheme && 443 !== $this->requestContext->getHttpsPort()) {
- $port = ':'.$this->requestContext->getHttpsPort();
+ if ('http' === $scheme && 80 !== $context->getHttpPort()) {
+ $port = ':'.$context->getHttpPort();
+ } elseif ('https' === $scheme && 443 !== $context->getHttpsPort()) {
+ $port = ':'.$context->getHttpsPort();
}
if ('#' === $path[0]) {
- $queryString = $this->requestContext->getQueryString();
- $path = $this->requestContext->getPathInfo().($queryString ? '?'.$queryString : '').$path;
+ $queryString = $context->getQueryString();
+ $path = $context->getPathInfo().($queryString ? '?'.$queryString : '').$path;
} elseif ('?' === $path[0]) {
- $path = $this->requestContext->getPathInfo().$path;
+ $path = $context->getPathInfo().$path;
}
if ('/' !== $path[0]) {
- $path = rtrim($this->requestContext->getBaseUrl(), '/').'/'.$path;
+ $path = rtrim($context->getBaseUrl(), '/').'/'.$path;
}
return $scheme.'://'.$host.$port.$path;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy