TASK: Remove outdated todos

neos · Nov 7, 2024 · 702f69a · 702f69a
1 parent 8233186
commit 702f69a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 61 deletions.
diff --git a/Neos.ContentRepository.BehavioralTests/Configuration/Settings.yaml b/Neos.ContentRepository.BehavioralTests/Configuration/Settings.yaml
@@ -23,69 +23,18 @@ Neos:
       test_parallel:
         eventStore:
           factoryObjectName: Neos\ContentRepositoryRegistry\Factory\EventStore\DoctrineEventStoreFactory
-
         nodeTypeManager:
           factoryObjectName: Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory
-
         contentDimensionSource:
-          factoryObjectName: Neos\ContentRepositoryRegistry\Factory\ContentDimensionSource\ConfigurationBasedContentDimensionSourceFactory
-          options:
-            contentDimensions: []
-
+          factoryObjectName: Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinTableNodeBasedContentDimensionSourceFactory
         userIdProvider:
           factoryObjectName: Neos\ContentRepositoryRegistry\Factory\UserIdProvider\StaticUserIdProviderFactory
-
         clock:
           factoryObjectName: Neos\ContentRepositoryRegistry\Factory\Clock\SystemClockFactory
-
-        propertyConverters:
-          DateTimeNormalizer:
-            className: Symfony\Component\Serializer\Normalizer\DateTimeNormalizer
-          ScalarNormalizer:
-            className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ScalarNormalizer
-        #  EnumNormalizer:
-        #    className: Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer
-        #  ArrayNormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ArrayNormalizer
-        #  UriNormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\UriNormalizer
-        #  ValueObjectArrayDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ValueObjectArrayDenormalizer
-        #  ValueObjectBoolDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ValueObjectBoolDenormalizer
-        #  ValueObjectFloatDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ValueObjectFloatDenormalizer
-        #  ValueObjectIntDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ValueObjectIntDenormalizer
-        #  ValueObjectStringDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\ValueObjectStringDenormalizer
-        #  DoctrinePersistentObjectNormalizer:
-        #    className: Neos\ContentRepositoryRegistry\Infrastructure\Property\Normalizer\DoctrinePersistentObjectNormalizer
-        #  CollectionTypeDenormalizer:
-        #    className: Neos\ContentRepository\Core\Infrastructure\Property\Normalizer\CollectionTypeDenormalizer
-        #  ProxyAwareObjectNormalizer:
-        #    className: Neos\ContentRepositoryRegistry\Infrastructure\Property\Normalizer\ProxyAwareObjectNormalizer
-
+        propertyConverters: {}
         contentGraphProjection:
-          # NOTE: This introduces a soft-dependency to the neos/contentgraph-doctrinedbaladapter package, but it can be overridden when a different adapter is used
           factoryObjectName: Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjectionFactory
 
-
-
- # ContentRepositoryRegistry:
- #   contentRepositories:
- #     test_parallel:
- #       # todo new presets "gherkin" and/or "testing"
- #       preset: default
- #       contentDimensions: []
- #       # todo simple NodeType configuration here inline? Or respect that from the NT manager?
- #       userIdProvider:
- #         factoryObjectName: 'Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\FakeUserIdProviderFactory'
- #       clock:
- #         factoryObjectName: 'Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\FakeClockFactory'
- #       nodeTypeManager:
- #         factoryObjectName: 'Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory'
-#
   Flow:
     object:
       includeClasses:

diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Parallel/AbstractParallelTestCase.php b/Neos.ContentRepository.BehavioralTests/Tests/Parallel/AbstractParallelTestCase.php
@@ -82,6 +82,6 @@ final protected function setUpContentRepository(
 
     final protected function log(string $message): void
     {
-        file_put_contents(self::LOGGING_PATH, substr(self::class, strrpos(self::class, '\\') + 1) . ': ' . getmypid() . ': ' .  $message . PHP_EOL, FILE_APPEND);
+        file_put_contents(self::LOGGING_PATH, substr($this::class, strrpos($this::class, '\\') + 1) . ': ' . getmypid() . ': ' .  $message . PHP_EOL, FILE_APPEND);
     }
 }
diff --git a/...avioralTests/Tests/Parallel/WorkspaceWritingDuringRebase/WorkspaceWritingDuringRebase.php b/...avioralTests/Tests/Parallel/WorkspaceWritingDuringRebase/WorkspaceWritingDuringRebase.php
@@ -57,6 +57,7 @@ public function setUp(): void
     {
         parent::setUp();
         $this->log('------ process started ------');
+        // todo refrain from Gherkin naming here and make fakes easier to use: https://github.com/neos/neos-development-collection/pull/5346
         GherkinTableNodeBasedContentDimensionSourceFactory::$contentDimensionsToUse = new class implements ContentDimensionSourceInterface
         {
             public function getDimension(ContentDimensionId $dimensionId): ?ContentDimension
@@ -68,8 +69,8 @@ public function getContentDimensionsOrderedByPriority(): array
                 return [];
             }
         };
-
-        GherkinPyStringNodeBasedNodeTypeManagerFactory::$nodeTypesToUse = $n = new NodeTypeManager(
+        // todo refrain from Gherkin naming here and make fakes easier to use: https://github.com/neos/neos-development-collection/pull/5346
+        GherkinPyStringNodeBasedNodeTypeManagerFactory::$nodeTypesToUse = new NodeTypeManager(
             fn (): array => [
                 'Neos.ContentRepository:Root' => [],
                 'Neos.ContentRepository.Testing:Document' => [
@@ -82,9 +83,6 @@ public function getContentDimensionsOrderedByPriority(): array
             ]
         );
 
-        // todo remove?
-        $this->contentRepositoryRegistry->resetFactoryInstance(ContentRepositoryId::fromString('test_parallel'));
-
         $setupLockResource = fopen(self::SETUP_LOCK_PATH, 'w+');
 
         $exclusiveNonBlockingLockResult = flock($setupLockResource, LOCK_EX | LOCK_NB);
@@ -136,8 +134,6 @@ public function getContentDimensionsOrderedByPriority(): array
                     'title' => 'title'
                 ])
             ));
-            // give the database lock some time to recover
-            // TODO? Why? usleep(5000);
         }
         $this->contentRepository = $contentRepository;