Merge branch '9.0' into 5077-documentUriPlaceholders

neos · Jun 9, 2024 · 8eee095 · 8eee095
2 parents 862fefb + 3450b04
commit 8eee095
Show file tree

Hide file tree

Showing 187 changed files with 12,490 additions and 11,782 deletions.
diff --git a/.composer.json b/.composer.json
@@ -10,8 +10,6 @@
   },
   "suggest": {
   },
-  "provide": {
-  },
   "scripts": {
     "lint:phpcs": "../../bin/phpcs --colors",
     "lint:phpcs:fix": "../../bin/phpcbf --colors",
@@ -32,9 +30,6 @@
       "FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php",
       "FLOW_CONTEXT=Testing/Behat ../../bin/paratest --debug -v --functional --group parallel --processes 2 --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.BehavioralTests/Tests/Functional/Feature/WorkspacePublication/WorkspaceWritingDuringPublication.php"
     ],
-    "test:functional": [
-      "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.Core/Tests/Functional"
-    ],
     "test:behat-cli": "../../bin/behat -f progress --strict --no-interaction",
     "test:behavioral": [
       "@test:behat-cli -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
@@ -56,7 +51,6 @@
     ],
     "test": [
       "@test:unit",
-      "@test:functional",
       "@test:behavioral",
       "@test:parallel"
     ],

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/composer.json b/Neos.ContentGraph.DoctrineDbalAdapter/composer.json
@@ -8,6 +8,9 @@
     "docs": "https://docs.neos.io/"
   },
   "license": "GPL-3.0+",
+  "provide": {
+    "neos/contentrepositoryregistry-storageclient": "self.version"
+  },
   "require": {
     "neos/contentrepository-core": "self.version",
     "doctrine/dbal": "^2.13",

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphFactory.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphFactory.php
@@ -13,6 +13,7 @@
 namespace Neos\ContentGraph\DoctrineDbalAdapter;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ContentGraph;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
 use Neos\ContentRepository\Core\ContentGraphFactoryInterface;
@@ -46,22 +47,28 @@ public function buildForWorkspace(WorkspaceName $workspaceName): ContentGraph
             'workspace'
         ));
 
-        $row = $this->dbal->executeQuery(
-            '
-                SELECT * FROM ' . $tableName . '
-                WHERE workspaceName = :workspaceName
-                LIMIT 1
-            ',
-            [
+        $currentContentStreamIdStatement = <<<SQL
+            SELECT
+                currentcontentstreamid
+            FROM
+                {$tableName}
+            WHERE
+                workspaceName = :workspaceName
+            LIMIT 1
+        SQL;
+        try {
+            $currentContentStreamId = $this->dbal->fetchOne($currentContentStreamIdStatement, [
                 'workspaceName' => $workspaceName->value,
-            ]
-        )->fetchAssociative();
+            ]);
+        } catch (Exception $e) {
+            throw new \RuntimeException(sprintf('Failed to load workspace content stream id from database: %s', $e->getMessage()), 1716486077, $e);
+        }
 
-        if ($row === false) {
+        if ($currentContentStreamId === false) {
             throw WorkspaceDoesNotExist::butWasSupposedTo($workspaceName);
         }
 
-        return $this->buildForWorkspaceAndContentStream($workspaceName, ContentStreamId::fromString($row['currentcontentstreamid']));
+        return $this->buildForWorkspaceAndContentStream($workspaceName, ContentStreamId::fromString($currentContentStreamId));
     }
 
     public function buildForWorkspaceAndContentStream(WorkspaceName $workspaceName, ContentStreamId $contentStreamId): ContentGraph