diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
index 2d12d76f4be..11b59f29b47 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
@@ -279,7 +279,8 @@ protected function createNodeTypeManager(PyStringNode $serializedNodeTypesConfig
         return new NodeTypeManager(
             fn (): array => Yaml::parse($serializedNodeTypesConfiguration->getRaw()),
             new class implements NodeLabelGeneratorFactoryInterface {
-                public function create(NodeType $nodeType): NodeLabelGeneratorInterface {
+                public function create(NodeType $nodeType): NodeLabelGeneratorInterface
+                {
                     return new class implements NodeLabelGeneratorInterface {
                         public function getLabel(Node $node): string
                         {
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/GherkinTableNodeBasedContentDimensionSource.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/GherkinTableNodeBasedContentDimensionSource.php
index 34be46a8c8c..0bc38923894 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/GherkinTableNodeBasedContentDimensionSource.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/Helpers/GherkinTableNodeBasedContentDimensionSource.php
@@ -62,6 +62,7 @@ public static function fromGherkinTableNode(TableNode $tableNode): self
             }
 
             foreach (Arrays::trimExplode(',', $row['Values']) as $rawDimensionValue) {
+                /** @var string $rawDimensionValue */
                 $dimensionValueConfiguration = [];
                 $dimensionValues[$rawDimensionValue] = new ContentDimensionValue(
                     $rawDimensionValue,
@@ -76,8 +77,10 @@ public static function fromGherkinTableNode(TableNode $tableNode): self
             }
 
             $dimensionConfiguration = [];
-            $dimensions[$row['Identifier']] = new ContentDimension(
-                new ContentDimensionId($row['Identifier']),
+            /** @var string $dimensionId */
+            $dimensionId = $row['Identifier'];
+            $dimensions[$dimensionId] = new ContentDimension(
+                new ContentDimensionId($dimensionId),
                 new ContentDimensionValues($dimensionValues),
                 new ContentDimensionValueVariationEdges($variationEdges),
                 $dimensionConfiguration