Merge pull request #5295 from mhsdesign/task/remove-deprecations-of-b…

…eta-14 TASK: Remove deprecations of beta 14
neos · Oct 23, 2024 · d30376d · d30376d
2 parents f7aaa60 + 65218bd
commit d30376d
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 310 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php
@@ -20,9 +20,9 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
- * @api events are the persistence-API of the content repository
- * @deprecated this is no longer logged, instead an exception is thrown
- * @see Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed
+ * @deprecated This event will never be emitted, and it is ignored in the core projections. This implementation is just kept for backwards-compatibility
+ * instead an exception is thrown: {@see \Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed}
+ * @internal
  */
 final readonly class WorkspaceRebaseFailed implements EventInterface, EmbedsWorkspaceName
 {

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/NodePath.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/NodePath.php
@@ -38,11 +38,6 @@
  */
 final readonly class NodePath implements \JsonSerializable
 {
-    /**
-     * @deprecated use {@see self::serializeToString()} instead
-     */
-    public string $value;
-
     /**
      * @var array<NodeName>
      */
@@ -51,7 +46,6 @@
     private function __construct(NodeName ...$nodeNames)
     {
         $this->nodeNames = $nodeNames;
-        $this->value = $this->serializeToString();
     }
 
     public static function forRoot(): self

diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/IdOperation.php
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/LabelOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/LabelOperation.php
diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NodeTypeNameOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NodeTypeNameOperation.php
diff --git a/Neos.Neos/Classes/Domain/Model/User.php b/Neos.Neos/Classes/Domain/Model/User.php
@@ -26,7 +26,7 @@
  * @Flow\Scope("prototype")
  * @api
  */
-class User extends Person implements UserInterface
+class User extends Person
 {
     /**
      * Preferences of this user

diff --git a/Neos.Neos/Classes/Domain/Model/UserInterface.php b/Neos.Neos/Classes/Domain/Model/UserInterface.php
diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
@@ -30,17 +30,12 @@
 use Neos\Neos\Domain\NodeLabel\NodeLabelGeneratorInterface;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\Presentation\VisualNodePath;
-use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
 
 /**
  * Eel helper for ContentRepository Nodes
  */
 class NodeHelper implements ProtectedContextAwareInterface
 {
-    use NodeTypeWithFallbackProvider {
-        getNodeType as legacyGetNodeTypeWithFallback;
-    }
-
     #[Flow\Inject]
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
 
@@ -120,14 +115,6 @@ public function isNodeTypeExistent(Node $node): bool
         return $contentRepository->getNodeTypeManager()->hasNodeType($node->nodeTypeName);
     }
 
-    /**
-     * @deprecated with 9.0.0-beta14 please use Neos.Node.nodeType() instead and dont rely on the fallback behaviour
-     */
-    public function getNodeType(Node $node): NodeType
-    {
-        return $this->legacyGetNodeTypeWithFallback($node);
-    }
-
     /**
      * @internal experimental API without documentation and clear use-case
      */

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature
@@ -127,7 +127,7 @@ Feature: Tests for the "Neos.Neos:ContentCollection" Fusion prototype
     include: resource://Neos.Neos/Private/Fusion/Root.fusion
 
     prototype(Neos.Neos:Test.ContentType) < prototype(Neos.Fusion:Value) {
-      value = ${q(node).id() + ' (' + node.nodeTypeName.value + ') '}
+      value = ${node.aggregateId + ' (' + node.nodeTypeName.value + ') '}
     }
 
     test = Neos.Neos:ContentCollection {

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/FlowQuery.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/FlowQuery.feature
@@ -101,7 +101,7 @@ Feature: Tests for the "Neos.ContentRepository" Flow Query methods.
       renderer = Neos.Fusion:Loop {
         items = ${props.nodes}
         itemName = 'node'
-        itemRenderer = ${q(node).id()}
+        itemRenderer = ${node.aggregateId}
         @glue = ','
       }
     }

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature
@@ -101,7 +101,7 @@ Feature: Tests for the "Neos.Neos:Menu" and related Fusion prototypes
       renderer = Neos.Fusion:Loop {
         items = ${props.items}
         itemRenderer = afx`
-          {q(item.node).id()}<Neos.Neos:Test.Menu.ItemStateIndicator state={item.state.value} /> ({item.menuLevel}){String.chr(10)}
+          {item.node.aggregateId}<Neos.Neos:Test.Menu.ItemStateIndicator state={item.state.value} /> ({item.menuLevel}){String.chr(10)}
           <Neos.Neos:Test.Menu items={item.subItems} @if={item.subItems} />
         `
       }