Merge pull request #5048 from mhsdesign/task/combineTwoNodeTypeNotFou…

…ndExceptionsIntoOne

TASK: Combine two `NodeTypeNotFoundExceptions` into one

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php

@@ -22,7 +22,6 @@
 use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
-use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity;
 use Neos\ContentRepository\Core\Projection\ContentGraph\CoverageByOrigin;
 use Neos\ContentRepository\Core\Projection\ContentGraph\DimensionSpacePointsBySubtreeTags;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
@@ -36,8 +35,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Timestamps;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
@@ -159,7 +157,7 @@ public function mapReferenceRowsToReferences(
 
     /**
      * @param array<int,array<string,string>> $nodeRows
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function mapNodeRowsToNodeAggregate(
         array $nodeRows,
@@ -243,7 +241,7 @@ public function mapNodeRowsToNodeAggregate(
     /**
      * @param iterable<int,array<string,string>> $nodeRows
      * @return iterable<int,NodeAggregate>
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function mapNodeRowsToNodeAggregates(
         iterable $nodeRows,

Neos.ContentRepository.Core/Classes/Feature/Common/ConstraintChecks.php

@@ -52,7 +52,6 @@
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeIsNotOfTypeRoot;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeIsOfTypeRoot;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
 use Neos\ContentRepository\Core\SharedModel\Exception\PropertyCannotBeSet;
 use Neos\ContentRepository\Core\SharedModel\Exception\ReferenceCannotBeSet;
 use Neos\ContentRepository\Core\SharedModel\Exception\RootNodeAggregateDoesNotExist;
@@ -172,7 +171,7 @@ protected function requireRootNodeTypeToBeUnoccupied(
 
     /**
      * @param NodeType $nodeType
-     * @throws NodeTypeNotFoundException the configured child nodeType doesnt exist
+     * @throws NodeTypeNotFound the configured child nodeType doesnt exist
      */
     protected function requireTetheredDescendantNodeTypesToExist(NodeType $nodeType): void
     {
@@ -312,7 +311,7 @@ protected function requireConstraintsImposedByAncestorsAreMet(
     }
 
     /**
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      * @throws NodeConstraintException
      */
     protected function requireNodeTypeConstraintsImposedByParentToBeMet(

Neos.ContentRepository.Core/Classes/Feature/NodeCreation/NodeCreation.php

@@ -37,7 +37,7 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamDoesNotExistYet;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Exception\PropertyCannotBeSet;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
@@ -122,7 +122,7 @@ private function validateProperties(?PropertyValuesToWrite $propertyValues, Node
 
     /**
      * @throws ContentStreamDoesNotExistYet
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     private function handleCreateNodeAggregateWithNodeAndSerializedProperties(
         CreateNodeAggregateWithNodeAndSerializedProperties $command,
@@ -252,7 +252,7 @@ private function createRegularWithNode(
 
     /**
      * @throws ContentStreamDoesNotExistYet
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     private function handleTetheredChildNodes(
         CreateNodeAggregateWithNodeAndSerializedProperties $command,

Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php

@@ -36,7 +36,6 @@
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregatesTypeIsAmbiguous;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 
@@ -97,7 +96,7 @@ abstract protected function createEventsForMissingTetheredNode(
     /**
      * @throws NodeTypeNotFound
      * @throws NodeConstraintException
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      * @throws NodeAggregatesTypeIsAmbiguous
      * @throws \Exception
      */
@@ -225,7 +224,7 @@ private function handleChangeNodeAggregateType(
     /**
      * NOTE: when changing this method, {@see NodeTypeChange::deleteDisallowedNodesWhenChangingNodeType}
      * needs to be modified as well (as they are structurally the same)
-     * @throws NodeConstraintException|NodeTypeNotFoundException
+     * @throws NodeConstraintException|NodeTypeNotFound
      */
     private function requireConstraintsImposedByHappyPathStrategyAreMet(
         ContentGraphInterface $contentGraph,

Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeHandling.php

@@ -38,7 +38,6 @@
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregatesTypeIsAmbiguous;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeIsNotOfTypeRoot;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
@@ -180,7 +179,7 @@ private function handleUpdateRootNodeAggregateDimensions(
 
     /**
      * @throws ContentStreamDoesNotExistYet
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     private function handleTetheredRootChildNodes(
         ContentStreamId $contentStreamId,

Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php

@@ -618,7 +618,7 @@ function () use ($commandHandlingDependencies, $remainingCommands) {
      * @throws WorkspaceDoesNotExist
      * @throws WorkspaceHasNoBaseWorkspaceName
      * @throws \Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException
-     * @throws \Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException
+     * @throws \Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
      */
     private function handleDiscardIndividualNodesFromWorkspace(

Neos.ContentRepository.Core/Classes/NodeType/NodeTypeManager.php

@@ -17,7 +17,7 @@
 use Neos\ContentRepository\Core\NodeType\Exception\TetheredNodeNotConfigured;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeConfigurationException;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeIsFinalException;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\Utility\Arrays;
 use Neos\Utility\Exception\PropertyNotAccessibleException;
@@ -108,7 +108,7 @@ public function getSubNodeTypes(string|NodeTypeName $superTypeName, bool $includ
     /**
      * Returns the specified node type (which could be abstract)
      *
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function getNodeType(string|NodeTypeName $nodeTypeName): ?NodeType
     {
@@ -269,7 +269,7 @@ public function isNodeTypeAllowedAsChildToTetheredNode(NodeType $parentNodeType,
      * @param array<string,mixed> $completeNodeTypeConfiguration the full node type configuration for all node types
      * @throws NodeConfigurationException
      * @throws NodeTypeIsFinalException
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     private function loadNodeType(string $nodeTypeName, array &$completeNodeTypeConfiguration): NodeType
     {
@@ -278,7 +278,7 @@ private function loadNodeType(string $nodeTypeName, array &$completeNodeTypeConf
         }
 
         if (!isset($completeNodeTypeConfiguration[$nodeTypeName])) {
-            throw new NodeTypeNotFoundException('Node type "' . $nodeTypeName . '" does not exist', 1316451800);
+            throw new NodeTypeNotFound('Node type "' . $nodeTypeName . '" does not exist', 1316451800);
         }
 
         $nodeTypeConfiguration = $completeNodeTypeConfiguration[$nodeTypeName];
@@ -384,7 +384,7 @@ private function evaluateSuperTypeConfiguration(
      */
     public function requireNodeType(string|NodeTypeName $nodeTypeName): NodeType
     {
-        return $this->getNodeType($nodeTypeName) ?? throw new NodeTypeNotFoundException(
+        return $this->getNodeType($nodeTypeName) ?? throw new NodeTypeNotFound(
             sprintf(
                 'The node type "%s" is not available',
                 $nodeTypeName instanceof NodeTypeName ? $nodeTypeName->value : $nodeTypeName

Neos.ContentRepository.Core/Tests/Unit/NodeType/NodeTypeManagerTest.php

@@ -16,7 +16,7 @@
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeConfigurationException;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeIsFinalException;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use PHPUnit\Framework\TestCase;
 
 /**

Neos.ContentRepository.StructureAdjustment/src/Adjustment/DimensionAdjustment.php

@@ -9,7 +9,7 @@
 use Neos\ContentRepository\Core\DimensionSpace\VariantType;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 
 class DimensionAdjustment
 {

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php

@@ -16,7 +16,7 @@
 
 use Behat\Gherkin\Node\TableNode;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\StructureAdjustment\Adjustment\StructureAdjustment;
 use Neos\ContentRepository\StructureAdjustment\StructureAdjustmentService;
 use Neos\ContentRepository\StructureAdjustment\StructureAdjustmentServiceFactory;
@@ -31,7 +31,7 @@ trait StructureAdjustmentsTrait
 
     /**
      * @When /^I adjust the node structure for node type "([^"]*)"$/
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function iAdjustTheNodeStructureForNodeType(string $nodeTypeName): void
     {
@@ -45,7 +45,7 @@ public function iAdjustTheNodeStructureForNodeType(string $nodeTypeName): void
 
     /**
      * @Then I expect no needed structure adjustments for type :nodeTypeName
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function iExpectNoStructureAdjustmentsForType(string $nodeTypeName): void
     {
@@ -58,7 +58,7 @@ public function iExpectNoStructureAdjustmentsForType(string $nodeTypeName): void
 
     /**
      * @Then /^I expect the following structure adjustments for type "([^"]*)":$/
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function iExpectTheFollowingStructureAdjustmentsForType(string $nodeTypeName, TableNode $expectedAdjustments): void
     {

Neos.Media.Browser/Classes/Controller/UsageController.php

@@ -14,7 +14,7 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindClosestNodeFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
@@ -107,7 +107,7 @@ public function relatedNodesAction(AssetInterface $asset)
             );
             try {
                 $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($nodeAggregate->nodeTypeName);
-            } catch (NodeTypeNotFoundException $e) {
+            } catch (NodeTypeNotFound $e) {
                 $nodeType = null;
             }
 

Neos.Neos/Classes/Command/SiteCommandController.php

@@ -15,7 +15,7 @@
 namespace Neos\Neos\Command;
 
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeNameIsAlreadyCovered;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
 use Neos\Flow\Package\PackageManager;
@@ -89,7 +89,7 @@ public function createCommand($name, $packageKey, $nodeType, $nodeName = null, $
 
         try {
             $this->siteService->createSite($packageKey, $name, $nodeType, $nodeName, $inactive);
-        } catch (NodeTypeNotFoundException $exception) {
+        } catch (NodeTypeNotFound $exception) {
             $this->outputLine('<error>The given node type "%s" was not found</error>', [$nodeType]);
             $this->quit(1);
         } catch (SiteNodeTypeIsInvalid $exception) {

Neos.Neos/Classes/Controller/Module/Administration/SitesController.php

@@ -19,7 +19,7 @@
 use Neos\ContentRepository\Core\Projection\Workspace\Workspace;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeNameIsAlreadyCovered;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
@@ -389,7 +389,7 @@ public function createSiteNodeAction($packageKey, $siteName, $nodeType)
     {
         try {
             $site = $this->siteService->createSite($packageKey, $siteName, $nodeType);
-        } catch (NodeTypeNotFoundException $exception) {
+        } catch (NodeTypeNotFound $exception) {
             $this->addFlashMessage(
                 $this->getModuleLabel('sites.siteCreationError.givenNodeTypeNotFound.body', [$nodeType]),
                 $this->getModuleLabel('sites.siteCreationError.givenNodeTypeNotFound.title'),

Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php

@@ -27,7 +27,7 @@
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
 use Neos\ContentRepository\Core\Service\ContentRepositoryBootstrapper;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeVariantSelectionStrategy;
 use Neos\Neos\Domain\Exception\SiteNodeTypeIsInvalid;
@@ -85,7 +85,7 @@ public function createSiteNodeIfNotExists(Site $site, string $nodeTypeName): voi
         );
         $siteNodeType = $this->nodeTypeManager->getNodeType($nodeTypeName);
         if (!$siteNodeType) {
-            throw new NodeTypeNotFoundException(
+            throw new NodeTypeNotFound(
                 'Cannot create a site using a non-existing node type.',
                 1412372375
             );

Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php

@@ -20,7 +20,7 @@
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
@@ -276,7 +276,7 @@ function (array $types, NodeType $superType) use ($self) {
     /**
      * Fetches possible usages of the asset and registers nodes that use the asset as changed.
      *
-     * @throws NodeTypeNotFoundException
+     * @throws NodeTypeNotFound
      */
     public function registerAssetChange(AssetInterface $asset): void
     {