Use PHP 8.4 polyfill for mb_trim PHP function

emodric · emodric · commit 443ac0ef93b9 · 2026-01-14T14:09:44.000+01:00
diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
     ],
     "require": {
         "php": "^8.2",
+        "symfony/polyfill-php84": "^1.33",
         "netgen/openapi": "^1.0.2",
         "netgen/layouts-core": "^1.4.11",
         "netgen/layouts-ibexa": "^1.4",
diff --git a/lib/Ibexa/UrlAliasLocationResolver.php b/lib/Ibexa/UrlAliasLocationResolver.php
@@ -11,8 +11,8 @@
 use Netgen\IbexaSiteApi\API\LoadService;
 use Netgen\IbexaSiteApi\API\Values\Location;
 
+use function mb_trim;
 use function sprintf;
-use function trim;
 
 final class UrlAliasLocationResolver
 {
@@ -25,7 +25,7 @@ public function __construct(
 
     public function resolveLocation(string $path): Location
     {
-        $urlAlias = $this->getUrlAlias(sprintf('/%s', trim($path, '/')));
+        $urlAlias = $this->getUrlAlias(sprintf('/%s', mb_trim($path, '/')));
 
         if ($urlAlias->type === URLAlias::LOCATION) {
             return $this->loadService->loadLocation($urlAlias->destination);

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`use Netgen\IbexaSiteApi\API\LoadService;`
`12`	`12`	`use Netgen\IbexaSiteApi\API\Values\Location;`
`13`	`13`
	`14`	`+use function mb_trim;`
`14`	`15`	`use function sprintf;`
`15`		`-use function trim;`
`16`	`16`
`17`	`17`	`final class UrlAliasLocationResolver`
`18`	`18`	`{`
`@@ -25,7 +25,7 @@ public function __construct(`
`25`	`25`
`26`	`26`	`public function resolveLocation(string $path): Location`
`27`	`27`	`{`
`28`		`- $urlAlias = $this->getUrlAlias(sprintf('/%s', trim($path, '/')));`
	`28`	`+ $urlAlias = $this->getUrlAlias(sprintf('/%s', mb_trim($path, '/')));`
`29`	`29`
`30`	`30`	`if ($urlAlias->type === URLAlias::LOCATION) {`
`31`	`31`	`return $this->loadService->loadLocation($urlAlias->destination);`