Properly implement EnumLabel

Author: Bernhard Schmitt

Classes/Domain/Enum/EnumLabel.php

@@ -18,7 +18,7 @@ final class EnumLabel
 
     private string $packageKey;
 
-    private function __construct(
+    public function __construct(
         string $labelIdPrefix,
         string $sourceName,
         string $packageKey
@@ -30,15 +30,15 @@ private function __construct(
 
     public static function fromEnumName(string $enumName): self
     {
-        list($packageKey, $componentName) = explode('/Presentation/', $enumName);
-        $pivot = \mb_strrpos($componentName, '/') ?: null;
-        $componentNamespace = \mb_substr($packageKey, 0, $pivot);
-        $enumShort = lcfirst(\mb_substr($packageKey, $pivot+1));
+        list($packageNamespace, $componentName) = explode('\Presentation\\', $enumName);
+        $pivot = \mb_strrpos($componentName, '\\') ?: null;
+        $componentNamespace = \mb_substr($componentName, 0, $pivot);
+        $enumShort = lcfirst(\mb_substr($componentName, $pivot+1));
 
         return new self(
             $enumShort . '.',
-            \str_replace('/', '.', $componentNamespace),
-            \str_replace('/', '.', $packageKey)
+            \str_replace('\\', '.', $componentNamespace),
+            \str_replace('\\', '.', $packageNamespace)
         );
     }
 

Tests/Unit/Domain/Enum/EnumLabelTest.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+namespace PackageFactory\AtomicFusion\PresentationObjects\Tests\Unit\Domain\Enum;
+
+/*
+ * This file is part of the PackageFactory.AtomicFusion.PresentationObjects package
+ */
+
+use Neos\Flow\Tests\UnitTestCase;
+use PackageFactory\AtomicFusion\PresentationObjects\Domain\Enum\EnumLabel;
+use PHPUnit\Framework\Assert;
+
+/**
+ * Test cases for EnumLabel
+ */
+class EnumLabelTest extends UnitTestCase
+{
+    /**
+     * @param string $enumName
+     * @param EnumLabel $expectedLabel
+     * @dataProvider enumProvider
+     */
+    public function testFromEnumName(string $enumName, EnumLabel $expectedLabel): void
+    {
+        Assert::assertEquals(
+            $expectedLabel,
+            EnumLabel::fromEnumName($enumName)
+        );
+    }
+
+    /**
+     * @return array<int, array<int, class-string<mixed>|EnumLabel>>
+     */
+    public function enumProvider(): array
+    {
+        return [
+            [
+                'Vendor\Site\Presentation\Component\Headline\HeadlineType',
+                new EnumLabel('headlineType.', 'Component.Headline', 'Vendor.Site')
+            ],
+            [
+                'Vendor\Site\Presentation\Component\MyNewComponent\MyStringPseudoEnum',
+                new EnumLabel('myStringPseudoEnum.', 'Component.MyNewComponent', 'Vendor.Site')
+            ]
+        ];
+    }
+}