Fix more usages

neos · Apr 3, 2023 · bb55e5f · bb55e5f
1 parent d6bdceb
commit bb55e5f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
@@ -839,8 +839,8 @@ function (NodeRecord $node) use ($eventEnvelope) {
 
                 // remove old
                 $this->getDatabaseConnection()->delete($this->tableNamePrefix . '_referencerelation', [
-                    'nodeanchorpoint' => $nodeAnchorPoint,
-                    'name' => $event->referenceName
+                    'nodeanchorpoint' => $nodeAnchorPoint?->value,
+                    'name' => $event->referenceName->value
                 ]);
 
                 // set new

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php
@@ -263,7 +263,7 @@ public function determineHierarchyRelationPosition(
             )->fetchAssociative();
 
             $succeedingSiblingPosition = (int)$succeedingSiblingRelation['position'];
-            $parentAnchorPoint = $succeedingSiblingRelation['parentnodeanchor'];
+            $parentAnchorPoint = NodeRelationAnchorPoint::fromString($succeedingSiblingRelation['parentnodeanchor']);
 
             $precedingSiblingData = $this->getDatabaseConnection()->executeQuery(
                 'SELECT MAX(h.position) AS position FROM ' . $this->tableNamePrefix . '_hierarchyrelation h
@@ -272,7 +272,7 @@ public function determineHierarchyRelationPosition(
                           AND h.dimensionspacepointhash = :dimensionSpacePointHash
                           AND h.position < :position',
                 [
-                    'anchorPoint' => $parentAnchorPoint,
+                    'anchorPoint' => $parentAnchorPoint->value,
                     'contentStreamId' => $contentStreamId->value,
                     'dimensionSpacePointHash' => $dimensionSpacePoint->hash,
                     'position' => $succeedingSiblingPosition
@@ -297,7 +297,7 @@ public function determineHierarchyRelationPosition(
                       AND h.contentstreamid = :contentStreamId
                       AND h.dimensionspacepointhash = :dimensionSpacePointHash',
                     [
-                        'childAnchorPoint' => $childAnchorPoint,
+                        'childAnchorPoint' => $childAnchorPoint?->value,
                         'contentStreamId' => $contentStreamId->value,
                         'dimensionSpacePointHash' => $dimensionSpacePoint->hash
                     ]
@@ -312,7 +312,7 @@ public function determineHierarchyRelationPosition(
                       AND h.contentstreamid = :contentStreamId
                       AND h.dimensionspacepointhash = :dimensionSpacePointHash',
                 [
-                    'parentAnchorPoint' => $parentAnchorPoint,
+                    'parentAnchorPoint' => $parentAnchorPoint->value,
                     'contentStreamId' => $contentStreamId->value,
                     'dimensionSpacePointHash' => $dimensionSpacePoint->hash
                 ]

diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php
@@ -282,7 +282,7 @@ private function updateContentStreamId(
         WorkspaceName $workspaceName
     ): void {
         $this->getDatabaseConnection()->update($this->tableName, [
-            'currentContentStreamId' => $contentStreamId
+            'currentContentStreamId' => $contentStreamId->value,
         ], [
             'workspaceName' => $workspaceName->value
         ]);

diff --git a/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Index.html b/Neos.Neos/Resources/Private/Templates/Module/Management/Workspaces/Index.html
@@ -79,7 +79,7 @@
 									</div>
 								</span>
 								<f:if condition="{changesCounts.total} != 0">
-									<f:link.action action="show" arguments="{workspace: workspace.workspaceName.name}" class="neos-button neos-button-primary">
+									<f:link.action action="show" arguments="{workspace: workspace.workspaceName.value}" class="neos-button neos-button-primary">
 									<i class="fas fa-review"></i>
 									{neos:backend.translate(id: 'workspaces.review', source: 'Modules', package: 'Neos.Neos')}
 									</f:link.action>
@@ -89,7 +89,7 @@
 						<td class="neos-action">
 							<div class="neos-pull-right">
 								<f:if condition="{canManage}">
-									<f:link.action action="edit" arguments="{workspace: workspace.workspaceName.name}" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'workspaces.editWorkspace', source: 'Modules', package: 'Neos.Neos', arguments: {0: workspace.workspaceTitle})}" additionalAttributes="{data-neos-toggle: 'tooltip'}">
+									<f:link.action action="edit" arguments="{workspace: workspace.workspaceName.value}" class="neos-button neos-button-primary" title="{neos:backend.translate(id: 'workspaces.editWorkspace', source: 'Modules', package: 'Neos.Neos', arguments: {0: workspace.workspaceTitle})}" additionalAttributes="{data-neos-toggle: 'tooltip'}">
 										<i class="fas fa-pencil-alt icon-white"></i>
 									</f:link.action>
 								</f:if>
@@ -127,7 +127,7 @@
 																		</div>
 																		<div class="neos-modal-footer">
 																			<a href="#" class="neos-button" data-dismiss="modal">{neos:backend.translate(id: 'cancel', source: 'Modules', package: 'Neos.Neos')}</a>
-																			<f:form action="delete" arguments="{workspace: workspace.workspaceName.name}" class="neos-inline">
+																			<f:form action="delete" arguments="{workspace: workspace.workspaceName.value}" class="neos-inline">
 																				<button type="submit" class="neos-button neos-button-danger" title="{neos:backend.translate(id: 'workspaces.deleteWorkspace', source: 'Modules', package: 'Neos.Neos')}">
 																					{neos:backend.translate(id: 'workspaces.yesDeleteWorkspace', source: 'Modules', package: 'Neos.Neos')}
 																				</button>

diff --git a/Neos.Neos/Resources/Private/Templates/Service/Nodes/Index.html b/Neos.Neos/Resources/Private/Templates/Service/Nodes/Index.html
@@ -28,7 +28,7 @@ <h1>{neos:backend.translate(id: 'service.nodes.title', value: 'Nodes')}</h1>
                         <label class="node-label">{node.label}</label>
                         (<span class="node-identifier">{node.nodeAggregateId}</span>)
                         [<span class="node-type">{node.nodeType.name}</span>]
-                        <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
+                        <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
                     </li>
                 </f:for>
             </ul>

diff --git a/Neos.Neos/Resources/Private/Templates/Service/Nodes/Show.html b/Neos.Neos/Resources/Private/Templates/Service/Nodes/Show.html
@@ -13,7 +13,7 @@ <h1>{neos:backend.translate(id: 'node', value: 'Node')}: {node.label}</h1>
                     <caption>{neos:backend.translate(id: 'service.nodes.nodeProperties', value: 'Node Properties')}</caption>
                     <tr>
                         <th>_identifier</th>
-                        <td class="node-identifier">{node.nodeAggregateId}</td>
+                        <td class="node-identifier">{node.nodeAggregateId.value}</td>
                     </tr>
                     <tr>
                         <th>_path</th>
@@ -48,7 +48,7 @@ <h1>{neos:backend.translate(id: 'node', value: 'Node')}: {node.label}</h1>
                         </f:else>
                     </f:if>
                 </f:alias>
-                <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
+                <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
             </div>
         </div>
     </body>