Merge branch '4.6' into IBX-10116_ibexa_render_does_not_use_decorated_fragment_renders

micszo · web-flow · commit 58b05b186b74 · 2025-07-28T11:36:37.000+02:00
diff --git a/phpstan-baseline-7.4.neon b/phpstan-baseline-7.4.neon
@@ -528,6 +528,18 @@ parameters:
 			count: 3
 			path: tests/integration/Core/Repository/RoleServiceTest.php
 
+		-
+			message: '#^Parameter \#1 \$class of class ReflectionProperty constructor expects object\|string, class\-string\|false given\.$#'
+			identifier: argument.type
+			count: 4
+			path: tests/integration/Core/Repository/SearchServiceLocationTest.php
+
+		-
+			message: '#^Parameter \#1 \$class of class ReflectionProperty constructor expects object\|string, class\-string\|false given\.$#'
+			identifier: argument.type
+			count: 4
+			path: tests/integration/Core/Repository/SearchServiceTest.php
+
 		-
 			message: '#^Parameter \#1 \$str of function md5 expects string, int\<1, max\> given\.$#'
 			identifier: argument.type
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -342,12 +342,6 @@ parameters:
 			count: 1
 			path: src/bundle/Core/Command/ReindexCommand.php
 
-		-
-			message: '#^Parameter \#2 \$subject of function preg_match expects string, string\|false given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/bundle/Core/Command/ReindexCommand.php
-
 		-
 			message: '#^Parameter \#2 \$subject of function preg_match_all expects string, string\|false given\.$#'
 			identifier: argument.type
@@ -2556,12 +2550,6 @@ parameters:
 			count: 1
 			path: src/bundle/Core/EventListener/PreviewRequestListener.php
 
-		-
-			message: '#^Method Ibexa\\Bundle\\Core\\EventListener\\RejectExplicitFrontControllerRequestsListener\:\:onKernelRequest\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: src/bundle/Core/EventListener/RejectExplicitFrontControllerRequestsListener.php
-
 		-
 			message: '#^Method Ibexa\\Bundle\\Core\\EventListener\\RequestEventListener\:\:__construct\(\) has parameter \$defaultSiteAccess with no type specified\.$#'
 			identifier: missingType.parameter
diff --git a/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php b/src/bundle/Core/DependencyInjection/IbexaCoreExtension.php
@@ -861,12 +861,12 @@ private function configurePlatformShSetup(ContainerBuilder $container): void
                     $container->setParameter(
                         'dfs_database_url',
                         sprintf(
-                            '%s://%s:%s:%d@%s/%s',
+                            '%s://%s:%s@%s:%d/%s',
                             $endpoint['scheme'],
                             $endpoint['username'],
                             $endpoint['password'],
-                            $endpoint['port'],
                             $endpoint['host'],
+                            $endpoint['port'],
                             $endpoint['path']
                         )
                     );
