TASK: Remove NodeLabel functionality again (merge #5020)

neos · May 14, 2024 · 5e04763 · 5e04763
1 parent 3af6cdb
commit 5e04763
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 34 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/NodeType/ClosureNodeTypeProvider.php b/Neos.ContentRepository.Core/Classes/NodeType/ClosureNodeTypeProvider.php
@@ -92,8 +92,7 @@ private function loadNodeType(string $nodeTypeName, array &$completeNodeTypeConf
         $nodeType = new NodeType(
             NodeTypeName::fromString($nodeTypeName),
             $superTypes,
-            $nodeTypeConfiguration,
-            $this->nodeLabelGeneratorFactory
+            $nodeTypeConfiguration
         );
 
         $this->cachedNodeTypes = $this->cachedNodeTypes->with($nodeType);

diff --git a/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php b/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php
@@ -15,7 +15,6 @@
  */
 
 use Neos\ContentRepository\Core\NodeType\Exception\TetheredNodeNotConfigured;
-use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Node\PropertyName;
 
@@ -45,7 +44,6 @@ private function __construct(
         public NodeTypeConstraints $childNodeTypeConstraints,
         public array $metadata,
         public NodeTypeLabel|null $label,
-        private NodeLabelGeneratorInterface|null $nodeLabelGenerator,
     ) {
     }
 
@@ -139,14 +137,6 @@ public function getOptions(): array
         return $this->metadata['options'] ?? [];
     }
 
-    /**
-     * Return the node label generator class for the given node
-     */
-    public function renderNodeLabel(Node $node): string
-    {
-        return $this->nodeLabelGenerator !== null ? $this->nodeLabelGenerator->getLabel($node) : \mb_substr($node->nodeTypeName->value, \mb_strrpos($node->nodeTypeName->value, '.') + 1);
-    }
-
     /**
      * Return the array with the defined properties. The key is the property name,
      * the value the property configuration. There are no guarantees on how the

diff --git a/Neos.ContentRepository.Core/Classes/NodeType/NodeTypeLabel.php b/Neos.ContentRepository.Core/Classes/NodeType/NodeTypeLabel.php
@@ -21,13 +21,6 @@
  */
 final class NodeTypeLabel implements \JsonSerializable
 {
-    public const ROOT_NODE_TYPE_NAME = 'Neos.ContentRepository:Root';
-
-    /**
-     * @var array<string,self>
-     */
-    private static array $instances = [];
-
     private function __construct(
         public readonly string $value
     ) {
@@ -36,19 +29,9 @@ private function __construct(
         }
     }
 
-    private static function instance(string $value): self
-    {
-        return self::$instances[$value] ??= new self($value);
-    }
-
     public static function fromString(string $value): self
     {
-        return self::instance($value);
-    }
-
-    public function equals(self $other): bool
-    {
-        return $this === $other;
+        return new self($value);
     }
 
     public function jsonSerialize(): string

diff --git a/Neos.ContentRepositoryRegistry/Classes/Configuration/NodeTypeProvider.php b/Neos.ContentRepositoryRegistry/Classes/Configuration/NodeTypeProvider.php
@@ -16,7 +16,6 @@
 
 use Neos\ContentRepository\Core\NodeType\ConstraintCheck;
 use Neos\ContentRepository\Core\NodeType\Exception\TetheredNodeNotConfigured;
-use Neos\ContentRepository\Core\NodeType\NodeLabelGeneratorFactoryInterface;
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\NodeType\NodeTypeNames;
@@ -54,7 +53,6 @@ final class NodeTypeProvider implements NodeTypeProviderInterface
 
     public function __construct(
         private readonly ConfigurationManager $configurationManager,
-        private readonly NodeLabelGeneratorFactoryInterface $nodeLabelGeneratorFactory
     ) {
     }
 
@@ -341,8 +339,7 @@ private function loadNodeType(string $nodeTypeName, array &$completeNodeTypeConf
         $nodeType = new NodeType(
             NodeTypeName::fromString($nodeTypeName),
             $superTypes,
-            $nodeTypeConfiguration,
-            $this->nodeLabelGeneratorFactory
+            $nodeTypeConfiguration
         );
 
         $this->cachedNodeTypes[$nodeTypeName] = $nodeType;