TASK: Declare ChangeInterface::getSubject as non nullable

neos · Jun 24, 2024 · 7169667 · 7169667
1 parent 2b08575
commit 7169667
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 124 deletions.
diff --git a/Classes/Application/SyncWorkspace/SyncWorkspaceCommand.php b/Classes/Application/SyncWorkspace/SyncWorkspaceCommand.php
@@ -32,7 +32,7 @@
     public function __construct(
         public ContentRepositoryId $contentRepositoryId,
         public WorkspaceName $workspaceName,
-        public DimensionSpacePoint $preferredDimensionSpacePoint,
+        public ?DimensionSpacePoint $preferredDimensionSpacePoint,
         public RebaseErrorHandlingStrategy $rebaseErrorHandlingStrategy
     ) {
     }

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -17,6 +17,7 @@
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\WorkspaceModification\Exception\WorkspaceIsNotEmptyException;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Dto\RebaseErrorHandlingStrategy;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregateCurrentlyDoesNotExist;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint;
@@ -477,24 +478,28 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
         // todo ensure that https://github.com/neos/neos-ui/pull/3734 doesnt need to be refixed in Neos 9.0
         $redirectNode = $documentNode;
         while (true) {
+            // @phpstan-ignore-next-line
             $redirectNodeInBaseWorkspace = $subgraph->findNodeById($redirectNode->aggregateId);
             if ($redirectNodeInBaseWorkspace) {
                 break;
             } else {
+                // @phpstan-ignore-next-line
                 $redirectNode = $subgraph->findParentNode($redirectNode->aggregateId);
                 // get parent always returns Node
                 if (!$redirectNode) {
                     throw new \Exception(
                         sprintf(
                             'Wasn\'t able to locate any valid node in rootline of node %s in the workspace %s.',
-                            $documentNode->aggregateId->value,
+                            $documentNode?->aggregateId->value,
                             $targetWorkspaceName
                         ),
                         1458814469
                     );
                 }
             }
         }