diff --git a/src/bundle/Core/EventListener/RejectExplicitFrontControllerRequestsListener.php b/src/bundle/Core/EventListener/RejectExplicitFrontControllerRequestsListener.php
@@ -28,22 +28,25 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
-        if ($event->getRequestType() !== HttpKernelInterface::MASTER_REQUEST) {
+        if ($event->getRequestType() !== HttpKernelInterface::MAIN_REQUEST) {
             return;
         }
 
         $request = $event->getRequest();
 
         // Not every symfony runtime provides SCRIPT_FILENAME
-        if (!$request->server->has('SCRIPT_FILENAME')) {
+        if (
+            !$request->server->has('SCRIPT_FILENAME')
+            || empty($scriptFileName = $request->server->get('SCRIPT_FILENAME'))
+        ) {
             return;
         }
 
-        $scriptFileName = preg_quote(basename($request->server->get('SCRIPT_FILENAME')), '\\');
+        $scriptFileName = preg_quote(basename($scriptFileName), '\\');
         // This pattern has to match with vhost.template files in meta repository
-        $pattern = sprintf('<^/([^/]+/)?%s([/?#]|$)>', $scriptFileName);
+        $pattern = sprintf('<^/([^/]+/)*?%s([/?#]|$)>', $scriptFileName);
 
         if (1 === preg_match($pattern, $request->getRequestUri())) {
             // Trigger generic 404 error to avoid leaking backend technology details.
diff --git a/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php b/src/lib/FieldType/MapLocation/MapLocationStorage/Gateway/DoctrineStorage.php
@@ -146,7 +146,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)
      * @param int $fieldId
      * @param int $versionNo
      *
-     * @return array|null
+     * @return array|\ArrayAccess<string, float>|null
      */
     protected function loadFieldData($fieldId, $versionNo)
     {
diff --git a/src/lib/Notification/Renderer/Registry.php b/src/lib/Notification/Renderer/Registry.php
@@ -41,6 +41,22 @@ public function hasRenderer(string $alias): bool
     {
         return isset($this->registry[$alias]);
     }
+
+    /**
+     * @return array<string, string>
+     */
+    public function getTypeLabels(): array
+    {
+        $labels = [];
+        foreach ($this->registry as $type => $renderer) {
+            if ($renderer instanceof TypedNotificationRendererInterface) {
+                $labels[$type] = $renderer->getTypeLabel();
+            }
+        }
+        ksort($labels);
+
+        return $labels;
+    }
 }
 
 class_alias(Registry::class, 'eZ\Publish\Core\Notification\Renderer\Registry');
diff --git a/src/lib/Notification/Renderer/TypedNotificationRendererInterface.php b/src/lib/Notification/Renderer/TypedNotificationRendererInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Core\Notification\Renderer;
+
+interface TypedNotificationRendererInterface
+{
+    public function getTypeLabel(): string;
+}
diff --git a/src/lib/Persistence/Legacy/Content/UrlAlias/Handler.php b/src/lib/Persistence/Legacy/Content/UrlAlias/Handler.php
@@ -46,6 +46,13 @@ class Handler implements UrlAliasHandlerInterface
      */
     public const MAX_URL_ALIAS_DEPTH_LEVEL = 60;
 
+    /**
+     * Match url alias id in form of `<parentId>-<textMD5>`.
+     *
+     * @var string
+     */
+    public const URL_ALIAS_ID_PATTERN = '/^\d+-[a-f0-9]{32}$/';
+
     /**
      * UrlAlias Gateway.
      *
@@ -620,6 +627,10 @@ public function lookup($url)
      */
     public function loadUrlAlias($id)
     {
+        if (!preg_match(self::URL_ALIAS_ID_PATTERN, $id)) {
+            throw new NotFoundException('URLAlias', $id);
+        }
+
         list($parentId, $textMD5) = explode('-', $id);
         $data = $this->gateway->loadRow((int)$parentId, $textMD5);
 
diff --git a/src/lib/Repository/Helper/RelationProcessor.php b/src/lib/Repository/Helper/RelationProcessor.php
@@ -145,7 +145,11 @@ public function processFieldRelations(
             if ($relationType === Relation::FIELD || $relationType === Relation::ASSET) {
                 foreach ($relationData as $fieldDefinitionId => $contentIds) {
                     foreach (array_keys($contentIds) as $destinationContentId) {
-                        if (isset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId])) {
+                        if (
+                            isset($mappedRelations[$relationType][$fieldDefinitionId]) &&
+                            is_array($mappedRelations[$relationType][$fieldDefinitionId]) &&
+                            isset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId])
+                        ) {
                             unset($mappedRelations[$relationType][$fieldDefinitionId][$destinationContentId]);
                         } else {
                             $this->persistenceHandler->contentHandler()->addRelation(
diff --git a/tests/bundle/Core/DependencyInjection/IbexaCoreExtensionTest.php b/tests/bundle/Core/DependencyInjection/IbexaCoreExtensionTest.php
@@ -910,6 +910,51 @@ public function testLoadsTestServicesWhenParameterIsSpecified(): void
         $this->assertContainerBuilderHasService(QueryControllerContext::class);
     }
 
+    /**
+     * @throws \JsonException
+     */
+    public function testConfigurePlatformShDFS(): void
+    {
+        $dsn = 'mysql://dfs:dfs@localhost:3306/dfs';
+        $parts = parse_url($dsn);
+
+        $relationship = [
+            'dfs_database' => [
+                [
+                    'host' => $parts['host'],
+                    'scheme' => $parts['scheme'],
+                    'username' => $parts['user'],
+                    'password' => $parts['pass'],
+                    'port' => $parts['port'],
+                    'path' => ltrim($parts['path'], '/'),
+                    'query' => [
+                        'is_master' => true,
+                    ],
+                ],
+            ],
+        ];
+
+        $_SERVER['PLATFORM_RELATIONSHIPS'] = base64_encode(json_encode($relationship, JSON_THROW_ON_ERROR));
+        $_SERVER['PLATFORMSH_DFS_NFS_PATH'] = '/';
+        $_SERVER['PLATFORM_ROUTES'] = base64_encode(json_encode([], JSON_THROW_ON_ERROR));
+        $_SERVER['PLATFORM_PROJECT_ENTROPY'] = '';
+
+        $this->container->setParameter('database_charset', 'utf8mb4');
+        $this->container->setParameter('database_collation', 'utf8mb4_general_ci');
+        $this->container->setParameter('kernel.project_dir', __DIR__ . '/../Resources');
+        $this->load();
+
+        $this->assertContainerBuilderHasParameter('dfs_database_url');
+        self::assertEquals($dsn, $this->container->getParameter('dfs_database_url'));
+
+        unset(
+            $_SERVER['PLATFORM_RELATIONSHIPS'],
+            $_SERVER['PLATFORMSH_DFS_NFS_PATH'],
+            $_SERVER['PLATFORM_ROUTES'],
+            $_SERVER['PLATFORM_PROJECT_ENTROPY']
+        );
+    }
+
     /**
      * Prepare Core Container for compilation by mocking required parameters and compile it.
      */
diff --git a/tests/bundle/Core/EventListener/RejectExplicitFrontControllerRequestsListenerTest.php b/tests/bundle/Core/EventListener/RejectExplicitFrontControllerRequestsListenerTest.php
@@ -191,7 +191,20 @@ public function validRequestDataProvider(): array
                     [],
                     [
                         'REQUEST_URI' => 'https://example.com/app.php/folder/folder/app.php',
-                        'SCRIPT_FILENAME' => 'app.php',
+                        'SCRIPT_FILENAME' => 'index.php',
+                    ]
+                ),
+            ],
+            [
+                Request::create(
+                    'https://example.com/app.php/folder/folder/',
+                    Request::METHOD_GET,
+                    [],
+                    [],
+                    [],
+                    [
+                        'REQUEST_URI' => 'https://example.com/app.php/folder/',
+                        'SCRIPT_FILENAME' => '',
                     ]
                 ),
             ],
@@ -279,6 +292,19 @@ public function prohibitedRequestDataProvider(): array
                     ]
                 ),
             ],
