Merge remote-tracking branch 'origin/4.6'

# Conflicts:
#	phpstan-baseline.neon
#	src/bundle/Resources/config/routing.yml
#	src/lib/Server/Controller/Content.php

Author: ViniTou

src/bundle/Resources/config/routing.yml

@@ -1167,11 +1167,15 @@ ibexa.rest.load_url_alias:
     path: /content/urlaliases/{urlAliasId}
     controller: Ibexa\Rest\Server\Controller\URLAlias\URLAliasLoadByIdController::loadURLAlias
     methods: [GET]
+    requirements:
+        urlAliasId: \d+-[a-f0-9]{32}
 
 ibexa.rest.delete_url_alias:
     path: /content/urlaliases/{urlAliasId}
     controller: Ibexa\Rest\Server\Controller\URLAlias\URLAliasDeleteController::deleteURLAlias
     methods: [DELETE]
+    requirements:
+        urlAliasId: \d+-[a-f0-9]{32}
 
 # Services
 

tests/bundle/Functional/HttpOptionsTest.php

@@ -135,7 +135,7 @@ public function providerForTestHttpOptions(): array
             ['/user/sessions/sess_123/refresh', ['POST']],
             ['/content/urlaliases', ['GET', 'POST']],
             ['/content/locations/1/2/urlaliases', ['GET']],
-            ['/content/urlaliases/12', ['GET', 'DELETE']],
+            ['/content/urlaliases/12-7ade12329f398e8e9ed984f2db6be2c4', ['GET', 'DELETE']],
             ['/services/countries', ['GET']],
         ];
     }