+        /** @var Node $documentNode */
+        /** @var Node $redirectNode */
 
         // If current document node exists in the base workspace, then reload, else redirect
         if ($redirectNode->equals($documentNode)) {

diff --git a/Classes/Domain/Model/AbstractChange.php b/Classes/Domain/Model/AbstractChange.php
@@ -28,7 +28,7 @@
  */
 abstract class AbstractChange implements ChangeInterface
 {
-    protected ?Node $subject = null;
+    protected Node $subject;
 
     #[Flow\Inject]
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
@@ -56,7 +56,7 @@ final public function setSubject(Node $subject): void
         $this->subject = $subject;
     }
 
-    final public function getSubject(): ?Node
+    final public function getSubject(): Node
     {
         return $this->subject;
     }
@@ -66,13 +66,11 @@ final public function getSubject(): ?Node
      */
     final protected function updateWorkspaceInfo(): void
     {
-        if (!is_null($this->subject)) {
-            $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
-            $documentNode = $subgraph->findClosestNode($this->subject->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
-            if (!is_null($documentNode)) {
-                $updateWorkspaceInfo = new UpdateWorkspaceInfo($documentNode->contentRepositoryId, $documentNode->workspaceName);
-                $this->feedbackCollection->add($updateWorkspaceInfo);
-            }
+        $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
+        $documentNode = $subgraph->findClosestNode($this->subject->aggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
+        if (!is_null($documentNode)) {
+            $updateWorkspaceInfo = new UpdateWorkspaceInfo($documentNode->contentRepositoryId, $documentNode->workspaceName);
+            $this->feedbackCollection->add($updateWorkspaceInfo);
         }
     }
 
@@ -108,11 +106,9 @@ protected function reloadDocument(Node $node = null): void
      */
     final protected function addNodeCreatedFeedback(Node $subject = null): void
     {
-        $node = $subject ?: $this->getSubject();
-        if ($node) {
-            $nodeCreated = new NodeCreated();
-            $nodeCreated->setNode($node);
-            $this->feedbackCollection->add($nodeCreated);
-        }
+        $node = $subject ?? $this->getSubject();
+        $nodeCreated = new NodeCreated();
+        $nodeCreated->setNode($node);
+        $this->feedbackCollection->add($nodeCreated);
     }
 }
diff --git a/Classes/Domain/Model/ChangeInterface.php b/Classes/Domain/Model/ChangeInterface.php
@@ -29,7 +29,7 @@ public function setSubject(Node $subject): void;
     /**
      * Get the subject
      */
-    public function getSubject(): ?Node;
+    public function getSubject(): Node;
 
     /**
      * Checks whether this change can be applied to the subject

diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -102,7 +102,7 @@ public function getSiblingDomAddress(): ?RenderedNodeDomAddress
      */
     public function getSiblingNode(): ?Node
     {
-        if ($this->siblingDomAddress === null || !$this->getSubject()) {
+        if ($this->siblingDomAddress === null) {
             return null;
         }
 

diff --git a/Classes/Domain/Model/Changes/CopyAfter.php b/Classes/Domain/Model/Changes/CopyAfter.php
@@ -30,9 +30,6 @@ class CopyAfter extends AbstractStructuralChange
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $siblingNode = $this->getSiblingNode();
         if (is_null($siblingNode)) {
             return false;
@@ -57,7 +54,7 @@ public function apply(): void
             : null;
         $subject = $this->subject;
 
-        if ($this->canApply() && $subject && !is_null($previousSibling) && !is_null($parentNodeOfPreviousSibling)) {
+        if ($this->canApply() && !is_null($previousSibling) && !is_null($parentNodeOfPreviousSibling)) {
             $succeedingSibling = null;
             try {
                 $succeedingSibling = $this->findChildNodes($parentNodeOfPreviousSibling)->next($previousSibling);

diff --git a/Classes/Domain/Model/Changes/CopyBefore.php b/Classes/Domain/Model/Changes/CopyBefore.php
@@ -28,9 +28,6 @@ class CopyBefore extends AbstractStructuralChange
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $siblingNode = $this->getSiblingNode();
         if (is_null($siblingNode)) {
             return false;
@@ -57,7 +54,7 @@ public function apply(): void
             ? $this->findParentNode($succeedingSibling)
             : null;
         $subject = $this->subject;
-        if ($this->canApply() && !is_null($subject) && !is_null($succeedingSibling)
+        if ($this->canApply() && !is_null($succeedingSibling)
             && !is_null($parentNodeOfSucceedingSibling)
         ) {
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);

diff --git a/Classes/Domain/Model/Changes/CopyInto.php b/Classes/Domain/Model/Changes/CopyInto.php
@@ -51,7 +51,7 @@ public function canApply(): bool
     {
         $parentNode = $this->getParentNode();
 
-        return $this->subject && $parentNode && $this->isNodeTypeAllowedAsChildNode($parentNode, $this->subject->nodeTypeName);
+        return $parentNode && $this->isNodeTypeAllowedAsChildNode($parentNode, $this->subject->nodeTypeName);
     }
 
     public function getMode(): string
@@ -66,7 +66,7 @@ public function apply(): void
     {
         $subject = $this->getSubject();
         $parentNode = $this->getParentNode();
-        if ($parentNode && $subject && $this->canApply()) {
+        if ($parentNode && $this->canApply()) {
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
                 $contentRepository->getContentGraph($subject->workspaceName)->getSubgraph(

diff --git a/Classes/Domain/Model/Changes/Create.php b/Classes/Domain/Model/Changes/Create.php
@@ -40,7 +40,7 @@ public function canApply(): bool
         $subject = $this->getSubject();
         $nodeTypeName = $this->getNodeTypeName();
 
-        return $subject && $nodeTypeName && $this->isNodeTypeAllowedAsChildNode($subject, $nodeTypeName);
+        return $nodeTypeName && $this->isNodeTypeAllowedAsChildNode($subject, $nodeTypeName);
     }
 
     /**
@@ -49,7 +49,7 @@ public function canApply(): bool
     public function apply(): void
     {
         $parentNode = $this->getSubject();
-        if ($parentNode && $this->canApply()) {
+        if ($this->canApply()) {
             $this->createNode($parentNode, null);
             $this->updateWorkspaceInfo();
         }

diff --git a/Classes/Domain/Model/Changes/CreateAfter.php b/Classes/Domain/Model/Changes/CreateAfter.php
@@ -32,9 +32,6 @@ public function getMode(): string
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $parent = $this->findParentNode($this->subject);
         $nodeTypeName = $this->getNodeTypeName();
 
@@ -46,9 +43,9 @@ public function canApply(): bool
      */
     public function apply(): void
     {
-        $parentNode = $this->subject ? $this->findParentNode($this->subject) : null;
+        $parentNode = $this->findParentNode($this->subject);
         $subject = $this->subject;
-        if ($this->canApply() && !is_null($subject) && !is_null($parentNode)) {
+        if ($this->canApply() && !is_null($parentNode)) {
             $succeedingSibling = null;
             try {
                 $succeedingSibling = $this->findChildNodes($parentNode)->next($subject);

diff --git a/Classes/Domain/Model/Changes/CreateBefore.php b/Classes/Domain/Model/Changes/CreateBefore.php
@@ -32,9 +32,6 @@ public function getMode(): string
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $parent = $this->findParentNode($this->subject);
         $nodeTypeName = $this->getNodeTypeName();
 
@@ -46,9 +43,9 @@ public function canApply(): bool
      */
     public function apply(): void
     {
-        $parent = $this->subject ? $this->findParentNode($this->subject) : null;
+        $parent = $this->findParentNode($this->subject);
         $subject = $this->subject;
-        if ($this->canApply() && !is_null($subject) && !is_null($parent)) {
+        if ($this->canApply() && !is_null($parent)) {
             $this->createNode($parent, $subject->aggregateId);
             $this->updateWorkspaceInfo();
         }

diff --git a/Classes/Domain/Model/Changes/MoveAfter.php b/Classes/Domain/Model/Changes/MoveAfter.php
@@ -30,9 +30,6 @@ class MoveAfter extends AbstractStructuralChange
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $sibling = $this->getSiblingNode();
         if (is_null($sibling)) {
             return false;
@@ -58,9 +55,8 @@ public function apply(): void
         $parentNodeOfPreviousSibling = $precedingSibling ? $this->findParentNode($precedingSibling) : null;
         // "subject" is the to-be-moved node
         $subject = $this->subject;
-        $parentNode = $this->subject ? $this->findParentNode($this->subject) : null;
+        $parentNode = $this->findParentNode($this->subject);
         if ($this->canApply()
-            && !is_null($subject)
             && !is_null($precedingSibling)
             && !is_null($parentNodeOfPreviousSibling)
             && !is_null($parentNode)

diff --git a/Classes/Domain/Model/Changes/MoveBefore.php b/Classes/Domain/Model/Changes/MoveBefore.php
@@ -29,9 +29,6 @@ class MoveBefore extends AbstractStructuralChange
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $siblingNode = $this->getSiblingNode();
         if (is_null($siblingNode)) {
             return false;
@@ -54,9 +51,9 @@ public function apply(): void
         $succeedingSibling = $this->getSiblingNode();
         // "subject" is the to-be-moved node
         $subject = $this->subject;
-        $parentNode = $subject ? $this->findParentNode($subject) : null;
+        $parentNode = $this->findParentNode($subject);
         $succeedingSiblingParent = $succeedingSibling ? $this->findParentNode($succeedingSibling) : null;
-        if ($this->canApply() && !is_null($subject) && !is_null($succeedingSibling)
+        if ($this->canApply() && !is_null($succeedingSibling)
             && !is_null($parentNode) && !is_null($succeedingSiblingParent)
         ) {
             $precedingSibling = null;

diff --git a/Classes/Domain/Model/Changes/MoveInto.php b/Classes/Domain/Model/Changes/MoveInto.php
@@ -33,7 +33,7 @@ public function setParentContextPath(string $parentContextPath): void
 
     public function getParentNode(): ?Node
     {
-        if ($this->parentContextPath === null || !$this->getSubject()) {
+        if ($this->parentContextPath === null) {
             return null;
         }
 
@@ -57,9 +57,6 @@ public function getMode(): string
      */
     public function canApply(): bool
     {
-        if (is_null($this->subject)) {
-            return false;
-        }
         $parent = $this->getParentNode();
 
         return $parent && $this->isNodeTypeAllowedAsChildNode($parent, $this->subject->nodeTypeName);
@@ -74,7 +71,7 @@ public function apply(): void
         $parentNode = $this->getParentNode();
         // "subject" is the to-be-moved node
         $subject = $this->subject;
-        if ($this->canApply() && $parentNode && $subject) {
+        if ($this->canApply() && $parentNode) {
             $otherParent = $this->contentRepositoryRegistry->subgraphForNode($subject)
                 ->findParentNode($subject->aggregateId);
 

diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
@@ -126,7 +126,7 @@ public function getIsInline(): bool
     public function canApply(): bool
     {
         $propertyName = $this->getPropertyName();
-        if (!$this->subject || !$propertyName) {
+        if (!$propertyName) {
             return false;
         }
         $nodeType = $this->getNodeType($this->subject);
@@ -147,9 +147,9 @@ public function canApply(): bool
     public function apply(): void
     {
         $subject = $this->subject;
-        $nodeType = $subject ? $this->getNodeType($subject) : null;
+        $nodeType = $this->getNodeType($subject);
         $propertyName = $this->getPropertyName();
-        if (is_null($subject) || is_null($nodeType) || is_null($propertyName) || $this->canApply() === false) {
+        if (is_null($nodeType) || is_null($propertyName) || $this->canApply() === false) {
             return;
         }
 

diff --git a/Classes/Domain/Model/Changes/Remove.php b/Classes/Domain/Model/Changes/Remove.php
@@ -34,20 +34,14 @@
  */
 class Remove extends AbstractChange
 {
-    /**
-     * @Flow\Inject
-     * @var ContentCacheFlusher
-     */
-    protected $contentCacheFlusher;
-
     /**
      * Checks whether this change can be applied to the subject
      *
      * @return boolean
      */
     public function canApply(): bool
     {
-        return !is_null($this->subject);
+        return true;
     }
 
     /**
@@ -60,7 +54,7 @@ public function canApply(): bool
     public function apply(): void
     {
         $subject = $this->subject;
-        if ($this->canApply() && !is_null($subject)) {
+        if ($this->canApply()) {
             $parentNode = $this->findParentNode($subject);
             if (is_null($parentNode)) {
                 throw new \InvalidArgumentException(