IBX-10159: Corrected generate dfs_database_url parameter for Ibexa Cloud (#595)

Author: mateuszdebinski

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']
                         )
                     );

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.
      */

tests/bundle/Core/Resources/config/packages/dfs/dfs.yaml

@@ -0,0 +1 @@
+# dummy file for \Ibexa\Tests\Bundle\Core\DependencyInjection\IbexaCoreExtensionTest::testConfigurePlatformShDFS