+            [
+                Request::create(
+                    'https://example.com/folder/folder/app.php',
+                    'GET',
+                    [],
+                    [],
+                    [],
+                    [
+                        'REQUEST_URI' => 'https://example.com/app.php/folder/folder/app.php',
+                        'SCRIPT_FILENAME' => 'app.php',
+                    ]
+                ),
+            ],
         ];
     }
 }
diff --git a/tests/bundle/Core/Resources/config/packages/dfs/dfs.yaml b/tests/bundle/Core/Resources/config/packages/dfs/dfs.yaml
@@ -0,0 +1 @@
+# dummy file for \Ibexa\Tests\Bundle\Core\DependencyInjection\IbexaCoreExtensionTest::testConfigurePlatformShDFS
diff --git a/tests/lib/Notification/Renderer/RegistryTest.php b/tests/lib/Notification/Renderer/RegistryTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\Core\Notification\Renderer;
+
+use Ibexa\Contracts\Core\Repository\Values\Notification\Notification;
+use Ibexa\Core\Notification\Renderer\NotificationRenderer;
+use Ibexa\Core\Notification\Renderer\Registry;
+use Ibexa\Core\Notification\Renderer\TypedNotificationRendererInterface;
+use PHPUnit\Framework\TestCase;
+
+final class RegistryTest extends TestCase
+{
+    public function testGetTypeLabelsReturnsSortedLabelsFromTypedRenderers(): void
+    {
+        $typedRendererA = new class() implements NotificationRenderer, TypedNotificationRendererInterface {
+            public function render(Notification $notification): string
+            {
+                return 'Rendered A';
+            }
+
+            public function generateUrl(Notification $notification): ?string
+            {
+                return null;
+            }
+
+            public function getTypeLabel(): string
+            {
+                return 'Label A';
+            }
+        };
+
+        $typedRendererB = new class() implements NotificationRenderer, TypedNotificationRendererInterface {
+            public function render(Notification $notification): string
+            {
+                return 'Rendered B';
+            }
+
+            public function generateUrl(Notification $notification): ?string
+            {
+                return null;
+            }
+
+            public function getTypeLabel(): string
+            {
+                return 'Label B';
+            }
+        };
+
+        $nonTypedRenderer = $this->createMock(NotificationRenderer::class);
+
+        $registry = new Registry();
+        $registry->addRenderer('z_type', $typedRendererB);
+        $registry->addRenderer('a_type', $typedRendererA);
+        $registry->addRenderer('x_type', $nonTypedRenderer);
+
+        $expected = [
+            'a_type' => 'Label A',
+            'z_type' => 'Label B',
+        ];
+
+        $this->assertSame($expected, $registry->getTypeLabels());
+    }
+}
diff --git a/tests/lib/Validation/ValidationFailedExceptionTest.php b/tests/lib/Validation/ValidationFailedExceptionTest.php
@@ -55,6 +55,7 @@ public function testEmptyErrorList(): void
             'Cannot create %s with empty validation error list.',
             ValidationFailedException::class,
         ));
-        new ValidationFailedException('__argument_name__', $errors);
+        $exception = new ValidationFailedException('__argument_name__', $errors);
+        self::assertSame($errors, $exception->getErrors());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function getFieldData(VersionInfo $versionInfo, Field $field)`
`146`	`146`	`* @param int $fieldId`
`147`	`147`	`* @param int $versionNo`
`148`	`148`	`*`
`149`		`- * @return array\|null`
	`149`	`+ * @return array\|\ArrayAccess<string, float>\|null`
`150`	`150`	`*/`
`151`	`151`	`protected function loadFieldData($fieldId, $versionNo)`
`152`	`152`	`{`