From ee36cc29460aa2005a22b577080a85ba505a6d1f Mon Sep 17 00:00:00 2001 From: Sebastian Kurfuerst Date: Sun, 28 Aug 2022 11:39:24 +0200 Subject: [PATCH] rename namespaces Neos\ContentRepository to Neos\ContentRepository\Core --- ESCR/README.md | 2 +- ...ectionIntegrityViolationDetectionTrait.php | 8 +- .../composer.json | 2 +- .../DoctrineDbalContentGraphProjection.php | 70 +++++++------- ...trineDbalContentGraphProjectionFactory.php | 16 ++-- ...tegrityViolationDetectionRunnerFactory.php | 12 +-- .../Projection/Feature/NodeDisabling.php | 2 +- .../Domain/Projection/Feature/NodeMove.php | 6 +- .../Domain/Projection/Feature/NodeRemoval.php | 4 +- .../Projection/Feature/NodeVariation.php | 16 ++-- .../Feature/RestrictionRelations.php | 6 +- .../Domain/Projection/HierarchyRelation.php | 6 +- .../src/Domain/Projection/NodeRecord.php | 10 +- .../ProjectionIntegrityViolationDetector.php | 14 +-- .../src/Domain/Repository/ContentGraph.php | 32 +++---- .../src/Domain/Repository/ContentSubgraph.php | 42 ++++----- .../AllChildNodesByNodeIdentifierCache.php | 6 +- .../NamedChildNodeByNodeIdentifierCache.php | 6 +- .../NodeByNodeAggregateIdentifierCache.php | 4 +- .../InMemoryCache/NodePathCache.php | 4 +- ...deIdentifierByChildNodeIdentifierCache.php | 2 +- .../src/Domain/Repository/NodeFactory.php | 54 +++++------ .../Repository/ProjectionContentGraph.php | 14 +-- .../composer.json | 2 +- .../Feature/ContentStreamForking.php | 2 +- .../Domain/Projection/Feature/CopyOnWrite.php | 2 +- .../Projection/Feature/NodeCreation.php | 16 ++-- .../Projection/Feature/NodeDisabling.php | 4 +- .../Projection/Feature/NodeModification.php | 2 +- .../Projection/Feature/NodeReferencing.php | 2 +- .../Domain/Projection/Feature/NodeRemoval.php | 8 +- .../Projection/Feature/NodeRenaming.php | 2 +- .../Projection/Feature/NodeTypeChange.php | 2 +- .../Projection/Feature/NodeVariation.php | 14 +-- .../HierarchyHyperrelationRecord.php | 4 +- .../Projection/HypergraphProjection.php | 38 ++++---- .../Projection/NodeAggregateIdentifiers.php | 4 +- .../src/Domain/Projection/NodeRecord.php | 12 +-- .../Projection/ProjectionHypergraph.php | 10 +- .../Query/ProjectionHypergraphQuery.php | 10 +- .../Projection/ReferenceRelationRecord.php | 6 +- .../RestrictionHyperrelationRecord.php | 4 +- .../Domain/Repository/ContentHypergraph.php | 26 ++--- .../Repository/ContentSubhypergraph.php | 34 +++---- .../src/Domain/Repository/NodeFactory.php | 52 +++++----- .../Query/CommonGraphQueryOperations.php | 4 +- .../Repository/Query/HypergraphChildQuery.php | 16 ++-- .../Query/HypergraphParentQuery.php | 6 +- .../Repository/Query/HypergraphQuery.php | 10 +- .../Query/HypergraphReferenceQuery.php | 10 +- .../Query/HypergraphSiblingQuery.php | 8 +- .../Domain/Repository/Query/QueryUtility.php | 2 +- .../src/HypergraphProjectionFactory.php | 10 +- .../ContentStreamCommandController.php | 24 ++--- .../RaceTrackerCatchUpHook.php | 4 +- .../RaceTrackerCatchUpHookFactory.php | 6 +- .../composer.json | 2 +- .../Classes/CommandHandler/CommandBus.php | 6 +- .../CommandHandlerInterface.php | 6 +- .../CommandHandler/CommandInterface.php | 2 +- .../Classes/CommandHandler/CommandResult.php | 8 +- .../CommandHandler/PendingProjections.php | 10 +- .../Classes/ContentRepository.php | 30 +++--- ...nfigurationBasedContentDimensionSource.php | 10 +- .../Classes/Dimension/ContentDimension.php | 2 +- .../ContentDimensionConstraintSet.php | 2 +- .../Dimension/ContentDimensionConstraints.php | 2 +- .../Dimension/ContentDimensionIdentifier.php | 4 +- .../ContentDimensionSourceInterface.php | 2 +- .../Dimension/ContentDimensionValue.php | 4 +- ...ntentDimensionValueSpecializationDepth.php | 4 +- .../ContentDimensionValueVariationEdge.php | 2 +- .../ContentDimensionValueVariationEdges.php | 2 +- .../Dimension/ContentDimensionValues.php | 4 +- .../ContentDimensionIdentifierIsInvalid.php | 2 +- .../ContentDimensionValueIsInvalid.php | 2 +- ...nsionValueSpecializationDepthIsInvalid.php | 2 +- .../ContentDimensionValuesAreInvalid.php | 2 +- .../Exception/GeneralizationIsInvalid.php | 6 +- .../AbstractDimensionSpacePoint.php | 4 +- .../ContentDimensionZookeeper.php | 4 +- .../ContentSubgraphVariationWeight.php | 4 +- .../DimensionSpace/DimensionSpacePoint.php | 4 +- .../DimensionSpace/DimensionSpacePointSet.php | 2 +- ...ubgraphVariationWeightsAreIncomparable.php | 4 +- .../DimensionSpacePointIsNoSpecialization.php | 4 +- .../Exception/DimensionSpacePointNotFound.php | 4 +- .../InterDimensionalVariationGraph.php | 4 +- .../Classes/DimensionSpace/VariantType.php | 2 +- .../WeightedDimensionSpacePoint.php | 4 +- .../Classes/EventStore/DecoratedEvent.php | 2 +- .../Classes/EventStore/EventInterface.php | 2 +- .../Classes/EventStore/EventNormalizer.php | 56 +++++------ .../Classes/EventStore/EventPersister.php | 12 +-- .../Classes/EventStore/Events.php | 2 +- .../Classes/EventStore/EventsToPublish.php | 6 +- .../Factory/ContentRepositoryFactory.php | 34 +++---- .../Factory/ContentRepositoryIdentifier.php | 2 +- ...ntRepositoryServiceFactoryDependencies.php | 18 ++-- ...ntentRepositoryServiceFactoryInterface.php | 2 +- .../ContentRepositoryServiceInterface.php | 4 +- .../Factory/ProjectionFactoryDependencies.php | 16 ++-- .../Classes/Factory/ProjectionsFactory.php | 14 +-- .../Feature/Common/ConstraintChecks.php | 78 +++++++-------- ...ontentStreamAndNodeAggregateIdentifier.php | 6 +- .../Exception/ContentStreamAlreadyExists.php | 2 +- .../ContentStreamDoesNotExistYet.php | 2 +- .../DimensionSpacePointIsNotYetOccupied.php | 2 +- .../InvalidNodeTypePostprocessorException.php | 2 +- .../NodeAggregateCurrentlyDoesNotExist.php | 2 +- .../NodeAggregateCurrentlyExists.php | 2 +- ...esCurrentlyNotCoverDimensionSpacePoint.php | 6 +- ...urrentlyNotCoverDimensionSpacePointSet.php | 6 +- ...sCurrentlyNotOccupyDimensionSpacePoint.php | 6 +- .../Exception/NodeAggregateIsAmbiguous.php | 2 +- .../Exception/NodeAggregateIsDescendant.php | 2 +- .../Common/Exception/NodeAggregateIsRoot.php | 2 +- .../Exception/NodeAggregateIsTethered.php | 2 +- .../NodeAggregatesTypeIsAmbiguous.php | 2 +- .../Exception/NodeConfigurationException.php | 2 +- .../Exception/NodeConstraintException.php | 2 +- .../Exception/NodeNameIsAlreadyCovered.php | 2 +- .../Exception/NodeNameIsAlreadyOccupied.php | 2 +- .../Common/Exception/NodeTypeIsAbstract.php | 4 +- .../Exception/NodeTypeIsFinalException.php | 2 +- .../Exception/NodeTypeIsNotOfTypeRoot.php | 2 +- .../Common/Exception/NodeTypeIsOfTypeRoot.php | 2 +- .../Common/Exception/NodeTypeNotFound.php | 2 +- .../Exception/NodeTypeNotFoundException.php | 2 +- .../Common/Exception/PropertyCannotBeSet.php | 6 +- .../Exception/PropertyTypeIsInvalid.php | 6 +- .../Common/Exception/ReferenceCannotBeSet.php | 6 +- .../TetheredNodeAggregateCannotBeRemoved.php | 2 +- .../Exception/WorkspaceDoesNotExist.php | 4 +- .../WorkspaceHasNoBaseWorkspaceName.php | 4 +- ...eIdentifierToPublishOrDiscardInterface.php | 2 +- .../Common/NodeAggregateEventPublisher.php | 8 +- .../NodeAggregateIdentifiersByNodePaths.php | 6 +- .../NodeIdentifierToPublishOrDiscard.php | 12 +-- .../NodeIdentifiersToPublishOrDiscard.php | 2 +- .../Feature/Common/NodeReferenceToWrite.php | 4 +- .../Feature/Common/NodeReferencesToWrite.php | 6 +- .../Common/NodeVariantSelectionStrategy.php | 14 +-- .../Feature/Common/NodeVariationInternals.php | 26 ++--- .../Classes/Feature/Common/PropertyScope.php | 10 +- .../Feature/Common/PropertyValuesToWrite.php | 2 +- ...lishableToOtherContentStreamsInterface.php | 4 +- ...ebasableToOtherContentStreamsInterface.php | 6 +- .../Common/SerializedNodeReference.php | 4 +- .../Common/SerializedNodeReferences.php | 6 +- .../Common/SerializedPropertyValue.php | 2 +- .../Common/SerializedPropertyValues.php | 6 +- .../Feature/Common/TetheredNodeInternals.php | 28 +++--- .../Feature/ContentStreamCommandHandler.php | 32 +++---- .../Command/CreateContentStream.php | 8 +- .../Event/ContentStreamWasCreated.php | 8 +- .../Feature/ContentStreamEventStreamName.php | 4 +- .../Command/ForkContentStream.php | 8 +- .../Event/ContentStreamWasForked.php | 8 +- .../Command/RemoveContentStream.php | 8 +- .../Event/ContentStreamWasRemoved.php | 8 +- .../Command/AddDimensionShineThrough.php | 10 +- .../Command/MoveDimensionSpacePoint.php | 10 +- .../DimensionSpaceCommandHandler.php | 42 ++++----- .../Event/DimensionShineThroughWasAdded.php | 10 +- .../Event/DimensionSpacePointWasMoved.php | 10 +- .../DimensionSpacePointAlreadyExists.php | 2 +- .../Feature/NodeAggregateCommandHandler.php | 76 +++++++-------- .../Command/CreateNodeAggregateWithNode.php | 20 ++-- ...gregateWithNodeAndSerializedProperties.php | 28 +++--- .../Event/NodeAggregateWithNodeWasCreated.php | 26 ++--- .../Feature/NodeCreation/NodeCreation.php | 56 +++++------ .../Command/DisableNodeAggregate.php | 20 ++-- .../Command/EnableNodeAggregate.php | 20 ++-- .../Event/NodeAggregateWasDisabled.php | 16 ++-- .../Event/NodeAggregateWasEnabled.php | 16 ++-- ...teCurrentlyDisablesDimensionSpacePoint.php | 2 +- ...entlyDoesNotDisableDimensionSpacePoint.php | 2 +- .../Feature/NodeDisabling/NodeDisabling.php | 30 +++--- .../Command/CopyNodesRecursively.php | 26 ++--- .../NodeAggregateIdentifierMapping.php | 6 +- .../Command/NodeSubtreeSnapshot.php | 20 ++-- .../NodeDuplicationCommandHandler.php | 48 +++++----- .../Command/SetNodeProperties.php | 16 ++-- .../Command/SetSerializedNodeProperties.php | 22 ++--- .../Event/NodePropertiesWereSet.php | 18 ++-- .../NodeModification/NodeModification.php | 32 +++---- .../NodeMove/Command/MoveNodeAggregate.php | 22 ++--- .../Command/RelationDistributionStrategy.php | 2 +- .../NodeMove/Event/NodeAggregateWasMoved.php | 16 ++-- .../NodeMove/Event/NodeMoveMapping.php | 4 +- .../NodeMove/Event/NodeMoveMappings.php | 2 +- .../NodeMove/Event/NodeVariantAssignment.php | 6 +- .../NodeMove/Event/NodeVariantAssignments.php | 6 +- ...deVariantAssignmentCollectionIsInvalid.php | 4 +- .../Classes/Feature/NodeMove/NodeMove.php | 58 ++++++------ .../Command/SetNodeReferences.php | 24 ++--- .../Command/SetSerializedNodeReferences.php | 24 ++--- .../Event/NodeReferencesWereSet.php | 22 ++--- .../NodeReferencing/NodeReferencing.php | 38 ++++---- .../Command/RemoveNodeAggregate.php | 20 ++-- .../Event/NodeAggregateWasRemoved.php | 20 ++-- .../Feature/NodeRemoval/NodeRemoval.php | 30 +++--- .../Command/ChangeNodeAggregateName.php | 20 ++-- .../Event/NodeAggregateNameWasChanged.php | 16 ++-- .../Feature/NodeRenaming/NodeRenaming.php | 14 +-- .../Command/ChangeNodeAggregateType.php | 24 ++--- ...ldConstraintConflictResolutionStrategy.php | 2 +- .../Event/NodeAggregateTypeWasChanged.php | 14 +-- .../Feature/NodeTypeChange/NodeTypeChange.php | 54 +++++------ .../Command/CreateNodeVariant.php | 18 ++-- .../NodeGeneralizationVariantWasCreated.php | 18 ++-- .../Event/NodePeerVariantWasCreated.php | 18 ++-- .../NodeSpecializationVariantWasCreated.php | 18 ++-- .../DimensionSpacePointIsAlreadyOccupied.php | 2 +- .../Feature/NodeVariation/NodeVariation.php | 30 +++--- .../CreateRootNodeAggregateWithNode.php | 14 +-- .../RootNodeAggregateWithNodeWasCreated.php | 20 ++-- .../RootNodeCreation/RootNodeCreation.php | 34 +++---- .../Feature/WorkspaceCommandHandler.php | 94 +++++++++---------- .../Command/CreateRootWorkspace.php | 14 +-- .../Command/CreateWorkspace.php | 14 +-- .../Event/RootWorkspaceWasCreated.php | 16 ++-- .../Event/WorkspaceWasCreated.php | 16 ++-- .../Exception/BaseWorkspaceDoesNotExist.php | 4 +- .../Exception/WorkspaceAlreadyExists.php | 2 +- .../DiscardIndividualNodesFromWorkspace.php | 12 +-- .../Command/DiscardWorkspace.php | 10 +- .../Event/WorkspaceWasDiscarded.php | 10 +- .../Event/WorkspaceWasPartiallyDiscarded.php | 12 +-- .../PublishIndividualNodesFromWorkspace.php | 12 +-- .../Command/PublishWorkspace.php | 8 +- .../Event/WorkspaceWasPartiallyPublished.php | 12 +-- .../Event/WorkspaceWasPublished.php | 10 +- ...eWorkspaceHasBeenModifiedInTheMeantime.php | 2 +- .../Command/RebaseWorkspace.php | 10 +- .../Event/WorkspaceRebaseFailed.php | 10 +- .../Event/WorkspaceWasRebased.php | 10 +- .../WorkspaceRebaseStatistics.php | 2 +- .../Infrastructure/DbalClientInterface.php | 2 +- .../Property/Normalizer/ArrayNormalizer.php | 2 +- .../Normalizer/CollectionTypeDenormalizer.php | 2 +- .../Property/Normalizer/ScalarNormalizer.php | 2 +- .../Property/Normalizer/UriNormalizer.php | 2 +- .../ValueObjectArrayDenormalizer.php | 2 +- .../ValueObjectBoolDenormalizer.php | 2 +- .../ValueObjectFloatDenormalizer.php | 2 +- .../Normalizer/ValueObjectIntDenormalizer.php | 2 +- .../ValueObjectStringDenormalizer.php | 2 +- .../Property/PropertyConverter.php | 16 ++-- .../Infrastructure/Property/PropertyType.php | 8 +- .../Projection/CatchUpHookFactories.php | 4 +- .../CatchUpHookFactoryInterface.php | 4 +- .../Projection/CatchUpHookInterface.php | 4 +- .../ContentGraph/ContentGraphInterface.php | 24 ++--- .../ContentGraph/ContentGraphProjection.php | 8 +- .../ContentGraph/ContentSubgraphIdentity.php | 10 +- .../ContentGraph/ContentSubgraphInterface.php | 24 ++--- .../Classes/Projection/ContentGraph/Node.php | 14 +-- .../Projection/ContentGraph/NodeAggregate.php | 30 +++--- .../Classes/Projection/ContentGraph/Nodes.php | 2 +- ...ctionIntegrityViolationDetectionRunner.php | 4 +- ...ionIntegrityViolationDetectorInterface.php | 2 +- .../ContentGraph/PropertyCollection.php | 6 +- .../PropertyCollectionInterface.php | 4 +- .../Projection/ContentGraph/Reference.php | 4 +- .../Projection/ContentGraph/References.php | 2 +- .../Projection/ContentGraph/SearchTerm.php | 2 +- .../Projection/ContentGraph/Subtree.php | 2 +- .../ContentGraph/VisibilityConstraints.php | 2 +- .../ContentStream/ContentStreamFinder.php | 10 +- .../ContentStream/ContentStreamProjection.php | 40 ++++---- .../ContentStreamProjectionFactory.php | 12 +-- .../Projection/DelegatingCatchUpHook.php | 4 +- .../NodeHiddenState/NodeHiddenState.php | 8 +- .../NodeHiddenState/NodeHiddenStateFinder.php | 12 +-- .../NodeHiddenStateProjection.php | 20 ++-- .../NodeHiddenStateProjectionFactory.php | 12 +-- .../NodeHiddenState/NodeHiddenStateRecord.php | 8 +- .../ProjectionCatchUpTriggerInterface.php | 4 +- .../Projection/ProjectionFactoryInterface.php | 4 +- .../Projection/ProjectionInterface.php | 6 +- .../Projection/ProjectionStateInterface.php | 2 +- .../Classes/Projection/Projections.php | 2 +- .../Projection/WithMarkStaleInterface.php | 4 +- .../Projection/Workspace/Workspace.php | 10 +- .../Projection/Workspace/WorkspaceFinder.php | 16 ++-- .../Workspace/WorkspaceProjection.php | 32 +++---- .../Workspace/WorkspaceProjectionFactory.php | 12 +-- .../Workspace/WorkspaceRuntimeCache.php | 6 +- .../Projection/Workspace/WorkspaceStatus.php | 2 +- .../Service/ContentRepositoryBootstrapper.php | 24 ++--- .../Classes/Service/ContentStreamPruner.php | 16 ++-- .../Service/ContentStreamPrunerFactory.php | 6 +- .../Service/WorkspaceMaintenanceService.php | 16 ++-- .../WorkspaceMaintenanceServiceFactory.php | 6 +- .../SharedModel/Node/CoverageByOrigin.php | 8 +- .../Node/NodeAggregateClassification.php | 2 +- .../Node/NodeAggregateIdentifier.php | 2 +- .../Node/NodeAggregateIdentifiers.php | 4 +- .../Classes/SharedModel/Node/NodeName.php | 2 +- .../Classes/SharedModel/Node/NodePath.php | 2 +- .../SharedModel/Node/NodeReference.php | 4 +- .../SharedModel/Node/NodeReferences.php | 6 +- .../SharedModel/Node/OriginByCoverage.php | 6 +- .../Node/OriginDimensionSpacePoint.php | 6 +- .../Node/OriginDimensionSpacePointSet.php | 4 +- .../Classes/SharedModel/Node/PropertyName.php | 2 +- .../Classes/SharedModel/NodeAddress.php | 10 +- .../SharedModel/NodeAddressFactory.php | 12 +-- .../NodeType/NodeLabelGeneratorInterface.php | 4 +- .../Classes/SharedModel/NodeType/NodeType.php | 8 +- .../NodeType/NodeTypeConstraints.php | 2 +- .../NodeTypeConstraintsWithSubNodeTypes.php | 2 +- .../SharedModel/NodeType/NodeTypeManager.php | 8 +- .../SharedModel/NodeType/NodeTypeName.php | 2 +- .../SharedModel/NodeType/NodeTypeNames.php | 2 +- .../NodeTypePostprocessorInterface.php | 2 +- .../SharedModel/User/UserIdentifier.php | 2 +- .../Workspace/ContentStreamIdentifier.php | 2 +- .../Workspace/WorkspaceDescription.php | 2 +- .../SharedModel/Workspace/WorkspaceName.php | 2 +- .../SharedModel/Workspace/WorkspaceTitle.php | 2 +- Neos.ContentRepository.Core/README.md | 2 +- .../Bootstrap/CurrentSubgraphTrait.php | 12 +-- .../Features/Bootstrap/CurrentUserTrait.php | 2 +- .../Features/Bootstrap/EventSourcedTrait.php | 44 ++++----- .../Features/ContentStreamForking.php | 10 +- .../Bootstrap/Features/NodeCopying.php | 22 ++--- .../Bootstrap/Features/NodeCreation.php | 34 +++---- .../Bootstrap/Features/NodeDisabling.php | 20 ++-- .../Bootstrap/Features/NodeModification.php | 20 ++-- .../Features/Bootstrap/Features/NodeMove.php | 18 ++-- .../Bootstrap/Features/NodeReferencing.php | 28 +++--- .../Bootstrap/Features/NodeRemoval.php | 18 ++-- .../Bootstrap/Features/NodeRenaming.php | 10 +- .../Bootstrap/Features/NodeTypeChange.php | 18 ++-- .../Bootstrap/Features/NodeVariation.php | 16 ++-- .../Bootstrap/Features/WorkspaceCreation.php | 22 ++--- .../Features/WorkspaceDiscarding.php | 18 ++-- .../Features/WorkspacePublishing.php | 14 +-- ...ricCommandExecutionAndEventPublication.php | 36 +++---- .../Helpers/ContentRepositoryInternals.php | 20 ++-- .../ContentRepositoryInternalsFactory.php | 6 +- .../Features/Bootstrap/MigrationsTrait.php | 6 +- .../Bootstrap/NodeAuthorizationTrait.php | 6 +- .../Bootstrap/NodeOperationsTrait.php | 28 +++--- .../Bootstrap/ProjectedNodeAggregateTrait.php | 20 ++-- .../Features/Bootstrap/ProjectedNodeTrait.php | 20 ++-- ...ectionIntegrityViolationDetectionTrait.php | 6 +- .../Bootstrap/ReadModelInstantiationTrait.php | 12 +-- .../Bootstrap/StructureAdjustmentsTrait.php | 6 +- .../Features/Helper/ContentGraphs.php | 2 +- .../Features/Helper/ContentSubgraphs.php | 2 +- .../Helper/NodeAggregatesByAdapter.php | 2 +- .../Features/Helper/NodeDiscriminator.php | 8 +- .../Features/Helper/NodeDiscriminators.php | 4 +- .../Features/Helper/NodesByAdapter.php | 2 +- .../Domain/Fixtures/TestNodePostprocessor.php | 4 +- .../ClosestOperationTest.php | 2 +- .../FlowQueryOperations/HasOperationTest.php | 2 +- .../NextUntilOperationTest.php | 2 +- .../ParentsUntilOperationTest.php | 2 +- .../PrevUntilOperationTest.php | 2 +- ...urationBasedContentDimensionSourceTest.php | 4 +- .../ContentDimensionConstraintsTest.php | 2 +- .../ContentDimensionIdentifierTest.php | 2 +- .../Unit/Dimension/ContentDimensionTest.php | 6 +- ...tDimensionValueSpecializationDepthTest.php | 4 +- .../Dimension/ContentDimensionValueTest.php | 4 +- .../ContentDimensionZookeeperTest.php | 4 +- .../ContentSubgraphVariationWeightTest.php | 8 +- .../Fixtures/ExampleDimensionSource.php | 2 +- .../Fixtures/NullExampleDimensionSource.php | 2 +- .../VariationExampleDimensionSource.php | 2 +- .../InterDimensionalVariationGraphTest.php | 4 +- .../Tests/Unit/Domain/Model/NodeTypeTest.php | 6 +- .../Domain/Service/NodeTypeManagerTest.php | 8 +- .../Property/PropertyTypeTest.php | 6 +- .../Unit/TypeConverter/NodeConverterTest.php | 2 +- Neos.ContentRepository.Core/composer.json | 7 +- Neos.ContentRepository.Export/composer.json | 2 +- .../src/Processors/AssetExportProcessor.php | 4 +- .../src/Processors/EventExportProcessor.php | 4 +- .../Processors/EventStoreImportProcessor.php | 22 ++--- ...tentRepositoryMigrateCommandController.php | 6 +- .../Classes/Helpers/AssetExtractor.php | 2 +- .../SerializedPropertyValuesAndReferences.php | 4 +- .../Classes/Helpers/VisitedNodeAggregate.php | 8 +- .../Classes/Helpers/VisitedNodeAggregates.php | 14 +-- .../Classes/Helpers/VisitedNodeVariant.php | 4 +- .../Classes/LegacyMigrationService.php | 12 +-- .../Classes/LegacyMigrationServiceFactory.php | 6 +- .../Classes/NodeDataToAssetsProcessor.php | 6 +- .../Classes/NodeDataToEventsProcessor.php | 68 +++++++------- .../Behavior/Bootstrap/FeatureContext.php | 14 +-- .../composer.json | 2 +- .../FlowQueryOperations/ChildrenOperation.php | 10 +- .../FlowQueryOperations/ClosestOperation.php | 2 +- .../FlowQueryOperations/FilterOperation.php | 2 +- .../FlowQueryOperations/FindOperation.php | 20 ++-- .../FlowQueryOperations/HasOperation.php | 2 +- .../FlowQueryOperations/NextAllOperation.php | 4 +- .../FlowQueryOperations/NextOperation.php | 2 +- .../NextUntilOperation.php | 4 +- .../FlowQueryOperations/ParentOperation.php | 2 +- .../FlowQueryOperations/ParentsOperation.php | 4 +- .../ParentsUntilOperation.php | 4 +- .../FlowQueryOperations/PrevAllOperation.php | 4 +- .../FlowQueryOperations/PrevOperation.php | 2 +- .../PrevUntilOperation.php | 4 +- .../FlowQueryOperations/PropertyOperation.php | 4 +- .../FlowQueryOperations/SiblingsOperation.php | 2 +- .../Configuration/Settings.yaml | 4 +- .../AbstractQueryOperationsTest.php | 4 +- .../NextAllOperationTest.php | 2 +- .../FlowQueryOperations/NextOperationTest.php | 2 +- .../ParentOperationTest.php | 2 +- .../PrevAllOperationTest.php | 2 +- .../FlowQueryOperations/PrevOperationTest.php | 2 +- .../composer.json | 2 +- .../composer.json | 2 +- .../src/Command/ExecuteMigration.php | 4 +- .../DimensionSpacePointsFilterFactory.php | 10 +- .../src/Filter/FilterFactoryInterface.php | 2 +- .../src/Filter/Filters.php | 4 +- .../NodeAggregateBasedFilterInterface.php | 2 +- .../src/Filter/NodeBasedFilterInterface.php | 2 +- .../src/Filter/NodeNameFilterFactory.php | 4 +- .../src/Filter/NodeTypeFilterFactory.php | 6 +- .../Filter/PropertyNotEmptyFilterFactory.php | 2 +- .../src/Filter/PropertyValueFilterFactory.php | 4 +- .../src/NodeMigrationService.php | 20 ++-- .../src/NodeMigrationServiceFactory.php | 4 +- ...nsionShineThroughTransformationFactory.php | 10 +- .../AddNewPropertyTransformationFactory.php | 18 ++-- .../ChangeNodeTypeTransformationFactory.php | 16 ++-- ...angePropertyValueTransformationFactory.php | 20 ++-- .../GlobalTransformationInterface.php | 4 +- ...mensionSpacePointTransformationFactory.php | 10 +- ...eAggregateBasedTransformationInterface.php | 6 +- .../NodeBasedTransformationInterface.php | 8 +- .../RemoveNodeTransformationFactory.php | 18 ++-- .../RemovePropertyTransformationFactory.php | 16 ++-- ...nameNodeAggregateTransformationFactory.php | 14 +-- .../RenamePropertyTransformationFactory.php | 20 ++-- ...ripTagsOnPropertyTransformationFactory.php | 20 ++-- .../TransformationFactoryInterface.php | 2 +- .../src/Transformation/Transformations.php | 8 +- .../Transformation/TransformationsFactory.php | 2 +- .../Node/AbstractNodePropertyPrivilege.php | 2 +- .../Privilege/Node/CreateNodePrivilege.php | 6 +- .../Node/CreateNodePrivilegeSubject.php | 4 +- .../Privilege/Node/EditNodePrivilege.php | 18 ++-- .../Node/EditNodePropertyPrivilege.php | 12 +-- .../Privilege/Node/NodePrivilegeContext.php | 8 +- .../Privilege/Node/NodePrivilegeSubject.php | 2 +- .../PropertyAwareNodePrivilegeSubject.php | 2 +- .../Node/ReadNodePropertyPrivilege.php | 2 +- .../Privilege/Node/RemoveNodePrivilege.php | 4 +- .../Classes/Service/AuthorizationService.php | 4 +- .../composer.json | 2 +- .../src/Adjustment/DimensionAdjustment.php | 6 +- .../DisallowedChildNodeAdjustment.php | 28 +++--- .../src/Adjustment/LoadNodeTypeTrait.php | 8 +- .../src/Adjustment/ProjectedNodeIterator.php | 12 +-- .../src/Adjustment/PropertyAdjustment.php | 22 ++--- .../Adjustment/RemoveNodeAggregateTrait.php | 12 +-- .../src/Adjustment/StructureAdjustment.php | 4 +- .../Adjustment/TetheredNodeAdjustments.php | 42 ++++----- .../Adjustment/UnknownNodeTypeAdjustment.php | 4 +- .../src/StructureAdjustmentService.php | 14 +-- .../src/StructureAdjustmentServiceFactory.php | 6 +- ...ContentGraphIntegrityCommandController.php | 2 +- .../ContentStreamCommandController.php | 8 +- .../Classes/Command/CrCommandController.php | 10 +- .../NodeMigrationCommandController.php | 4 +- .../StructureAdjustmentsCommandController.php | 6 +- ...cessProjectionCatchUpCommandController.php | 2 +- .../Command/WorkspaceCommandController.php | 4 +- .../Classes/ContentRepositoryRegistry.php | 26 ++--- .../Exception/ContentRepositoryNotFound.php | 2 +- .../InvalidConfigurationException.php | 2 +- ...tionBasedContentDimensionSourceFactory.php | 6 +- ...ContentDimensionSourceFactoryInterface.php | 4 +- .../EventStore/DoctrineEventStoreFactory.php | 2 +- .../EventStore/EventStoreFactoryInterface.php | 2 +- .../DefaultNodeTypeManagerFactory.php | 4 +- .../NodeTypeManagerFactoryInterface.php | 4 +- .../CatchUpTriggerWithSynchronousOption.php | 6 +- ...ojectionCatchUpTriggerFactoryInterface.php | 6 +- .../SubprocessProjectionCatchUpTrigger.php | 6 +- ...processProjectionCatchUpTriggerFactory.php | 4 +- .../Classes/Infrastructure/DbalClient.php | 2 +- .../ExpressionBasedNodeLabelGenerator.php | 4 +- .../Classes/Utility.php | 2 +- .../Configuration/Objects.yaml | 22 ++--- .../Configuration/Settings.yaml | 24 ++--- Neos.ContentRepositoryRegistry/composer.json | 2 +- .../Command/AssetUsageCommandController.php | 8 +- .../Classes/Dto/AssetUsage.php | 4 +- .../Classes/Dto/AssetUsageFilter.php | 2 +- .../Projector/AssetUsageProjection.php | 34 +++---- .../Projector/AssetUsageRepository.php | 10 +- Neos.ESCR.AssetUsage/composer.json | 2 +- ...extToNodeBasedReadModelInterfaceAspect.php | 2 +- .../EmulatedLegacyBaseWorkspace.php | 2 +- .../EmulatedLegacyContext.php | 6 +- .../EmulatedLegacySite.php | 2 +- .../EmulatedLegacyWorkspace.php | 6 +- .../ContextOperation.php | 6 +- ...asticsearch_contentrepositoryadaptor.patch | 14 +-- ...ment-collection_fusionAndSiteService.patch | 4 +- .../Classes/Controller/UsageController.php | 6 +- Neos.Media.Browser/composer.json | 2 +- .../TypeConverter/NewNodeConverter.php | 4 +- .../composer.json | 2 +- Neos.Neos/Classes/Aspects/PluginUriAspect.php | 4 +- .../Classes/Command/SiteCommandController.php | 4 +- .../Command/WorkspaceCommandController.php | 28 +++--- .../Controller/Backend/ContentController.php | 12 +-- .../Controller/Frontend/NodeController.php | 26 ++--- .../DimensionControllerInternals.php | 6 +- .../DimensionControllerInternalsFactory.php | 4 +- .../Module/Administration/SitesController.php | 26 ++--- .../Management/WorkspacesController.php | 40 ++++---- .../WorkspacesControllerInternals.php | 6 +- .../WorkspacesControllerInternalsFactory.php | 4 +- .../Service/ContentDimensionsController.php | 2 +- .../ContentDimensionsControllerInternals.php | 4 +- ...ntDimensionsControllerInternalsFactory.php | 4 +- .../Controller/Service/NodesController.php | 36 +++---- ...iteNodeNameIsAlreadyInUseByAnotherSite.php | 2 +- .../Exception/SiteNodeTypeIsInvalid.php | 2 +- .../Domain/Model/NodeCacheEntryIdentifier.php | 2 +- .../Domain/Model/PluginViewDefinition.php | 2 +- .../Classes/Domain/Model/SiteNodeName.php | 2 +- .../Classes/Domain/Model/WorkspaceName.php | 2 +- .../DefaultPrototypeGeneratorInterface.php | 2 +- .../Classes/Domain/Service/FusionService.php | 6 +- .../Domain/Service/NodeSearchService.php | 2 +- .../Service/NodeSearchServiceInterface.php | 2 +- .../Service/NodeSiteResolvingService.php | 10 +- .../Domain/Service/NodeTypeNameFactory.php | 2 +- .../Domain/Service/SiteNodeUtility.php | 12 +-- .../Classes/Domain/Service/SiteService.php | 8 +- .../Domain/Service/SiteServiceInternals.php | 50 +++++----- .../Service/SiteServiceInternalsFactory.php | 4 +- .../Classes/Domain/Service/UserService.php | 4 +- .../Eel/FlowQueryOperations/SortOperation.php | 2 +- .../EventLog/Domain/Model/NodeEvent.php | 2 +- .../ContentRepositoryIntegrationService.php | 6 +- .../DelegatingResolver.php | 4 +- .../DimensionResolverFactoryInterface.php | 2 +- .../DimensionResolverInterface.php | 2 +- .../RequestToDimensionSpacePointContext.php | 2 +- .../Resolver/AutoUriPathResolverFactory.php | 4 +- .../AutoUriPathResolverFactoryInternals.php | 4 +- ...UriPathResolverFactoryInternalsFactory.php | 4 +- .../Resolver/CompositeResolver.php | 2 +- .../Resolver/NoopResolver.php | 2 +- .../Resolver/NoopResolverFactory.php | 2 +- .../Resolver/UriPathResolver.php | 4 +- .../Resolver/UriPathResolver/Segment.php | 2 +- .../UriPathResolver/SegmentMapping.php | 2 +- .../UriPathResolver/SegmentMappingElement.php | 2 +- .../Resolver/UriPathResolver/Segments.php | 2 +- .../Resolver/UriPathResolverFactory.php | 4 +- ...entSourcedFrontendNodeRoutePartHandler.php | 8 +- .../FrontendRouting/NodeShortcutResolver.php | 6 +- .../FrontendRouting/NodeUriBuilder.php | 2 +- .../Projection/DocumentNodeInfo.php | 6 +- .../Projection/DocumentUriPathFinder.php | 6 +- .../Projection/DocumentUriPathProjection.php | 48 +++++----- .../DocumentUriPathProjectionFactory.php | 10 +- .../SiteDetection/SiteDetectionMiddleware.php | 2 +- .../SiteDetection/SiteDetectionResult.php | 2 +- .../AbstractMenuItemsImplementation.php | 2 +- .../Fusion/Cache/ContentCacheFlusher.php | 14 +-- .../Fusion/Cache/FusionCachingAspect.php | 2 +- ...phProjectorCatchUpHookForCacheFlushing.php | 16 ++-- ...ctorCatchUpHookForCacheFlushingFactory.php | 4 +- .../ContentElementEditableImplementation.php | 2 +- .../ContentElementWrappingImplementation.php | 2 +- .../Fusion/ConvertUrisImplementation.php | 6 +- .../DimensionsMenuItemsImplementation.php | 10 +- ...nsionsMenuItemsImplementationInternals.php | 8 +- ...enuItemsImplementationInternalsFactory.php | 4 +- .../ExceptionHandlers/NodeWrappingHandler.php | 2 +- .../Fusion/ExceptionHandlers/PageHandler.php | 2 +- .../Classes/Fusion/Helper/CachingHelper.php | 8 +- .../Classes/Fusion/Helper/LinkHelper.php | 6 +- .../Classes/Fusion/Helper/NodeHelper.php | 6 +- .../Classes/Fusion/Helper/NodeLabelToken.php | 2 +- .../Classes/Fusion/Helper/RenderingHelper.php | 8 +- Neos.Neos/Classes/Fusion/MenuItem.php | 2 +- .../Fusion/MenuItemsImplementation.php | 12 +-- .../Classes/Fusion/NodeUriImplementation.php | 4 +- .../Classes/Fusion/PluginImplementation.php | 2 +- .../Fusion/PluginViewImplementation.php | 4 +- .../CreationDialogPostprocessor.php | 4 +- .../DefaultPropertyEditorPostprocessor.php | 4 +- .../IconNameMappingPostprocessor.php | 4 +- .../NodeTypePresetPostprocessor.php | 4 +- .../PluginNodeTypePostprocessor.php | 6 +- Neos.Neos/Classes/Package.php | 2 +- .../PendingChangesProjection/Change.php | 8 +- .../PendingChangesProjection/ChangeFinder.php | 6 +- .../ChangeProjection.php | 40 ++++---- .../ChangeProjectionFactory.php | 14 +-- .../Dimensions/VisualContentDimension.php | 4 +- .../VisualInterDimensionalVariationGraph.php | 10 +- .../VisualIntraDimensionalVariationGraph.php | 2 +- .../VisualWeightedDimensionSpacePoint.php | 4 +- .../Routing/Cache/RouteCacheFlusher.php | 4 +- .../Routing/NodeIdentityConverterAspect.php | 6 +- .../Service/BackendRedirectionService.php | 6 +- .../Service/ContentElementEditableService.php | 8 +- .../Service/ContentElementWrappingService.php | 8 +- .../Controller/AbstractServiceController.php | 2 +- .../Controller/DataSourceController.php | 2 +- .../DataSource/DataSourceInterface.php | 2 +- .../Service/EditorContentStreamZookeeper.php | 22 ++--- .../Service/ImageVariantGarbageCollector.php | 2 +- Neos.Neos/Classes/Service/LinkingService.php | 14 +-- .../Mapping/NodeReferenceConverter.php | 2 +- .../Mapping/NodeTypeStringConverter.php | 2 +- .../Classes/Service/NodeTypeSchemaBuilder.php | 6 +- Neos.Neos/Classes/Service/PluginService.php | 20 ++-- Neos.Neos/Classes/Service/View/NodeView.php | 16 ++-- .../NodeAddressToStringConverter.php | 2 +- .../Classes/TypeConverter/NodeConverter.php | 4 +- .../Utility/NodeUriPathSegmentGenerator.php | 2 +- .../Validator/NodeNameValidator.php | 2 +- .../Classes/View/FusionExceptionView.php | 8 +- .../View/FusionExceptionViewInternals.php | 6 +- .../FusionExceptionViewInternalsFactory.php | 4 +- Neos.Neos/Classes/View/FusionView.php | 2 +- .../Classes/View/FusionViewI18nTrait.php | 2 +- .../DocumentBreadcrumbPathViewHelper.php | 2 +- .../ContentElement/EditableViewHelper.php | 2 +- .../ContentElement/WrapViewHelper.php | 2 +- .../ViewHelpers/Link/NodeViewHelper.php | 14 +-- .../Node/ClosestDocumentViewHelper.php | 2 +- .../AbstractRenderingStateViewHelper.php | 6 +- .../Rendering/InBackendViewHelper.php | 2 +- .../Rendering/InEditModeViewHelper.php | 2 +- .../Rendering/InPreviewModeViewHelper.php | 2 +- .../ViewHelpers/Rendering/LiveViewHelper.php | 2 +- .../ViewHelpers/Uri/NodeViewHelper.php | 14 +-- .../Features/Bootstrap/BrowserTrait.php | 4 +- .../Features/Bootstrap/FlowQueryTrait.php | 10 +- .../Features/Bootstrap/RoutingTrait.php | 16 ++-- .../Tests/Functional/AbstractNodeTest.php | 2 +- .../Fixtures/TestablePrototypeGenerator.php | 2 +- .../Domain/Service/FusionServiceTest.php | 2 +- .../Fusion/Cache/ContentCacheFlusherTest.php | 2 +- .../Functional/Fusion/NodeHelperTest.php | 24 ++--- .../Service/NodeTypeSchemaBuilderTest.php | 2 +- .../Unit/Aspects/FusionCachingAspectTest.php | 2 +- .../CreationDialogPostprocessorTest.php | 2 +- .../ParentsOperationTest.php | 2 +- .../Fusion/Cache/ContentCacheFlusherTest.php | 6 +- .../Fusion/ConvertUrisImplementationTest.php | 2 +- .../Unit/Fusion/Helper/CachingHelperTest.php | 4 +- ...DefaultPropertyEditorPostprocessorTest.php | 2 +- .../ContentElementEditableServiceTest.php | 4 +- .../ContentElement/EditableViewHelperTest.php | 4 +- Neos.Neos/composer.json | 2 +- .../DataSource/FormDefinitionDataSource.php | 2 +- Neos.NodeTypes/composer.json | 2 +- .../Generator/AfxTemplateGenerator.php | 2 +- Neos.SiteKickstarter/composer.json | 2 +- composer.json | 23 ++--- 674 files changed, 3080 insertions(+), 3092 deletions(-) diff --git a/ESCR/README.md b/ESCR/README.md index 1f5e7f07eee..e7698f3250c 100644 --- a/ESCR/README.md +++ b/ESCR/README.md @@ -159,7 +159,7 @@ To activate Postgres, right now, the following steps are needed **in your distri ```yaml # Configuration/Objects.yaml -Neos\ContentRepository\Projection\Content\ContentGraphInterface: +Neos\ContentRepository\Core\Projection\Content\ContentGraphInterface: className: 'Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\ContentHypergraph' ``` diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php index bb4d50dc14e..1db9b85c46e 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php @@ -18,10 +18,10 @@ use Doctrine\DBAL\Exception\InvalidArgumentException; use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjectionFactory; use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphSchemaBuilder; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\ContentRepository\Tests\Behavior\Features\Helper\TestingNodeAggregateIdentifier; use Neos\ContentRepositoryRegistry\Infrastructure\DbalClient; use Neos\Flow\Utility\Algorithms; diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/composer.json b/Neos.ContentGraph.DoctrineDbalAdapter/composer.json index a5ff803bd80..7ae3955e515 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/composer.json +++ b/Neos.ContentGraph.DoctrineDbalAdapter/composer.json @@ -3,7 +3,7 @@ "description": "The Doctrine DBAL database backend for the Neos content graph", "license": "GPL-3.0+", "require": { - "neos/contentrepository": "*", + "neos/contentrepository-core": "*", "doctrine/dbal": "*", "doctrine/migrations": "*" }, diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php index ff325d989aa..253b6cf588b 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php @@ -18,41 +18,41 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ContentGraph; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\EventStore\EventInterface; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\CatchUpHookInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\WithMarkStaleInterface; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\EventStore\EventInterface; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\WithMarkStaleInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php index 5897a5aa546..b5cd8478d50 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjectionFactory.php @@ -6,14 +6,14 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphProjection; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\Projections; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphProjection; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\Projections; /** * Use this class as ProjectionFactory in your configuration to construct a content graph diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory.php index 094104bc46c..f5dd9630037 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory.php @@ -3,12 +3,12 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\ProjectionIntegrityViolationDetector; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeDisabling.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeDisabling.php index 5db33e90c24..74ccc5a9928 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeDisabling.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeDisabling.php @@ -5,7 +5,7 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\Feature; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; /** * The NodeDisabling projection feature trait diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php index d7ebfca20a0..725ebd3a07b 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php @@ -8,9 +8,9 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\EventCouldNotBeAppliedToContentGraph; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; /** * The NodeMove projection feature trait diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php index d492daf514b..628fdd21366 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php @@ -7,8 +7,8 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\HierarchyRelation; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; use Psr\Log\LoggerInterface; /** diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeVariation.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeVariation.php index 4ce2b6b6caa..a7ab38a37a1 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeVariation.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeVariation.php @@ -10,14 +10,14 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRelationAnchorPoint; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * The NodeVariation projection feature trait diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/RestrictionRelations.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/RestrictionRelations.php index 2982a447d64..bbbb8c23b3e 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/RestrictionRelations.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/RestrictionRelations.php @@ -6,9 +6,9 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ProjectionContentGraph; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * @internal diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php index ced62e99f80..83fad57399a 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/HierarchyRelation.php @@ -15,9 +15,9 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; /** * The active record for reading and writing hierarchy relations from and to the database diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php index 4e4bff7757e..32f614b7f73 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/NodeRecord.php @@ -15,11 +15,11 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; /** * The active record for reading and writing nodes from and to the database diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/ProjectionIntegrityViolationDetector.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/ProjectionIntegrityViolationDetector.php index 2f8f333bf8e..f0c80591e1f 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/ProjectionIntegrityViolationDetector.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/ProjectionIntegrityViolationDetector.php @@ -14,15 +14,15 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\Error\Messages\Error; use Neos\Error\Messages\Result; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\Projection\ContentGraph\ProjectionIntegrityViolationDetectorInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\Projection\ContentGraph\ProjectionIntegrityViolationDetectorInterface; /** * The Doctrine database backend implementation for projection invariant checks diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php index b7274eb237f..06f85d85450 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php @@ -18,22 +18,22 @@ use Doctrine\DBAL\DBALException; use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjection; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRelationAnchorPoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; /** * The Doctrine DBAL adapter content graph diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php index 54460e8fd57..c9c2fca8daf 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php @@ -15,24 +15,24 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ContentGraph\References; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; use Neos\Utility\Unicode\Functions as UnicodeFunctions; /** @@ -132,7 +132,7 @@ protected static function addNodeTypeConstraintsToQuery( protected static function addSearchTermConstraintsToQuery( SqlQueryBuilder $query, - ?\Neos\ContentRepository\Projection\ContentGraph\SearchTerm $searchTerm, + ?\Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm $searchTerm, string $markerToReplaceInQuery = null, string $tableReference = 'c', string $concatenation = 'AND' @@ -943,7 +943,7 @@ public function jsonSerialize(): array /** * @throws \Doctrine\DBAL\DBALException - * @throws \Neos\ContentRepository\Feature\Common\Exception\NodeConfigurationException + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\NodeConfigurationException * @throws NodeTypeNotFoundException */ public function findSubtrees( @@ -1088,7 +1088,7 @@ public function findSubtrees( public function findDescendants( array $entryNodeAggregateIdentifiers, NodeTypeConstraints $nodeTypeConstraints, - ?\Neos\ContentRepository\Projection\ContentGraph\SearchTerm $searchTerm + ?\Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm $searchTerm ): Nodes { $query = new SqlQueryBuilder(); $query->addToQuery(' diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/AllChildNodesByNodeIdentifierCache.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/AllChildNodesByNodeIdentifierCache.php index c7b04773fd7..0b5d2a800c4 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/AllChildNodesByNodeIdentifierCache.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/AllChildNodesByNodeIdentifierCache.php @@ -14,9 +14,9 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; /** * This cache is only filled for a $parentNodeIdentifier if we have retrieved *all* childNodes, without any restriction. diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NamedChildNodeByNodeIdentifierCache.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NamedChildNodeByNodeIdentifierCache.php index ffe5c9fcc17..6ec6e0fc628 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NamedChildNodeByNodeIdentifierCache.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NamedChildNodeByNodeIdentifierCache.php @@ -14,9 +14,9 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; /** * Parent Node Identifier + Node Name => Child Node diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodeByNodeAggregateIdentifierCache.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodeByNodeAggregateIdentifierCache.php index fb36daf544e..320f01a7e5e 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodeByNodeAggregateIdentifierCache.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodeByNodeAggregateIdentifierCache.php @@ -14,8 +14,8 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * NodeAggregateIdentifier -> Node cache diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodePathCache.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodePathCache.php index 8085fec79e2..1ea3ecbb3b5 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodePathCache.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/NodePathCache.php @@ -14,8 +14,8 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; /** * Node Identifier -> Node Path cache diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/ParentNodeIdentifierByChildNodeIdentifierCache.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/ParentNodeIdentifierByChildNodeIdentifierCache.php index ad47c34331d..76a735ae8b7 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/ParentNodeIdentifierByChildNodeIdentifierCache.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/InMemoryCache/ParentNodeIdentifierByChildNodeIdentifierCache.php @@ -14,7 +14,7 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * NOTE: we do NOT directly cache the Parent Node; but only the Parent Node Identifier; diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php index 4cac62b20ea..03c676c4070 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php @@ -14,30 +14,30 @@ namespace Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\Reference; -use Neos\ContentRepository\Projection\ContentGraph\References; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\SharedModel\Node\CoverageByOrigin; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginByCoverage; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollection; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\Reference; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\Node\CoverageByOrigin; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginByCoverage; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollection; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; /** * Implementation detail of ContentGraph and ContentSubgraph @@ -179,7 +179,7 @@ public function mapNodeRowsToNodeAggregate( /** @var Node $primaryNode a nodeAggregate only exists if it at least contains one node. */ $primaryNode = current($nodesByOccupiedDimensionSpacePoints); - return new \Neos\ContentRepository\Projection\ContentGraph\NodeAggregate( + return new \Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate( $primaryNode->subgraphIdentity->contentStreamIdentifier, NodeAggregateIdentifier::fromString($rawNodeAggregateIdentifier), NodeAggregateClassification::from($rawNodeAggregateClassification), @@ -197,7 +197,7 @@ public function mapNodeRowsToNodeAggregate( /** * @param iterable> $nodeRows - * @return iterable + * @return iterable * @throws NodeTypeNotFoundException */ public function mapNodeRowsToNodeAggregates( @@ -267,7 +267,7 @@ public function mapNodeRowsToNodeAggregates( foreach ($nodesByOccupiedDimensionSpacePointsByNodeAggregate as $rawNodeAggregateIdentifier => $nodes) { /** @var string $rawNodeAggregateIdentifier */ - yield new \Neos\ContentRepository\Projection\ContentGraph\NodeAggregate( + yield new \Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate( // this line is safe because a nodeAggregate only exists if it at least contains one node. current($nodes)->subgraphIdentity->contentStreamIdentifier, NodeAggregateIdentifier::fromString($rawNodeAggregateIdentifier), diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php index e5df90e9e65..cb96172868d 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php @@ -20,13 +20,13 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\HierarchyRelation; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\NodeRelationAnchorPoint; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; /** * The read only content graph for use by the {@see GraphProjector}. This is the class for low-level operations diff --git a/Neos.ContentGraph.PostgreSQLAdapter/composer.json b/Neos.ContentGraph.PostgreSQLAdapter/composer.json index 11303e653ab..52bf58785e5 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/composer.json +++ b/Neos.ContentGraph.PostgreSQLAdapter/composer.json @@ -4,7 +4,7 @@ "description": "The PostgreSQL database backend for the Neos content graph", "license": "GPL-3.0+", "require": { - "neos/contentrepository": "*", + "neos/contentrepository-core": "*", "doctrine/dbal": "*", "doctrine/migrations": "*" }, diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/ContentStreamForking.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/ContentStreamForking.php index 60ca927a10f..7675f8a666f 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/ContentStreamForking.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/ContentStreamForking.php @@ -17,7 +17,7 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HierarchyHyperrelationRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\RestrictionHyperrelationRecord; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; /** * The content stream forking feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/CopyOnWrite.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/CopyOnWrite.php index db3361c05b2..3f26d81ee86 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/CopyOnWrite.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/CopyOnWrite.php @@ -18,7 +18,7 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRelationAnchorPoint; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * The copy on write feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeCreation.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeCreation.php index 5634034bc7c..39ba0ec75df 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeCreation.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeCreation.php @@ -22,14 +22,14 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRelationAnchorPoint; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRelationAnchorPoints; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; /** * The node creation feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeDisabling.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeDisabling.php index ca44aa9ecb2..d8e01fab75c 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeDisabling.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeDisabling.php @@ -17,8 +17,8 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\RestrictionHyperrelationRecord; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; /** * The node disabling feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeModification.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeModification.php index 048171cfe22..988130eacae 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeModification.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeModification.php @@ -18,7 +18,7 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\EventCouldNotBeAppliedToContentGraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; /** * The node modification feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeReferencing.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeReferencing.php index 8accdfab0eb..991af03c5f1 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeReferencing.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeReferencing.php @@ -19,7 +19,7 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ReferenceRelationRecord; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; /** * The node referencing feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRemoval.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRemoval.php index 2a38ded0f00..f509dd3a1d4 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRemoval.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRemoval.php @@ -21,10 +21,10 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRelationAnchorPoint; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ReferenceRelationRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; /** * The node removal feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRenaming.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRenaming.php index 8cd856516a3..611defe6a0d 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRenaming.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeRenaming.php @@ -17,7 +17,7 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; -use Neos\ContentRepository\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; /** * The node disabling feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeTypeChange.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeTypeChange.php index fb8a907020e..e4563697193 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeTypeChange.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeTypeChange.php @@ -17,7 +17,7 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; /** * The node disabling feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeVariation.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeVariation.php index e47f4f7bff1..8a29e3759f8 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeVariation.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Feature/NodeVariation.php @@ -22,13 +22,13 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRelationAnchorPoints; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ProjectionHypergraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ReferenceRelationRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * The node disabling feature set for the hypergraph projector diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HierarchyHyperrelationRecord.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HierarchyHyperrelationRecord.php index 97f526ef6d3..44423976bef 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HierarchyHyperrelationRecord.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HierarchyHyperrelationRecord.php @@ -16,8 +16,8 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception as DBALException; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * The active record for reading and writing hierarchy hyperrelations from and to the database diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php index 5ab283a2dcc..eb72dd9f88c 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php @@ -30,25 +30,25 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\ContentHypergraph; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\NodeFactory; use Neos\ContentGraph\PostgreSQLAdapter\Infrastructure\PostgresDbalClientInterface; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\CatchUpHookInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeAggregateIdentifiers.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeAggregateIdentifiers.php index 2b835ee95e4..a2b9a5ff6f6 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeAggregateIdentifiers.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeAggregateIdentifiers.php @@ -14,8 +14,8 @@ namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers as NodeAggregateIdentifierCollection; /** diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeRecord.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeRecord.php index c6ba510934b..1a5c8f42ecb 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeRecord.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeRecord.php @@ -16,12 +16,12 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception as DBALException; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; /** * The active record for reading and writing nodes from and to the database diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ProjectionHypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ProjectionHypergraph.php index 1b9ba62dde1..650b9495184 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ProjectionHypergraph.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ProjectionHypergraph.php @@ -18,11 +18,11 @@ use Doctrine\DBAL\Exception as DBALException; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\Query\ProjectionHypergraphQuery; use Neos\ContentGraph\PostgreSQLAdapter\Infrastructure\PostgresDbalClientInterface; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * The alternate reality-aware projection-time hypergraph for the PostgreSQL backend via Doctrine DBAL diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Query/ProjectionHypergraphQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Query/ProjectionHypergraphQuery.php index 866a92ca375..d50d34f7ff2 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Query/ProjectionHypergraphQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/Query/ProjectionHypergraphQuery.php @@ -17,11 +17,11 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\ResultStatement; use Doctrine\DBAL\Types\Types; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ReferenceRelationRecord.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ReferenceRelationRecord.php index 6e062dd8333..f385e1d7a34 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ReferenceRelationRecord.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/ReferenceRelationRecord.php @@ -16,9 +16,9 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception as DBALException; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; /** * The active record for reading and writing reference relations from and to the database diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/RestrictionHyperrelationRecord.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/RestrictionHyperrelationRecord.php index 60523c04f22..034d91f89f6 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/RestrictionHyperrelationRecord.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/RestrictionHyperrelationRecord.php @@ -16,8 +16,8 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception as DBALException; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * The active record for reading and writing restriction hyperrelations from and to the database diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentHypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentHypergraph.php index 417dc8857e3..48bafbaeeef 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentHypergraph.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentHypergraph.php @@ -21,19 +21,19 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query\HypergraphParentQuery; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query\HypergraphQuery; use Neos\ContentGraph\PostgreSQLAdapter\Infrastructure\PostgresDbalClientInterface; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * The PostgreSQL adapter content hypergraph diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php index 979352c0040..c67e1c549bd 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php @@ -26,23 +26,23 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query\HypergraphSiblingQueryMode; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query\QueryUtility; use Neos\ContentGraph\PostgreSQLAdapter\Infrastructure\PostgresDbalClientInterface; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\References; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\Projection\ContentGraph\SearchTerm; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; /** * The content subgraph application repository diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php index f489d283563..f39b90ea023 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php @@ -14,31 +14,31 @@ namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\Reference; -use Neos\ContentRepository\Projection\ContentGraph\References; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Node\CoverageByOrigin; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginByCoverage; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollection; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\Reference; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Node\CoverageByOrigin; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginByCoverage; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollection; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; /** * The node factory for mapping database rows to nodes and node aggregates @@ -244,7 +244,7 @@ public function mapNodeRowsToNodeAggregate( /** * @param array> $nodeRows - * @return iterable + * @return iterable */ public function mapNodeRowsToNodeAggregates(array $nodeRows, VisibilityConstraints $visibilityConstraints): iterable { diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php index 548ec30b0a8..3857b98c686 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/CommonGraphQueryOperations.php @@ -17,8 +17,8 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\ResultStatement; use Doctrine\DBAL\ForwardCompatibility\Result as QueryResult; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphChildQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphChildQuery.php index 28fb34d3320..5c0e670d13a 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphChildQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphChildQuery.php @@ -17,14 +17,14 @@ use Doctrine\DBAL\Connection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HierarchyHyperrelationRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphParentQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphParentQuery.php index 1e01383cf49..ca11a8949f3 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphParentQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphParentQuery.php @@ -16,9 +16,9 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HierarchyHyperrelationRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphQuery.php index 10e0c65bd62..6fddeda40c6 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphQuery.php @@ -17,11 +17,11 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HierarchyHyperrelationRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\NodeRecord; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\RestrictionHyperrelationRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphReferenceQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphReferenceQuery.php index 73b8e9ac453..daab87adb0a 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphReferenceQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphReferenceQuery.php @@ -15,11 +15,11 @@ namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\ReferenceRelationRecord; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphSiblingQuery.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphSiblingQuery.php index 30bc49a14d6..a748055e0cc 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphSiblingQuery.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/HypergraphSiblingQuery.php @@ -14,10 +14,10 @@ namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php index ea2e20d2625..79ea9b3a3f9 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/Query/QueryUtility.php @@ -15,7 +15,7 @@ namespace Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\Query; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\RestrictionHyperrelationRecord; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; /** * @internal diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/HypergraphProjectionFactory.php b/Neos.ContentGraph.PostgreSQLAdapter/src/HypergraphProjectionFactory.php index c611ccff075..64cedb3b5cd 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/HypergraphProjectionFactory.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/HypergraphProjectionFactory.php @@ -7,11 +7,11 @@ use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjection; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\NodeFactory; use Neos\ContentGraph\PostgreSQLAdapter\Infrastructure\PostgresDbalClientInterface; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; -use Neos\ContentRepository\Projection\Projections; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Projection\Projections; /** * @implements ProjectionFactoryInterface diff --git a/Neos.ContentRepository.BehavioralTests/Classes/Command/ContentStreamCommandController.php b/Neos.ContentRepository.BehavioralTests/Classes/Command/ContentStreamCommandController.php index 696bd07a49e..621a78c67d1 100644 --- a/Neos.ContentRepository.BehavioralTests/Classes/Command/ContentStreamCommandController.php +++ b/Neos.ContentRepository.BehavioralTests/Classes/Command/ContentStreamCommandController.php @@ -16,18 +16,18 @@ use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\GraphProjector; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjection; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\Flow\Cli\CommandController; final class ContentStreamCommandController extends CommandController diff --git a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php index ed56a3f8652..1bc16309a1d 100644 --- a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php +++ b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php @@ -18,8 +18,8 @@ use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\Dto\TraceEntryType; use Neos\EventStore\Model\EventEnvelope; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\EventStore\EventInterface; -use Neos\ContentRepository\Projection\CatchUpHookInterface; +use Neos\ContentRepository\Core\EventStore\EventInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookInterface; use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\SubprocessProjectionCatchUpTrigger; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; diff --git a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHookFactory.php b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHookFactory.php index 19bc00b1103..30467e9dd48 100644 --- a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHookFactory.php +++ b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHookFactory.php @@ -14,9 +14,9 @@ namespace Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\CatchUpHookInterface; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookInterface; /** * For full docs and context, see {@see RaceTrackerCatchUpHook} diff --git a/Neos.ContentRepository.BehavioralTests/composer.json b/Neos.ContentRepository.BehavioralTests/composer.json index 76600b1bb38..0f0b60e514d 100644 --- a/Neos.ContentRepository.BehavioralTests/composer.json +++ b/Neos.ContentRepository.BehavioralTests/composer.json @@ -6,7 +6,7 @@ "GPL-3.0-or-later" ], "require": { - "neos/contentrepository": "*" + "neos/contentrepository-core": "*" }, "autoload": { "psr-4": { diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandBus.php b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandBus.php index 53aaa772d76..1ce93c44e86 100644 --- a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandBus.php +++ b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandBus.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\CommandHandler; +namespace Neos\ContentRepository\Core\CommandHandler; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; /** * Implementation Detail of {@see ContentRepository::handle}, which does the command dispatching to the different diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandHandlerInterface.php b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandHandlerInterface.php index f12cd2ae0d1..4a8ca5a5b5f 100644 --- a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandHandlerInterface.php +++ b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandHandlerInterface.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\CommandHandler; +namespace Neos\ContentRepository\Core\CommandHandler; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; /** * Common interface for all Content Repository command handlers diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandInterface.php b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandInterface.php index 400d62c8b01..8264248a6f9 100644 --- a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandInterface.php +++ b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\CommandHandler; +namespace Neos\ContentRepository\Core\CommandHandler; /** * Common (marker) interface for all commands of the Content Repository diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandResult.php b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandResult.php index 0ddb7890ae5..d113d3ce560 100644 --- a/Neos.ContentRepository.Core/Classes/CommandHandler/CommandResult.php +++ b/Neos.ContentRepository.Core/Classes/CommandHandler/CommandResult.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Neos\ContentRepository\CommandHandler; +namespace Neos\ContentRepository\Core\CommandHandler; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; use Neos\EventStore\Model\EventStore\CommitResult; use Neos\EventStore\Model\Event\SequenceNumber; diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/PendingProjections.php b/Neos.ContentRepository.Core/Classes/CommandHandler/PendingProjections.php index 57283de706b..a9226487787 100644 --- a/Neos.ContentRepository.Core/Classes/CommandHandler/PendingProjections.php +++ b/Neos.ContentRepository.Core/Classes/CommandHandler/PendingProjections.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\CommandHandler; +namespace Neos\ContentRepository\Core\CommandHandler; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\Projections; -use Neos\ContentRepository\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\Projections; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; use Neos\EventStore\CatchUp\CheckpointStorageInterface; use Neos\EventStore\Model\Events; use Neos\EventStore\Model\Event\SequenceNumber; diff --git a/Neos.ContentRepository.Core/Classes/ContentRepository.php b/Neos.ContentRepository.Core/Classes/ContentRepository.php index 9b741d58d47..f1fd0cfafbb 100644 --- a/Neos.ContentRepository.Core/Classes/ContentRepository.php +++ b/Neos.ContentRepository.Core/Classes/ContentRepository.php @@ -14,21 +14,21 @@ namespace Neos\ContentRepository; -use Neos\ContentRepository\CommandHandler\CommandBus; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\Factory\ContentRepositoryFactory; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphProjection; -use Neos\ContentRepository\Projection\ContentStream\ContentStreamFinder; -use Neos\ContentRepository\Projection\ContentStream\ContentStreamProjection; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\Projections; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\Projection\Workspace\WorkspaceProjection; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\CommandHandler\CommandBus; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\Factory\ContentRepositoryFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphProjection; +use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamFinder; +use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamProjection; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\Projections; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceProjection; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Model\EventStore\SetupResult; use Neos\EventStore\Model\EventStream\VirtualStreamName; diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ConfigurationBasedContentDimensionSource.php b/Neos.ContentRepository.Core/Classes/Dimension/ConfigurationBasedContentDimensionSource.php index 2ab896b95d9..aa7f5d26e5a 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ConfigurationBasedContentDimensionSource.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ConfigurationBasedContentDimensionSource.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionIdentifierIsInvalid; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueIsInvalid; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValuesAreInvalid; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionIdentifierIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValuesAreInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; /** * The configuration based content dimension source diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimension.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimension.php index 7b7ebd2d1b1..f04a98aa1fb 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimension.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimension.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; use Neos\Utility\Arrays; diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraintSet.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraintSet.php index fe2eaa44c95..138f58d1d8f 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraintSet.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraintSet.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; /** * A set of content dimension constraints, indexed by dimension identifier diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraints.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraints.php index d335ca60c66..60bb3e2cbb3 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraints.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraints.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; /** * Content dimension constraints across multiple dimensions diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionIdentifier.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionIdentifier.php index 7acb72bd6c2..5cccdd5ab92 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionIdentifier.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionIdentifier.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionIdentifierIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionIdentifierIsInvalid; /** * The content dimension identifier value object diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionSourceInterface.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionSourceInterface.php index fcaa5cb0a1f..6f3cc1c25a8 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionSourceInterface.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionSourceInterface.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; /** * The content dimension source interface diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValue.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValue.php index 09a6d53040c..607c172f8ed 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValue.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValue.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueIsInvalid; use Neos\Flow\Annotations as Flow; use Neos\Utility\Arrays; diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueSpecializationDepth.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueSpecializationDepth.php index a27af309dec..bee487d3774 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueSpecializationDepth.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueSpecializationDepth.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdge.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdge.php index 42be4160c99..10cbafa7a34 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdge.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdge.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; /** * A directed edge connecting two dimension space points declaring them specialization and generalization diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdges.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdges.php index cdea2fdc814..66852096c8d 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdges.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdges.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; /** * A set of content dimension value variation edges diff --git a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValues.php b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValues.php index 17884b1d80b..04fc4af8f50 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValues.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValues.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension; +namespace Neos\ContentRepository\Core\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValuesAreInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValuesAreInvalid; /** * A collection of content dimension values, indexed by dimension identifier diff --git a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionIdentifierIsInvalid.php b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionIdentifierIsInvalid.php index 3cb11006cef..21c80dc51cf 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionIdentifierIsInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionIdentifierIsInvalid.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension\Exception; +namespace Neos\ContentRepository\Core\Dimension\Exception; /** * The exception to be thrown if an invalid content dimension identifier was attempted to be initialized diff --git a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueIsInvalid.php b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueIsInvalid.php index 15ad5abe929..9ea9bbc700d 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueIsInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueIsInvalid.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension\Exception; +namespace Neos\ContentRepository\Core\Dimension\Exception; /** * The exception to be thrown if an invalid content dimension value was attempted to be initialized diff --git a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueSpecializationDepthIsInvalid.php b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueSpecializationDepthIsInvalid.php index 18c5500b27b..ee651a2d81a 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueSpecializationDepthIsInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValueSpecializationDepthIsInvalid.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension\Exception; +namespace Neos\ContentRepository\Core\Dimension\Exception; /** * The exception to be thrown if an invalid content dimension value specialization depth was tried to be initialized diff --git a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValuesAreInvalid.php b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValuesAreInvalid.php index 164ed677c06..5efbdc8f65c 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValuesAreInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/Exception/ContentDimensionValuesAreInvalid.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension\Exception; +namespace Neos\ContentRepository\Core\Dimension\Exception; /** * The exception to be thrown if content dimension values are tried to be initialized empty diff --git a/Neos.ContentRepository.Core/Classes/Dimension/Exception/GeneralizationIsInvalid.php b/Neos.ContentRepository.Core/Classes/Dimension/Exception/GeneralizationIsInvalid.php index 710e79f9fe9..0113b792d34 100644 --- a/Neos.ContentRepository.Core/Classes/Dimension/Exception/GeneralizationIsInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Dimension/Exception/GeneralizationIsInvalid.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Dimension\Exception; +namespace Neos\ContentRepository\Core\Dimension\Exception; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; -use Neos\ContentRepository\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; /** * The exception to be thrown if an invalid generalization of a content dimension value was tried to be initialized diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/AbstractDimensionSpacePoint.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/AbstractDimensionSpacePoint.php index 4aac5d6e4b0..54fd9e233b4 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/AbstractDimensionSpacePoint.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/AbstractDimensionSpacePoint.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * A point in the dimension space with coordinates DimensionName => DimensionValue. diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentDimensionZookeeper.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentDimensionZookeeper.php index 8aee4e5ddd9..ee4a3bc9182 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentDimensionZookeeper.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentDimensionZookeeper.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * The content dimension zookeeper diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentSubgraphVariationWeight.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentSubgraphVariationWeight.php index 699d5cf4bb0..2158b64805d 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentSubgraphVariationWeight.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/ContentSubgraphVariationWeight.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * The value object describing the weight of a variation edge between subgraphs A and B diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePoint.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePoint.php index c75bc45227d..7b8823e3caf 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePoint.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePoint.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * A point in the dimension space with coordinates DimensionName => DimensionValue. diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePointSet.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePointSet.php index 6cbef841f81..a194113993c 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePointSet.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePointSet.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; /** * A set of points in the dimension space. diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/ContentSubgraphVariationWeightsAreIncomparable.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/ContentSubgraphVariationWeightsAreIncomparable.php index a263c8bfac2..05d69dd4187 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/ContentSubgraphVariationWeightsAreIncomparable.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/ContentSubgraphVariationWeightsAreIncomparable.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace\Exception; +namespace Neos\ContentRepository\Core\DimensionSpace\Exception; -use Neos\ContentRepository\DimensionSpace\ContentSubgraphVariationWeight; +use Neos\ContentRepository\Core\DimensionSpace\ContentSubgraphVariationWeight; /** * The exception to be thrown if two content subgraph variation weights are to be compared that cannot, diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointIsNoSpecialization.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointIsNoSpecialization.php index f0e2771b7bc..97f38a0de31 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointIsNoSpecialization.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointIsNoSpecialization.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace\Exception; +namespace Neos\ContentRepository\Core\DimensionSpace\Exception; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; /** * The exception to be thrown if a dimension space point is tried to be used diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointNotFound.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointNotFound.php index 6ab150ab2d8..8e968fde590 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointNotFound.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/Exception/DimensionSpacePointNotFound.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace\Exception; +namespace Neos\ContentRepository\Core\DimensionSpace\Exception; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; /** * A dimension space point was not found diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php index f65d8b22e95..cea4eadf260 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * The inter dimensional variation graph domain model diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/VariantType.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/VariantType.php index 5dd174904e3..b1320605906 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/VariantType.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/VariantType.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; /** * The type of variant one dimension space point is compared to another diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/WeightedDimensionSpacePoint.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/WeightedDimensionSpacePoint.php index 4c0493e9c5e..0ecb64fb707 100644 --- a/Neos.ContentRepository.Core/Classes/DimensionSpace/WeightedDimensionSpacePoint.php +++ b/Neos.ContentRepository.Core/Classes/DimensionSpace/WeightedDimensionSpacePoint.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\DimensionSpace; +namespace Neos\ContentRepository\Core\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * A weighted dimension space point diff --git a/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php b/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php index 5176eb4f65f..63a8abe39b3 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; use Neos\EventStore\Model\Event\EventId; use Neos\EventStore\Model\Event\EventMetadata; diff --git a/Neos.ContentRepository.Core/Classes/EventStore/EventInterface.php b/Neos.ContentRepository.Core/Classes/EventStore/EventInterface.php index 491b22d199c..c892bfe0f5a 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/EventInterface.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/EventInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; /** * Common interface for all Content Repository "domain events" diff --git a/Neos.ContentRepository.Core/Classes/EventStore/EventNormalizer.php b/Neos.ContentRepository.Core/Classes/EventStore/EventNormalizer.php index d1dd317b8dc..801145a4798 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/EventNormalizer.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/EventNormalizer.php @@ -2,35 +2,35 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPublished; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPublished; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; use Neos\EventStore\Model\Event\EventData; use Neos\EventStore\Model\Event; use Neos\EventStore\Model\Event\EventType; diff --git a/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php b/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php index a90badf5ea3..8f2241d4ec0 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\CommandHandler\PendingProjections; -use Neos\ContentRepository\Projection\ProjectionCatchUpTriggerInterface; -use Neos\ContentRepository\Projection\Projections; -use Neos\ContentRepository\Projection\WithMarkStaleInterface; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\CommandHandler\PendingProjections; +use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface; +use Neos\ContentRepository\Core\Projection\Projections; +use Neos\ContentRepository\Core\Projection\WithMarkStaleInterface; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Exception\ConcurrencyException; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentRepository.Core/Classes/EventStore/Events.php b/Neos.ContentRepository.Core/Classes/EventStore/Events.php index 9955d43facc..b9a32d37598 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/Events.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/Events.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; /** * A set of Content Repository "domain events" diff --git a/Neos.ContentRepository.Core/Classes/EventStore/EventsToPublish.php b/Neos.ContentRepository.Core/Classes/EventStore/EventsToPublish.php index 692cec7ba49..8941e5e5ca7 100644 --- a/Neos.ContentRepository.Core/Classes/EventStore/EventsToPublish.php +++ b/Neos.ContentRepository.Core/Classes/EventStore/EventsToPublish.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\EventStore; +namespace Neos\ContentRepository\Core\EventStore; -use Neos\ContentRepository\CommandHandler\CommandHandlerInterface; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\CommandHandler\CommandHandlerInterface; +use Neos\ContentRepository\Core\ContentRepository; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Model\EventStream\ExpectedVersion; use Neos\EventStore\Model\Event\StreamName; diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php index 64d94e3a455..0a8d59182b5 100644 --- a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php +++ b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php @@ -12,24 +12,24 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Factory; +namespace Neos\ContentRepository\Core\Factory; -use Neos\ContentRepository\CommandHandler\CommandBus; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\Feature\ContentStreamCommandHandler; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\DimensionSpaceCommandHandler; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\NodeDuplication\NodeDuplicationCommandHandler; -use Neos\ContentRepository\Feature\WorkspaceCommandHandler; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; -use Neos\ContentRepository\Projection\ProjectionCatchUpTriggerInterface; -use Neos\ContentRepository\Projection\Projections; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\CommandHandler\CommandBus; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\Feature\ContentStreamCommandHandler; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\DimensionSpaceCommandHandler; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\NodeDuplication\NodeDuplicationCommandHandler; +use Neos\ContentRepository\Core\Feature\WorkspaceCommandHandler; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface; +use Neos\ContentRepository\Core\Projection\Projections; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\EventStore\EventStoreInterface; use Symfony\Component\Serializer\Serializer; diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryIdentifier.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryIdentifier.php index 898c0610507..86c1b9fba19 100644 --- a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryIdentifier.php +++ b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryIdentifier.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Factory; +namespace Neos\ContentRepository\Core\Factory; /** * Identifies a given content repository diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryDependencies.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryDependencies.php index 2560e444ebe..383304ee2a3 100644 --- a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryDependencies.php +++ b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryDependencies.php @@ -12,16 +12,16 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Factory; +namespace Neos\ContentRepository\Core\Factory; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\EventStore\EventStoreInterface; /** diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryInterface.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryInterface.php index 626229c1943..3d6923659e0 100644 --- a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryInterface.php +++ b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryInterface.php @@ -1,6 +1,6 @@ diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignment.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignment.php index 3b57aa45e3f..08471d9d39f 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignment.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignment.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeMove\Event; +namespace Neos\ContentRepository\Core\Feature\NodeMove\Event; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * A node variant assignment, identifying a node variant by node aggregate identifier and origin dimension space point. diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignments.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignments.php index 55bbbf3bef4..cb409f89da9 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignments.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Event/NodeVariantAssignments.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeMove\Event; +namespace Neos\ContentRepository\Core\Feature\NodeMove\Event; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeMove\Exception\NodeVariantAssignmentCollectionIsInvalid; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeMove\Exception\NodeVariantAssignmentCollectionIsInvalid; /** * An immutable collection of node variant assignments, indexed by (covered, not origin) dimension space point hash diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Exception/NodeVariantAssignmentCollectionIsInvalid.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Exception/NodeVariantAssignmentCollectionIsInvalid.php index d1d7e744c14..3547ef6d2da 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Exception/NodeVariantAssignmentCollectionIsInvalid.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Exception/NodeVariantAssignmentCollectionIsInvalid.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeMove\Exception; +namespace Neos\ContentRepository\Core\Feature\NodeMove\Exception; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignment; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignment; /** * The exception to be thrown if an invalid node variant assignment is to be used diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php index 25468f69c42..12994af27ba 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php @@ -12,35 +12,35 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeMove; - -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\DimensionSpace\Exception\DimensionSpacePointNotFound; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeMove\Command\MoveNodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\DimensionSpace; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregateIsDescendant; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregateCurrentlyDoesNotExist; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignment; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignments; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeMove\Command\RelationDistributionStrategy; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMappings; +namespace Neos\ContentRepository\Core\Feature\NodeMove; + +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\DimensionSpace\Exception\DimensionSpacePointNotFound; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\DimensionSpace; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregateIsDescendant; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregateCurrentlyDoesNotExist; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignment; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignments; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\RelationDistributionStrategy; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMappings; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetNodeReferences.php b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetNodeReferences.php index 18b908e1fd3..a46d755c9cc 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetNodeReferences.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetNodeReferences.php @@ -2,19 +2,19 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeReferencing\Command; +namespace Neos\ContentRepository\Core\Feature\NodeReferencing\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\NodeReferencesToWrite; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\NodeReferencesToWrite; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Create a named reference from source to destination node diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php index fc4e9218f2e..d4c201d7d56 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php @@ -12,19 +12,19 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeReferencing\Command; +namespace Neos\ContentRepository\Core\Feature\NodeReferencing\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\Feature\Common\SerializedNodeReferences; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\Feature\Common\SerializedNodeReferences; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; /** * Set property values for a given node (internal implementation). diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Event/NodeReferencesWereSet.php b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Event/NodeReferencesWereSet.php index 04834ac5206..a02bb5ea1a3 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Event/NodeReferencesWereSet.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Event/NodeReferencesWereSet.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeReferencing\Event; +namespace Neos\ContentRepository\Core\Feature\NodeReferencing\Event; -use Neos\ContentRepository\Feature\Common\PropertyScope; -use Neos\ContentRepository\Feature\Common\SerializedNodeReferences; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\Common\PropertyScope; +use Neos\ContentRepository\Core\Feature\Common\SerializedNodeReferences; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * Named references with optional properties were created from source node to destination node(s) diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/NodeReferencing.php b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/NodeReferencing.php index 55bc3940a0b..c66c9e12c23 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/NodeReferencing.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/NodeReferencing.php @@ -12,24 +12,24 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeReferencing; - -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\Common\ConstraintChecks; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; -use Neos\ContentRepository\Feature\Common\NodeReferenceToWrite; -use Neos\ContentRepository\Feature\Common\PropertyScope; -use Neos\ContentRepository\Feature\Common\SerializedNodeReference; -use Neos\ContentRepository\Feature\Common\SerializedNodeReferences; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetNodeReferences; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetSerializedNodeReferences; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +namespace Neos\ContentRepository\Core\Feature\NodeReferencing; + +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\Feature\Common\NodeReferenceToWrite; +use Neos\ContentRepository\Core\Feature\Common\PropertyScope; +use Neos\ContentRepository\Core\Feature\Common\SerializedNodeReference; +use Neos\ContentRepository\Core\Feature\Common\SerializedNodeReferences; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetSerializedNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** @@ -95,7 +95,7 @@ private function handleSetNodeReferences( } /** - * @throws \Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet * @throws \Neos\Flow\Property\Exception * @throws \Neos\Flow\Security\Exception */ diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php index 309fc9d7d33..f79a31b3112 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php @@ -12,17 +12,17 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRemoval\Command; +namespace Neos\ContentRepository\Core\Feature\NodeRemoval\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\NodeVariantSelectionStrategy; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\NodeVariantSelectionStrategy; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * @api commands are the write-API of the ContentRepository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Event/NodeAggregateWasRemoved.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Event/NodeAggregateWasRemoved.php index 5d8d7654fda..4bfcf31f57d 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Event/NodeAggregateWasRemoved.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Event/NodeAggregateWasRemoved.php @@ -12,17 +12,17 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRemoval\Event; +namespace Neos\ContentRepository\Core\Feature\NodeRemoval\Event; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/NodeRemoval.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/NodeRemoval.php index 7aa2addeef8..8147189be2c 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/NodeRemoval.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/NodeRemoval.php @@ -12,22 +12,22 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRemoval; +namespace Neos\ContentRepository\Core\Feature\NodeRemoval; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace; -use Neos\ContentRepository\DimensionSpace\Exception\DimensionSpacePointNotFound; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\Feature\Common\Exception\TetheredNodeAggregateCannotBeRemoved; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace; +use Neos\ContentRepository\Core\DimensionSpace\Exception\DimensionSpacePointNotFound; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\Feature\Common\Exception\TetheredNodeAggregateCannotBeRemoved; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php index 8a610393029..ab9d311c799 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php @@ -12,17 +12,17 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRenaming\Command; +namespace Neos\ContentRepository\Core\Feature\NodeRenaming\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * All variants in a NodeAggregate have the same NodeName - and this can be changed here. diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Event/NodeAggregateNameWasChanged.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Event/NodeAggregateNameWasChanged.php index 29074c56e7f..214f56665e2 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Event/NodeAggregateNameWasChanged.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Event/NodeAggregateNameWasChanged.php @@ -12,15 +12,15 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRenaming\Event; +namespace Neos\ContentRepository\Core\Feature\NodeRenaming\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/NodeRenaming.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/NodeRenaming.php index 77e1b4d9d75..baefa3666a0 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/NodeRenaming.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/NodeRenaming.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeRenaming; +namespace Neos\ContentRepository\Core\Feature\NodeRenaming; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Event\NodeAggregateNameWasChanged; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php index 2f8aed1ec9d..54a899852e5 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php @@ -12,19 +12,19 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeTypeChange\Command; +namespace Neos\ContentRepository\Core\Feature\NodeTypeChange\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\Feature\Common\NodeAggregateIdentifiersByNodePaths; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateIdentifiersByNodePaths; /** * @api commands are the write-API of the ContentRepository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy.php index 66420b51b01..23999324e99 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeTypeChange\Command; +namespace Neos\ContentRepository\Core\Feature\NodeTypeChange\Command; /** * The strategy how to handle node type constraint conflicts with already present child nodes diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Event/NodeAggregateTypeWasChanged.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Event/NodeAggregateTypeWasChanged.php index 636c29acd76..6d3d6285356 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Event/NodeAggregateTypeWasChanged.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Event/NodeAggregateTypeWasChanged.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeTypeChange\Event; +namespace Neos\ContentRepository\Core\Feature\NodeTypeChange\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php index ef7c60ed4ad..54aaa50a6f7 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php @@ -12,36 +12,36 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeTypeChange; - -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\Common\Exception\NodeConstraintException; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFound; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; -use Neos\ContentRepository\Feature\Common\NodeAggregateIdentifiersByNodePaths; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +namespace Neos\ContentRepository\Core\Feature\NodeTypeChange; + +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeConstraintException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFound; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateIdentifiersByNodePaths; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** @codingStandardsIgnoreStart */ -use Neos\ContentRepository\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; /** @codingStandardsIgnoreEnd */ /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php index 6aea50cea77..a5c24854cfa 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php @@ -12,16 +12,16 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation\Command; +namespace Neos\ContentRepository\Core\Feature\NodeVariation\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Create a variant of a node in a content stream diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeGeneralizationVariantWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeGeneralizationVariantWasCreated.php index 633e9946dc0..44d9c4b161b 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeGeneralizationVariantWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeGeneralizationVariantWasCreated.php @@ -12,16 +12,16 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation\Event; +namespace Neos\ContentRepository\Core\Feature\NodeVariation\Event; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * A node generalization variant was created diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodePeerVariantWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodePeerVariantWasCreated.php index 6946ed66f91..84dd91da7ba 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodePeerVariantWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodePeerVariantWasCreated.php @@ -12,16 +12,16 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation\Event; +namespace Neos\ContentRepository\Core\Feature\NodeVariation\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeSpecializationVariantWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeSpecializationVariantWasCreated.php index 71fc6c83587..678f6158976 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeSpecializationVariantWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Event/NodeSpecializationVariantWasCreated.php @@ -12,16 +12,16 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation\Event; +namespace Neos\ContentRepository\Core\Feature\NodeVariation\Event; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * A node specialization variant was created diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Exception/DimensionSpacePointIsAlreadyOccupied.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Exception/DimensionSpacePointIsAlreadyOccupied.php index 027869513d8..bd2b731cf72 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Exception/DimensionSpacePointIsAlreadyOccupied.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Exception/DimensionSpacePointIsAlreadyOccupied.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation\Exception; +namespace Neos\ContentRepository\Core\Feature\NodeVariation\Exception; /** * The exception to be thrown if a dimension space point is already occupied by a node in a node aggregate diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/NodeVariation.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/NodeVariation.php index 44cea415c0a..5be9e6926eb 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/NodeVariation.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/NodeVariation.php @@ -12,22 +12,22 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\NodeVariation; +namespace Neos\ContentRepository\Core\Feature\NodeVariation; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\Exception\DimensionSpacePointNotFound; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeVariation\Command\CreateNodeVariant; -use Neos\ContentRepository\Feature\NodeVariation\Exception\DimensionSpacePointIsAlreadyOccupied; -use Neos\ContentRepository\Feature\Common\Exception\DimensionSpacePointIsNotYetOccupied; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregateCurrentlyExists; -use Neos\ContentRepository\Feature\Common\ConstraintChecks; -use Neos\ContentRepository\Feature\Common\NodeVariationInternals; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\Exception\DimensionSpacePointNotFound; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant; +use Neos\ContentRepository\Core\Feature\NodeVariation\Exception\DimensionSpacePointIsAlreadyOccupied; +use Neos\ContentRepository\Core\Feature\Common\Exception\DimensionSpacePointIsNotYetOccupied; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregateCurrentlyExists; +use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks; +use Neos\ContentRepository\Core\Feature\Common\NodeVariationInternals; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php index 1cb9d51b3ec..a0d2bce3d67 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php +++ b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\RootNodeCreation\Command; +namespace Neos\ContentRepository\Core\Feature\RootNodeCreation\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Create root node aggregate with node command diff --git a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Event/RootNodeAggregateWithNodeWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Event/RootNodeAggregateWithNodeWasCreated.php index 10c7fa36d1d..00f932e2328 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Event/RootNodeAggregateWithNodeWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Event/RootNodeAggregateWithNodeWasCreated.php @@ -12,17 +12,17 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\RootNodeCreation\Event; +namespace Neos\ContentRepository\Core\Feature\RootNodeCreation\Event; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * A root node aggregate and its initial node were created diff --git a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeCreation.php b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeCreation.php index 32dd2654aa2..5db7f09496a 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeCreation.php +++ b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeCreation.php @@ -12,24 +12,24 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\RootNodeCreation; +namespace Neos\ContentRepository\Core\Feature\RootNodeCreation; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregateCurrentlyExists; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeIsNotOfTypeRoot; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFound; -use Neos\ContentRepository\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\Feature\Common\NodeAggregateEventPublisher; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregateCurrentlyExists; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeIsNotOfTypeRoot; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFound; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher; use Neos\EventStore\Model\EventStream\ExpectedVersion; /** diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php index 7629a26b601..064783a689a 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php @@ -12,51 +12,51 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature; - -use Neos\ContentRepository\CommandHandler\CommandHandlerInterface; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\DecoratedEvent; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspaceRebase\WorkspaceRebaseStatistics; -use Neos\ContentRepository\Feature\ContentStreamCreation\Command\CreateContentStream; -use Neos\ContentRepository\Feature\ContentStreamForking\Command\ForkContentStream; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamAlreadyExists; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\Common\RebasableToOtherContentStreamsInterface; -use Neos\ContentRepository\Feature\Common\PublishableToOtherContentStreamsInterface; -use Neos\ContentRepository\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateRootWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishWorkspace; -use Neos\ContentRepository\Feature\WorkspaceRebase\Command\RebaseWorkspace; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPublished; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; -use Neos\ContentRepository\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist; -use Neos\ContentRepository\Feature\WorkspacePublication\Exception\BaseWorkspaceHasBeenModifiedInTheMeantime; -use Neos\ContentRepository\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; -use Neos\ContentRepository\Feature\Common\Exception\WorkspaceDoesNotExist; -use Neos\ContentRepository\Feature\Common\Exception\WorkspaceHasNoBaseWorkspaceName; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +namespace Neos\ContentRepository\Core\Feature; + +use Neos\ContentRepository\Core\CommandHandler\CommandHandlerInterface; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\DecoratedEvent; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\WorkspaceRebaseStatistics; +use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Command\CreateContentStream; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Command\ForkContentStream; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamAlreadyExists; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface; +use Neos\ContentRepository\Core\Feature\Common\MatchableWithNodeIdentifierToPublishOrDiscardInterface; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPublished; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Exception\BaseWorkspaceHasBeenModifiedInTheMeantime; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; +use Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceDoesNotExist; +use Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceHasNoBaseWorkspaceName; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Exception\ConcurrencyException; use Neos\EventStore\Model\Event\StreamName; @@ -593,8 +593,8 @@ public function handlePublishIndividualNodesFromWorkspace( * @throws BaseWorkspaceDoesNotExist * @throws WorkspaceDoesNotExist * @throws WorkspaceHasNoBaseWorkspaceName - * @throws \Neos\ContentRepository\Feature\Common\Exception\NodeConstraintException - * @throws \Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\NodeConstraintException + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface */ public function handleDiscardIndividualNodesFromWorkspace( diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateRootWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateRootWorkspace.php index ef1057ed8c4..5d5684fbb45 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateRootWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateRootWorkspace.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; /** * Command to create a root workspace. diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateWorkspace.php index 6bcaa335a81..b33d91b220e 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateWorkspace.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; /** * Create a new workspace, based on an existing baseWorkspace diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/RootWorkspaceWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/RootWorkspaceWasCreated.php index 919f31bd224..4673b1d9ba8 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/RootWorkspaceWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/RootWorkspaceWasCreated.php @@ -12,15 +12,15 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event; -use Neos\ContentRepository\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * Event triggered to indicate that a root workspace, i.e. a workspace without base workspace, was created. diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/WorkspaceWasCreated.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/WorkspaceWasCreated.php index 346cdfee479..25ac87ed787 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/WorkspaceWasCreated.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Event/WorkspaceWasCreated.php @@ -12,15 +12,15 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * Event triggered to indicate that a workspace was created, based on a base workspace. diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/BaseWorkspaceDoesNotExist.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/BaseWorkspaceDoesNotExist.php index 29da4ea9cf8..ed461120e1e 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/BaseWorkspaceDoesNotExist.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/BaseWorkspaceDoesNotExist.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Exception; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/WorkspaceAlreadyExists.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/WorkspaceAlreadyExists.php index 679b6f97579..4440ecbbdb6 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/WorkspaceAlreadyExists.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Exception/WorkspaceAlreadyExists.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceCreation\Exception; +namespace Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardIndividualNodesFromWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardIndividualNodesFromWorkspace.php index 32bab455ca9..d8e5ec5d4e6 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardIndividualNodesFromWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardIndividualNodesFromWorkspace.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceDiscarding\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Discard a set of nodes in a workspace diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardWorkspace.php index ab5ec04bddf..5bc9d6c7397 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Command/DiscardWorkspace.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceDiscarding\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Discard a workspace's changes diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasDiscarded.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasDiscarded.php index ac39f6151b9..309627ad242 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasDiscarded.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasDiscarded.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceDiscarding\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasPartiallyDiscarded.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasPartiallyDiscarded.php index 9948d3ce591..ac23a554bd3 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasPartiallyDiscarded.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceDiscarding/Event/WorkspaceWasPartiallyDiscarded.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceDiscarding\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishIndividualNodesFromWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishIndividualNodesFromWorkspace.php index 764ede6e0c7..48f60febf40 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishIndividualNodesFromWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishIndividualNodesFromWorkspace.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspacePublication\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspacePublication\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Publish a set of nodes in a workspace diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishWorkspace.php index 687a865cc09..a3e54b7c4ce 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/PublishWorkspace.php @@ -12,11 +12,11 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspacePublication\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspacePublication\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Publish a workspace diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPartiallyPublished.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPartiallyPublished.php index 25cc7c08fef..a2642caa23c 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPartiallyPublished.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPartiallyPublished.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspacePublication\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspacePublication\Event; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPublished.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPublished.php index 56581ece183..8f42dcbe301 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPublished.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPublished.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspacePublication\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspacePublication\Event; /* * This file is part of the Neos.ContentRepository package. @@ -14,10 +14,10 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Exception/BaseWorkspaceHasBeenModifiedInTheMeantime.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Exception/BaseWorkspaceHasBeenModifiedInTheMeantime.php index eb1737e610f..a590fc50546 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Exception/BaseWorkspaceHasBeenModifiedInTheMeantime.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Exception/BaseWorkspaceHasBeenModifiedInTheMeantime.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspacePublication\Exception; +namespace Neos\ContentRepository\Core\Feature\WorkspacePublication\Exception; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Command/RebaseWorkspace.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Command/RebaseWorkspace.php index 1ce9eb593e4..dbb508878b0 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Command/RebaseWorkspace.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Command/RebaseWorkspace.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceRebase\Command; +namespace Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command; -use Neos\ContentRepository\CommandHandler\CommandInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\CommandHandler\CommandInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Rebase a workspace diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php index 57f33ad5f65..0c1861c4c60 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceRebaseFailed.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceRebase\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceWasRebased.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceWasRebased.php index 8b5e20b7a5c..e67aff43feb 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceWasRebased.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceWasRebased.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceRebase\Event; +namespace Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\EventStore\EventInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\EventStore\EventInterface; /** * @api events are the persistence-API of the content repository diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/WorkspaceRebaseStatistics.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/WorkspaceRebaseStatistics.php index 18bed73aff0..79c1521221a 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/WorkspaceRebaseStatistics.php +++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/WorkspaceRebaseStatistics.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Feature\WorkspaceRebase; +namespace Neos\ContentRepository\Core\Feature\WorkspaceRebase; /** * @internal implementation detail of WorkspaceCommandHandler diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/DbalClientInterface.php b/Neos.ContentRepository.Core/Classes/Infrastructure/DbalClientInterface.php index d7ece836c69..93e1aff18f3 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/DbalClientInterface.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/DbalClientInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure; +namespace Neos\ContentRepository\Core\Infrastructure; use Doctrine\DBAL\Connection; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php index 445655cb2a4..5a11e58babc 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php index 8825ff15b9d..8aac9de0208 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Neos\Utility\Exception\InvalidTypeException; use Neos\Utility\TypeHandling; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php index efed0ed8568..d99113b8274 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Neos\Utility\TypeHandling; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php index 7659f4afe80..47ca8bcb615 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use GuzzleHttp\Psr7\Uri; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php index 2d441b6b97d..06133a0089e 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php index 93c46809d25..d653b257413 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php index d085b251305..c94527fe950 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php index e6e9dc730c7..0ae4058c61a 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php index 80e551da842..a4a761f9f06 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property\Normalizer; +namespace Neos\ContentRepository\Core\Infrastructure\Property\Normalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyConverter.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyConverter.php index df448948e9c..d02572765a3 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyConverter.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyConverter.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property; - -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValue; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; +namespace Neos\ContentRepository\Core\Infrastructure\Property; + +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValue; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; use Symfony\Component\Serializer\Exception\NotEncodableValueException; use Symfony\Component\Serializer\Exception\NotNormalizableValueException; use Symfony\Component\Serializer\Serializer; diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyType.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyType.php index 873db282791..f282108f506 100644 --- a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyType.php +++ b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/PropertyType.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Infrastructure\Property; +namespace Neos\ContentRepository\Core\Infrastructure\Property; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\Exception\PropertyTypeIsInvalid; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\PropertyTypeIsInvalid; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; use Psr\Http\Message\UriInterface; /** diff --git a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactories.php b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactories.php index 6f777a5e1a3..da72d1af337 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactories.php +++ b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactories.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; /** * @internal diff --git a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactoryInterface.php b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactoryInterface.php index 5b96c6c9516..ec84d096c16 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactoryInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookFactoryInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookInterface.php b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookInterface.php index 07a6e128e86..b487fc21b72 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/CatchUpHookInterface.php @@ -1,8 +1,8 @@ diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Reference.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Reference.php index bbfb0edcb9f..6cdf6a096eb 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Reference.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Reference.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentGraph; +namespace Neos\ContentRepository\Core\Projection\ContentGraph; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; /** * A reference to a given node by a name and with optional reference properties diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/References.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/References.php index 2e2bdb7bae1..6b6f993a0a5 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/References.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/References.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentGraph; +namespace Neos\ContentRepository\Core\Projection\ContentGraph; /** * An immutable, type-safe collection of Reference objects diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/SearchTerm.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/SearchTerm.php index 9de33219ebd..12f7fc4849b 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/SearchTerm.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/SearchTerm.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentGraph; +namespace Neos\ContentRepository\Core\Projection\ContentGraph; /** * A search term for use in {@see ContentSubgraphInterface::findDescendants()} API. diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php index a7712693983..5141fbbc111 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentGraph; +namespace Neos\ContentRepository\Core\Projection\ContentGraph; /** * @api returned by {@see ContentSubgraphInterface} diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php index c263182bdcf..e8404c11b21 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentGraph; +namespace Neos\ContentRepository\Core\Projection\ContentGraph; /** * The context parameters value object diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php index 275bacaf73a..d0c2dabd624 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentStream; +namespace Neos\ContentRepository\Core\Projection\ContentStream; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\Service\ContentStreamPruner; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\Service\ContentStreamPruner; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\EventStore\Model\Event\Version; use Neos\EventStore\Model\EventStream\MaybeVersion; diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjection.php b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjection.php index bfbf831dc9f..8c86b3d63e0 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjection.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjection.php @@ -12,32 +12,32 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentStream; +namespace Neos\ContentRepository\Core\Projection\ContentStream; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Types\Types; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; -use Neos\ContentRepository\Feature\ContentStreamForking\Event\ContentStreamWasForked; -use Neos\ContentRepository\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPublished; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Event\ContentStreamWasForked; +use Neos\ContentRepository\Core\Feature\ContentStreamRemoval\Event\ContentStreamWasRemoved; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPublished; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjectionFactory.php b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjectionFactory.php index ebc5e3a75a7..64168a8bd49 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjectionFactory.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjectionFactory.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\ContentStream; +namespace Neos\ContentRepository\Core\Projection\ContentStream; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; -use Neos\ContentRepository\Projection\Projections; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Projection\Projections; /** * @implements ProjectionFactoryInterface diff --git a/Neos.ContentRepository.Core/Classes/Projection/DelegatingCatchUpHook.php b/Neos.ContentRepository.Core/Classes/Projection/DelegatingCatchUpHook.php index 06417783769..47ae578ed43 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/DelegatingCatchUpHook.php +++ b/Neos.ContentRepository.Core/Classes/Projection/DelegatingCatchUpHook.php @@ -1,8 +1,8 @@ diff --git a/Neos.ContentRepository.Core/Classes/Projection/NodeHiddenState/NodeHiddenStateRecord.php b/Neos.ContentRepository.Core/Classes/Projection/NodeHiddenState/NodeHiddenStateRecord.php index e7965965340..1f914f2d949 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/NodeHiddenState/NodeHiddenStateRecord.php +++ b/Neos.ContentRepository.Core/Classes/Projection/NodeHiddenState/NodeHiddenStateRecord.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\NodeHiddenState; +namespace Neos\ContentRepository\Core\Projection\NodeHiddenState; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; /** * Node Hidden State database record diff --git a/Neos.ContentRepository.Core/Classes/Projection/ProjectionCatchUpTriggerInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ProjectionCatchUpTriggerInterface.php index 7233b70ba21..1fb20d34cbe 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ProjectionCatchUpTriggerInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ProjectionCatchUpTriggerInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; /** * Interface for a class that (asynchronously) triggers a catchup of affected projections after a diff --git a/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php index cda877af1b2..e9ad436c188 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; /** * @template T of ProjectionInterface diff --git a/Neos.ContentRepository.Core/Classes/Projection/ProjectionInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ProjectionInterface.php index f54ed6f27e6..115f7e57d1c 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ProjectionInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ProjectionInterface.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\CommandHandler\PendingProjections; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\CommandHandler\PendingProjections; +use Neos\ContentRepository\Core\ContentRepository; use Neos\EventStore\CatchUp\CheckpointStorageInterface; use Neos\EventStore\Model\EventStream\EventStreamInterface; use Neos\EventStore\Model\Event\SequenceNumber; diff --git a/Neos.ContentRepository.Core/Classes/Projection/ProjectionStateInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ProjectionStateInterface.php index 0865694f34a..d596ce82bce 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ProjectionStateInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ProjectionStateInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; /** * (Marker) interface for the state (aka Read Model) of a projection {@see ProjectionInterface} diff --git a/Neos.ContentRepository.Core/Classes/Projection/Projections.php b/Neos.ContentRepository.Core/Classes/Projection/Projections.php index 93eb67e4980..0a01459b14d 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Projections.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Projections.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; /** * An immutable set of Content Repository projections ({@see ProjectionInterface} diff --git a/Neos.ContentRepository.Core/Classes/Projection/WithMarkStaleInterface.php b/Neos.ContentRepository.Core/Classes/Projection/WithMarkStaleInterface.php index e0de3be15ef..edfbf2315c3 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/WithMarkStaleInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/WithMarkStaleInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection; +namespace Neos\ContentRepository\Core\Projection; -use Neos\ContentRepository\EventStore\EventPersister; +use Neos\ContentRepository\Core\EventStore\EventPersister; /** * Additional marker interface to add to a {@see ProjectionInterface}. diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/Workspace.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/Workspace.php index 4f514da85cc..bb927bf9277 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/Workspace.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/Workspace.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\Workspace; +namespace Neos\ContentRepository\Core\Projection\Workspace; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; /** * Workspace Read Model diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceFinder.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceFinder.php index ed2cde49cc5..2161f95cd43 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceFinder.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceFinder.php @@ -12,14 +12,14 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\Workspace; - -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +namespace Neos\ContentRepository\Core\Projection\Workspace; + +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; /** * Workspace Finder diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php index 4d99bef4944..6de93e05862 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php @@ -12,28 +12,28 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\Workspace; +namespace Neos\ContentRepository\Core\Projection\Workspace; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Types\Types; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\Projection\WithMarkStaleInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; -use Neos\ContentRepository\Feature\WorkspacePublication\Event\WorkspaceWasPublished; -use Neos\ContentRepository\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\Projection\WithMarkStaleInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\WorkspaceWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Event\WorkspaceWasPartiallyDiscarded; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPartiallyPublished; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPublished; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjectionFactory.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjectionFactory.php index b7f3add994c..1bc2fb951dd 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjectionFactory.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjectionFactory.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\Workspace; +namespace Neos\ContentRepository\Core\Projection\Workspace; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; -use Neos\ContentRepository\Projection\Projections; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Projection\Projections; /** * @implements ProjectionFactoryInterface diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceRuntimeCache.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceRuntimeCache.php index 098d62e51ff..cee840fd580 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceRuntimeCache.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceRuntimeCache.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Projection\Workspace; +namespace Neos\ContentRepository\Core\Projection\Workspace; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Workspace Runtime Cache diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php index ca3c10156ca..12d3f36e864 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php @@ -1,6 +1,6 @@ diff --git a/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceService.php b/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceService.php index cc3c9e915bc..1fb1ddd38cd 100644 --- a/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceService.php +++ b/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceService.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Service; +namespace Neos\ContentRepository\Core\Service; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Feature\WorkspaceRebase\Command\RebaseWorkspace; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * @api @@ -24,8 +24,8 @@ public function __construct( * @return array the workspaces of the removed content streams * @throws \Doctrine\DBAL\Driver\Exception * @throws \Doctrine\DBAL\Exception - * @throws \Neos\ContentRepository\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist - * @throws \Neos\ContentRepository\Feature\Common\Exception\WorkspaceDoesNotExist + * @throws \Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceDoesNotExist * @throws \Neos\Flow\Property\Exception * @throws \Neos\Flow\Security\Exception */ diff --git a/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceServiceFactory.php b/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceServiceFactory.php index dbc843790ac..f83e1664f02 100644 --- a/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceServiceFactory.php +++ b/Neos.ContentRepository.Core/Classes/Service/WorkspaceMaintenanceServiceFactory.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\Service; +namespace Neos\ContentRepository\Core\Service; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/CoverageByOrigin.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/CoverageByOrigin.php index ace96a65faf..ae180e0c7cf 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/CoverageByOrigin.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/CoverageByOrigin.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /* * This file is part of the Neos.ContentRepository package. @@ -14,9 +14,9 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * A set of coverage of an origin dimension space point within a node aggregate diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateClassification.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateClassification.php index ed3c6d1ef27..24024d9215b 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateClassification.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateClassification.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /** * The classification of a node aggregate diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifier.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifier.php index 9214155a5b0..d9a3d7e70c1 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifier.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifier.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; use Neos\Flow\Utility\Algorithms; diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifiers.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifiers.php index 441d0ff35ef..fadcdeb5bf9 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifiers.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIdentifiers.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * An immutable collection of NodeAggregateIdentifiers, indexed by their value diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeName.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeName.php index ba8bf6d1f09..ce5623de5ea 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeName.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeName.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /** * The Node name is the "path part" of the node; i.e. when accessing the node "/foo" via path, diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodePath.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodePath.php index 5a0f5c6601e..b618114d135 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodePath.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodePath.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /** * The node path is a list of NodeNames. It can be either absolute or relative. diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReference.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReference.php index da80dc0dfff..33d77a358d9 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReference.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReference.php @@ -13,9 +13,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; /** * @todo what is this? diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReferences.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReferences.php index 01906433171..cc3fae81b74 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReferences.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeReferences.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; /** * @implements \IteratorAggregate diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginByCoverage.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginByCoverage.php index fe4b66631b5..f21fd487b49 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginByCoverage.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginByCoverage.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /* * This file is part of the Neos.ContentRepository package. @@ -14,8 +14,8 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * A set of origin of a covered dimension space point within a node aggregate diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePoint.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePoint.php index 8eab5e5fb83..ef8cf3aa79f 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePoint.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePoint.php @@ -12,10 +12,10 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; -use Neos\ContentRepository\DimensionSpace\AbstractDimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\AbstractDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; /** * A node's origin dimension space point. Defines in which point in the dimension space the node originates diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePointSet.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePointSet.php index e404202a63f..06c80d376ef 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePointSet.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/OriginDimensionSpacePointSet.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /* * This file is part of the Neos.ContentRepository package. @@ -14,7 +14,7 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; /** * A set of points in the dimension space, occupied by nodes in a node aggregate diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Node/PropertyName.php b/Neos.ContentRepository.Core/Classes/SharedModel/Node/PropertyName.php index e2f1ed5a62b..53dd15bba5a 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Node/PropertyName.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Node/PropertyName.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Node; +namespace Neos\ContentRepository\Core\SharedModel\Node; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddress.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddress.php index 2d9218a408b..5b147299b79 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddress.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddress.php @@ -12,12 +12,12 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel; +namespace Neos\ContentRepository\Core\SharedModel; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * A persistent, external "address" of a node; used to link to it. diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddressFactory.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddressFactory.php index adf472b3e77..32bc8e2c594 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddressFactory.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeAddressFactory.php @@ -12,13 +12,13 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel; +namespace Neos\ContentRepository\Core\SharedModel; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * @api diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeLabelGeneratorInterface.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeLabelGeneratorInterface.php index 38a08cae012..4017851d354 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeLabelGeneratorInterface.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeLabelGeneratorInterface.php @@ -12,9 +12,9 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * Interface for rendering a node label string based on some strategy diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeType.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeType.php index 3a9a5c3c79e..70c822b2509 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeType.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeType.php @@ -12,17 +12,17 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; use Neos\ContentRepositoryRegistry\NodeLabel\ExpressionBasedNodeLabelGenerator; use Neos\ContentRepositoryRegistry\Utility; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Utility\ObjectAccess; use Neos\Utility\Arrays; use Neos\Utility\PositionalArraySorter; -use Neos\ContentRepository\Feature\Common\Exception\InvalidNodeTypePostprocessorException; +use Neos\ContentRepository\Core\Feature\Common\Exception\InvalidNodeTypePostprocessorException; /** * A Node Type diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraints.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraints.php index 467b590bb1b..abd6360ce72 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraints.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraints.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; use Neos\Utility\Arrays; diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraintsWithSubNodeTypes.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraintsWithSubNodeTypes.php index c636d51c443..449c53af108 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraintsWithSubNodeTypes.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeConstraintsWithSubNodeTypes.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; /** * Implementation detail of {@see NodeTypeConstraints}, to be used inside implementations of ContentSubgraphInterface. diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeManager.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeManager.php index acdb5851bb3..4b38fa8761a 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeManager.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeManager.php @@ -12,11 +12,11 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; -use Neos\ContentRepository\Feature\Common\Exception\NodeConfigurationException; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeIsFinalException; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeConfigurationException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeIsFinalException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; use Neos\Flow\ObjectManagement\ObjectManagerInterface; /** diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeName.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeName.php index 6d50037ad8d..eb3707fe7c1 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeName.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeName.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; /** * Name of a Node Type; e.g. "Neos.Neos:Content" diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeNames.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeNames.php index dffee94fed7..8d0a0727ebf 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeNames.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypeNames.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; /** * A collection of NodeType names diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypePostprocessorInterface.php b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypePostprocessorInterface.php index b507d5eaf20..d7c2e9bd6dd 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypePostprocessorInterface.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/NodeType/NodeTypePostprocessorInterface.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\NodeType; +namespace Neos\ContentRepository\Core\SharedModel\NodeType; /** * A NodeType postprocessor can be used in order to programmatically change the configuration of a node type diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/User/UserIdentifier.php b/Neos.ContentRepository.Core/Classes/SharedModel/User/UserIdentifier.php index 50a51e6df39..00547acd186 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/User/UserIdentifier.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/User/UserIdentifier.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\User; +namespace Neos\ContentRepository\Core\SharedModel\User; use Neos\Flow\Utility\Algorithms; diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreamIdentifier.php b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreamIdentifier.php index 25376083b76..1534edc2584 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreamIdentifier.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreamIdentifier.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Workspace; +namespace Neos\ContentRepository\Core\SharedModel\Workspace; use Neos\Flow\Utility\Algorithms; diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceDescription.php b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceDescription.php index 0b51ee65dd6..911bb6c2e6e 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceDescription.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceDescription.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Workspace; +namespace Neos\ContentRepository\Core\SharedModel\Workspace; /** * Description for a workspace diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceName.php b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceName.php index 313554387e3..1d0a8c29c79 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceName.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceName.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Workspace; +namespace Neos\ContentRepository\Core\SharedModel\Workspace; /** * Name of a workspace. diff --git a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceTitle.php b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceTitle.php index 94aa0bb8d4f..68268a75e1a 100644 --- a/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceTitle.php +++ b/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/WorkspaceTitle.php @@ -12,7 +12,7 @@ declare(strict_types=1); -namespace Neos\ContentRepository\SharedModel\Workspace; +namespace Neos\ContentRepository\Core\SharedModel\Workspace; /** * Human-Readable title of a workspace diff --git a/Neos.ContentRepository.Core/README.md b/Neos.ContentRepository.Core/README.md index 3e8d1d3070e..6c53b11a6dd 100644 --- a/Neos.ContentRepository.Core/README.md +++ b/Neos.ContentRepository.Core/README.md @@ -11,7 +11,7 @@ If you dare to use it anyways, you can install this package via composer: { # ... "require": { - "neos/contentrepository": "9.0.x-dev" + "neos/contentrepository-core": "9.0.x-dev" # ... } } diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php index 9b052d4cb97..70e77975d24 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php @@ -14,12 +14,12 @@ namespace Neos\ContentRepository\Tests\Behavior\Features\Bootstrap; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentGraphs; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentSubgraphs; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php index e95588c778e..35e02e09091 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php @@ -12,7 +12,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * The feature trait to test projected nodes diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php index f87db487418..ff2b0cd2c36 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php @@ -34,27 +34,27 @@ use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\Dto\TraceEntryType; use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\RedisInterleavingLogger; use Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjection; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; use Neos\ContentRepository\Security\Service\AuthorizationService; -use Neos\ContentRepository\Service\ContentStreamPruner; -use Neos\ContentRepository\Service\ContentStreamPrunerFactory; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Service\ContentStreamPruner; +use Neos\ContentRepository\Core\Service\ContentStreamPrunerFactory; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Features\ContentStreamForking; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Features\NodeCopying; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Features\NodeCreation; @@ -520,7 +520,7 @@ public function theSubtreeForNodeAggregateWithNodeTypesAndLevelsDeepShouldBe( ->getSubgraph($this->contentStreamIdentifier, $this->dimensionSpacePoint, $this->visibilityConstraints) ->findSubtrees(NodeAggregateIdentifiers::fromArray([$nodeAggregateIdentifier]), $maximumLevels, $nodeTypeConstraints); - /** @var \Neos\ContentRepository\Projection\ContentGraph\Subtree[] $flattenedSubtree */ + /** @var \Neos\ContentRepository\Core\Projection\ContentGraph\Subtree[] $flattenedSubtree */ $flattenedSubtree = []; self::flattenSubtreeForComparison($subtree, $flattenedSubtree); @@ -636,7 +636,7 @@ protected function getRootNodeAggregateIdentifier(): ?NodeAggregateIdentifier $contentGraphs = $this->getActiveContentGraphs()->getIterator()->getArrayCopy(); $contentGraph = reset($contentGraphs); - $sitesNodeAggregate = $contentGraph->findRootNodeAggregateByType($this->contentStreamIdentifier, \Neos\ContentRepository\SharedModel\NodeType\NodeTypeName::fromString('Neos.Neos:Sites')); + $sitesNodeAggregate = $contentGraph->findRootNodeAggregateByType($this->contentStreamIdentifier, \Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName::fromString('Neos.Neos:Sites')); if ($sitesNodeAggregate) { return $sitesNodeAggregate->getIdentifier(); } diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php index 56c455d6a8e..c8d63d01971 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php @@ -13,11 +13,11 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\ContentStreamForking\Command\ForkContentStream; -use Neos\ContentRepository\Feature\ContentStreamCommandHandler; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Command\ForkContentStream; +use Neos\ContentRepository\Core\Feature\ContentStreamCommandHandler; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * The content stream forking feature trait for behavioral tests diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php index f746b7ead64..d9a0afccc4c 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php @@ -13,17 +13,17 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeDuplication\Command\CopyNodesRecursively; -use Neos\ContentRepository\Feature\NodeDuplication\Command\NodeAggregateIdentifierMapping; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeDuplication\Command\CopyNodesRecursively; +use Neos\ContentRepository\Core\Feature\NodeDuplication\Command\NodeAggregateIdentifierMapping; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentGraphs; use Neos\ContentRepository\Tests\Behavior\Features\Helper\NodesByAdapter; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php index f608aad820c..31a27c56e50 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php @@ -13,23 +13,23 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\Common\Exception\ContentStreamDoesNotExistYet; -use Neos\ContentRepository\Feature\NodeCreation\Command\CreateNodeAggregateWithNode; -use Neos\ContentRepository\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; -use Neos\ContentRepository\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; -use Neos\ContentRepository\Feature\Common\NodeAggregateIdentifiersByNodePaths; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\Common\Exception\ContentStreamDoesNotExistYet; +use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode; +use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateIdentifiersByNodePaths; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php index 0079c33ddc4..e20cb753864 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php @@ -13,16 +13,16 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeDisabling\Command\DisableNodeAggregate; -use Neos\ContentRepository\Feature\NodeDisabling\Command\EnableNodeAggregate; -use Neos\ContentRepository\Feature\Common\NodeVariantSelectionStrategy; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate; +use Neos\ContentRepository\Core\Feature\Common\NodeVariantSelectionStrategy; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php index c968713820a..6330178f696 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php @@ -13,16 +13,16 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeModification\Command\SetNodeProperties; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetNodeProperties; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php index f7b50156743..0fec867c545 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php @@ -13,15 +13,15 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeMove\Command\MoveNodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\NodeMove\Command\RelationDistributionStrategy; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\RelationDistributionStrategy; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php index fafb1806766..6e34d81420e 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php @@ -13,20 +13,20 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\Common\NodeReferencesToWrite; -use Neos\ContentRepository\Feature\Common\NodeReferenceToWrite; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetNodeReferences; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\Common\NodeReferencesToWrite; +use Neos\ContentRepository\Core\Feature\Common\NodeReferenceToWrite; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php index 71c83071997..efd90c1daf7 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php @@ -13,15 +13,15 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\Common\NodeVariantSelectionStrategy; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\Common\NodeVariantSelectionStrategy; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php index 6eb0bf2591e..8b1767c67c4 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php @@ -13,11 +13,11 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php index cbb822c9a18..ee44e68bb31 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php @@ -13,15 +13,15 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\Common\NodeAggregateIdentifiersByNodePaths; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\Common\NodeAggregateIdentifiersByNodePaths; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * The node type change trait for behavioral tests diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php index e06c9428443..9b207a0b80d 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php @@ -13,14 +13,14 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeVariation\Command\CreateNodeVariant; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php index f3833f39ab4..680980acc31 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php @@ -13,17 +13,17 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateRootWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspaceRebase\Command\RebaseWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCommandHandler; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCommandHandler; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\EventStore\Model\Event\StreamName; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php index c19666c0ec9..67a497b4bde 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php @@ -13,15 +13,15 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCommandHandler; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCommandHandler; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * The workspace discarding feature trait for behavioral tests diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php index 0a5b7301f96..f60c2a2ef9e 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php @@ -13,13 +13,13 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishWorkspace; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * The workspace publishing feature trait for behavioral tests diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php index 2dff356e7d1..fdff4bd8c9a 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php @@ -13,24 +13,24 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\NodeMove\Command\MoveNodeAggregate; -use Neos\ContentRepository\Feature\ContentStreamForking\Command\ForkContentStream; -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; -use Neos\ContentRepository\Feature\NodeDisabling\Command\DisableNodeAggregate; -use Neos\ContentRepository\Feature\NodeDisabling\Command\EnableNodeAggregate; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetNodeReferences; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateRootWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishWorkspace; -use Neos\ContentRepository\Feature\WorkspaceRebase\Command\RebaseWorkspace; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\ContentStreamForking\Command\ForkContentStream; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Helpers\ContentRepositoryInternals; use Neos\EventStore\Model\Event; use Neos\EventStore\Model\Event\StreamName; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternals.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternals.php index 4d90505aa2e..53c03c1b577 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternals.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternals.php @@ -4,16 +4,16 @@ namespace Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Helpers; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\EventStore\EventStoreInterface; class ContentRepositoryInternals implements ContentRepositoryServiceInterface diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternalsFactory.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternalsFactory.php index f0e47631d3b..2195a901cdc 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternalsFactory.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Helpers/ContentRepositoryInternalsFactory.php @@ -4,9 +4,9 @@ namespace Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Helpers; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; class ContentRepositoryInternalsFactory implements ContentRepositoryServiceFactoryInterface { diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php index 7cb8b0702a8..d34c6b1e974 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php @@ -14,13 +14,13 @@ */ use Behat\Gherkin\Node\PyStringNode; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\ContentRepository\NodeMigration\NodeMigrationServiceFactory; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepository\NodeMigration\Command\ExecuteMigration; use Neos\ContentRepository\NodeMigration\NodeMigrationService; use Neos\ContentRepository\NodeMigration\Command\MigrationConfiguration; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Symfony\Component\Yaml\Yaml; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php index 878bf005256..7364908fddc 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php @@ -13,8 +13,8 @@ use Behat\Gherkin\Node\TableNode; use Neos\ContentRepository\Domain\Model\Node; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Exception\AccessDeniedException; use PHPUnit\Framework\Assert; @@ -38,7 +38,7 @@ trait NodeAuthorizationTrait /** * @Flow\Inject - * @var \Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager + * @var \Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager */ protected $nodeTypeManager; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php index 482d760311d..821a0ae994b 100755 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php @@ -12,20 +12,20 @@ * source code. */ -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Dimension\ConfigurationBasedContentDimensionSource; -use Neos\ContentRepository\Dimension\ContentDimension; -use Neos\ContentRepository\Dimension\ContentDimensionConstraintSet; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Dimension\ContentDimensionValue; -use Neos\ContentRepository\Dimension\ContentDimensionValues; -use Neos\ContentRepository\Dimension\ContentDimensionValueSpecializationDepth; -use Neos\ContentRepository\Dimension\ContentDimensionValueVariationEdge; -use Neos\ContentRepository\Dimension\ContentDimensionValueVariationEdges; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Dimension\ConfigurationBasedContentDimensionSource; +use Neos\ContentRepository\Core\Dimension\ContentDimension; +use Neos\ContentRepository\Core\Dimension\ContentDimensionConstraintSet; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValues; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValueSpecializationDepth; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValueVariationEdge; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValueVariationEdges; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\Helpers\ContentRepositoryInternals; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\ObjectManagement\ObjectManagerInterface; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php index 909c84d1a50..7d8730060f1 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php @@ -13,16 +13,16 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeAggregatesTypeIsAmbiguous; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentGraphs; use Neos\ContentRepository\Tests\Behavior\Features\Helper\NodeAggregatesByAdapter; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php index 4e721d64192..c6f8d8510ae 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php @@ -14,19 +14,19 @@ use Behat\Gherkin\Node\TableNode; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\Projection\ContentGraph\References; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Projection\ContentGraph\References; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentGraphs; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentSubgraphs; use Neos\ContentRepository\Tests\Behavior\Features\Helper\NodeDiscriminator; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepository\Tests\Behavior\Features\Helper\NodeDiscriminators; use Neos\ContentRepository\Tests\Behavior\Features\Helper\NodesByAdapter; use Neos\ContentRepository\Tests\Behavior\Fixtures\PostalAddress; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php index 7511dcd8ca5..67bb5742e74 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php @@ -13,13 +13,13 @@ */ use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; use Neos\ContentRepository\StructureAdjustment\StructureAdjustmentServiceFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Error\Messages\Error; use Neos\Error\Messages\Result; -use Neos\ContentRepository\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; +use Neos\ContentRepository\Core\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php index cda600d0beb..a0bda722c9a 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php @@ -14,12 +14,12 @@ use Behat\Gherkin\Node\TableNode; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepository\Tests\Behavior\Fixtures\PostalAddress; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use PHPUnit\Framework\Assert; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php index 3b02b1f4424..3b657f08e89 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php @@ -13,9 +13,9 @@ */ use Behat\Gherkin\Node\TableNode; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; use Neos\ContentRepository\StructureAdjustment\Adjustment\StructureAdjustment; use Neos\ContentRepository\StructureAdjustment\StructureAdjustmentService; use Neos\ContentRepository\StructureAdjustment\StructureAdjustmentServiceFactory; diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentGraphs.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentGraphs.php index 473bae98869..b2ec35f759a 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentGraphs.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentGraphs.php @@ -14,7 +14,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentSubgraphs.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentSubgraphs.php index d4c3f5b5606..26fd12a020b 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentSubgraphs.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/ContentSubgraphs.php @@ -14,7 +14,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeAggregatesByAdapter.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeAggregatesByAdapter.php index 643e6c08f83..391621db79c 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeAggregatesByAdapter.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeAggregatesByAdapter.php @@ -14,7 +14,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminator.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminator.php index 5241d8f4b69..df4ca02045c 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminator.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminator.php @@ -15,10 +15,10 @@ namespace Neos\ContentRepository\Tests\Behavior\Features\Helper; use Neos\Cache\CacheAwareInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * The node discriminator value object diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminators.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminators.php index 432949f9d77..8667614eb0c 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminators.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodeDiscriminators.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\Tests\Behavior\Features\Helper; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodesByAdapter.php b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodesByAdapter.php index fa7b5a3dca0..4b3adab13b5 100644 --- a/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodesByAdapter.php +++ b/Neos.ContentRepository.Core/Tests/Behavior/Features/Helper/NodesByAdapter.php @@ -14,7 +14,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.Core/Tests/Functional/Domain/Fixtures/TestNodePostprocessor.php b/Neos.ContentRepository.Core/Tests/Functional/Domain/Fixtures/TestNodePostprocessor.php index bc49b360f60..db0b5dd5ce0 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Domain/Fixtures/TestNodePostprocessor.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Domain/Fixtures/TestNodePostprocessor.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * An example NodePostprocessor used by the NodesTests diff --git a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ClosestOperationTest.php b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ClosestOperationTest.php index 7d5f2abd0a2..52e55eaa671 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ClosestOperationTest.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ClosestOperationTest.php @@ -12,7 +12,7 @@ */ use Neos\Eel\FlowQuery\FlowQuery; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\ContentRepository\Tests\Functional\AbstractNodeTest; /** diff --git a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/HasOperationTest.php b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/HasOperationTest.php index 0dcbd333373..ae9013c9396 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/HasOperationTest.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/HasOperationTest.php @@ -12,7 +12,7 @@ */ use Neos\Eel\FlowQuery\FlowQuery; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\ContentRepository\Tests\Functional\AbstractNodeTest; /** diff --git a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/NextUntilOperationTest.php b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/NextUntilOperationTest.php index 0d6e8203d91..99018a42197 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/NextUntilOperationTest.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/NextUntilOperationTest.php @@ -12,7 +12,7 @@ */ use Neos\Eel\FlowQuery\FlowQuery; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\ContentRepository\Tests\Functional\AbstractNodeTest; /** diff --git a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ParentsUntilOperationTest.php b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ParentsUntilOperationTest.php index 32fb7de418a..324d6210e66 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ParentsUntilOperationTest.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/ParentsUntilOperationTest.php @@ -12,7 +12,7 @@ */ use Neos\Eel\FlowQuery\FlowQuery; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\ContentRepository\Tests\Functional\AbstractNodeTest; /** diff --git a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/PrevUntilOperationTest.php b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/PrevUntilOperationTest.php index 36d335cabfa..293c64e99a9 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/PrevUntilOperationTest.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Eel/FlowQueryOperations/PrevUntilOperationTest.php @@ -12,7 +12,7 @@ */ use Neos\Eel\FlowQuery\FlowQuery; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\ContentRepository\Tests\Functional\AbstractNodeTest; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ConfigurationBasedContentDimensionSourceTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ConfigurationBasedContentDimensionSourceTest.php index 0184499f38c..8d3504c23b2 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ConfigurationBasedContentDimensionSourceTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ConfigurationBasedContentDimensionSourceTest.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\Dimension\ContentDimensionConstraintSet; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\Dimension\ContentDimensionConstraintSet; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionConstraintsTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionConstraintsTest.php index ed4cadf485a..3c89800e043 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionConstraintsTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionConstraintsTest.php @@ -14,7 +14,7 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionIdentifierTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionIdentifierTest.php index f5c331f1c1f..dace189b2a6 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionIdentifierTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionIdentifierTest.php @@ -14,7 +14,7 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionTest.php index a3480fe4c01..1d6b0faa29e 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionTest.php @@ -14,9 +14,9 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValuesAreInvalid; -use Neos\ContentRepository\Dimension\Exception\GeneralizationIsInvalid; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValuesAreInvalid; +use Neos\ContentRepository\Core\Dimension\Exception\GeneralizationIsInvalid; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueSpecializationDepthTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueSpecializationDepthTest.php index d494a261834..3ea0af5817c 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueSpecializationDepthTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueSpecializationDepthTest.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueTest.php b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueTest.php index 3f669419db0..92978c48dc8 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Dimension/ContentDimensionValueTest.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\Tests\Unit\Dimension; -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueIsInvalid; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueIsInvalid; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentDimensionZookeeperTest.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentDimensionZookeeperTest.php index fdb51cb95d5..66ddee2359f 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentDimensionZookeeperTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentDimensionZookeeperTest.php @@ -11,8 +11,8 @@ * information, please view the LICENSE file which was distributed with this * source code. */ -use Neos\ContentRepository\DimensionSpace; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\DimensionSpace; +use Neos\ContentRepository\Core\Dimension; use Neos\Flow\Tests\UnitTestCase; // NOTE: not sure why this is needed diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentSubgraphVariationWeightTest.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentSubgraphVariationWeightTest.php index 18a49a02cec..ce57bc7a1f3 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentSubgraphVariationWeightTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/ContentSubgraphVariationWeightTest.php @@ -11,10 +11,10 @@ * information, please view the LICENSE file which was distributed with this * source code. */ -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; -use Neos\ContentRepository\DimensionSpace; -use Neos\ContentRepository\DimensionSpace\Exception\ContentSubgraphVariationWeightsAreIncomparable; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\Dimension\Exception\ContentDimensionValueSpecializationDepthIsInvalid; +use Neos\ContentRepository\Core\DimensionSpace; +use Neos\ContentRepository\Core\DimensionSpace\Exception\ContentSubgraphVariationWeightsAreIncomparable; use Neos\Flow\Tests\UnitTestCase; /** diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/ExampleDimensionSource.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/ExampleDimensionSource.php index c22113aeb32..4acad0b4280 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/ExampleDimensionSource.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/ExampleDimensionSource.php @@ -11,7 +11,7 @@ * information, please view the LICENSE file which was distributed with this * source code. */ -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * The example dimension source fixture diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/NullExampleDimensionSource.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/NullExampleDimensionSource.php index b1e0ff76526..3fbdb712a32 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/NullExampleDimensionSource.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/NullExampleDimensionSource.php @@ -12,7 +12,7 @@ namespace Neos\ContentRepository\Tests\Unit\DimensionSpace\Fixtures; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * A dimension source fixture with no dimensions defined diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/VariationExampleDimensionSource.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/VariationExampleDimensionSource.php index 4e349b29527..429dce7e292 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/VariationExampleDimensionSource.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/Fixtures/VariationExampleDimensionSource.php @@ -12,7 +12,7 @@ namespace Neos\ContentRepository\Tests\Unit\DimensionSpace\Fixtures; -use Neos\ContentRepository\Dimension; +use Neos\ContentRepository\Core\Dimension; /** * The dimension source fixture with variation examples diff --git a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/InterDimensionalVariationGraphTest.php b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/InterDimensionalVariationGraphTest.php index 499657d04af..3bdb1d0f079 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/InterDimensionalVariationGraphTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/DimensionSpace/InterDimensionalVariationGraphTest.php @@ -12,8 +12,8 @@ namespace Neos\ContentRepository\Tests\Unit\DimensionSpace; -use Neos\ContentRepository\Dimension; -use Neos\ContentRepository\DimensionSpace; +use Neos\ContentRepository\Core\Dimension; +use Neos\ContentRepository\Core\DimensionSpace; use Neos\Flow\Tests\UnitTestCase; use PHPUnit\Framework\MockObject\MockObject; diff --git a/Neos.ContentRepository.Core/Tests/Unit/Domain/Model/NodeTypeTest.php b/Neos.ContentRepository.Core/Tests/Unit/Domain/Model/NodeTypeTest.php index 26e684f62d0..9e349d4dd56 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Domain/Model/NodeTypeTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Domain/Model/NodeTypeTest.php @@ -11,11 +11,11 @@ * source code. */ -use Neos\ContentRepository\SharedModel\NodeType\NodeLabelGeneratorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeLabelGeneratorInterface; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Flow\Tests\UnitTestCase; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; /** * Testcase for the "NodeType" domain model diff --git a/Neos.ContentRepository.Core/Tests/Unit/Domain/Service/NodeTypeManagerTest.php b/Neos.ContentRepository.Core/Tests/Unit/Domain/Service/NodeTypeManagerTest.php index 4c7e8fefa01..465c7972f76 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Domain/Service/NodeTypeManagerTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Domain/Service/NodeTypeManagerTest.php @@ -11,13 +11,13 @@ * source code. */ -use Neos\ContentRepository\Feature\Common\Exception\NodeConfigurationException; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeIsFinalException; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeConfigurationException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeIsFinalException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; use Neos\Flow\Configuration\ConfigurationManager; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Flow\Tests\UnitTestCase; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; /** * Testcase for the "NodeTypeManager" diff --git a/Neos.ContentRepository.Core/Tests/Unit/Infrastructure/Property/PropertyTypeTest.php b/Neos.ContentRepository.Core/Tests/Unit/Infrastructure/Property/PropertyTypeTest.php index c8c42673326..6bea63de5da 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/Infrastructure/Property/PropertyTypeTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/Infrastructure/Property/PropertyTypeTest.php @@ -12,9 +12,9 @@ */ use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\Infrastructure\Property\PropertyType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyType; use Neos\ContentRepository\Tests\Unit\Fixtures\PostalAddress; use Neos\Flow\ResourceManagement\PersistentResource; use Neos\Media\Domain\Model\Asset; diff --git a/Neos.ContentRepository.Core/Tests/Unit/TypeConverter/NodeConverterTest.php b/Neos.ContentRepository.Core/Tests/Unit/TypeConverter/NodeConverterTest.php index 1691b8e9fca..f8e16d4898c 100644 --- a/Neos.ContentRepository.Core/Tests/Unit/TypeConverter/NodeConverterTest.php +++ b/Neos.ContentRepository.Core/Tests/Unit/TypeConverter/NodeConverterTest.php @@ -18,7 +18,7 @@ use Neos\Media\Domain\Model\Asset; use Neos\ContentRepository\Domain\Factory\NodeFactory; use Neos\ContentRepository\Domain\Model\Node; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\ContentRepository\Domain\Model\Workspace; use Neos\ContentRepository\Domain\Repository\NodeDataRepository; use Neos\ContentRepository\Domain\Repository\WorkspaceRepository; diff --git a/Neos.ContentRepository.Core/composer.json b/Neos.ContentRepository.Core/composer.json index 9c7014a7615..de8ffb08173 100644 --- a/Neos.ContentRepository.Core/composer.json +++ b/Neos.ContentRepository.Core/composer.json @@ -1,5 +1,5 @@ { - "name": "neos/contentrepository", + "name": "neos/contentrepository-core", "description": "Content repository based on Flow, specifically made for Neos, but also usable standalone.", "license": [ "GPL-3.0-or-later" @@ -22,16 +22,15 @@ }, "replace": { "typo3/typo3cr": "self.version", - "neos/content-repository": "self.version" }, "autoload": { "psr-4": { - "Neos\\ContentRepository\\": "src" + "Neos\\ContentRepository\\Core\\": "src" } }, "autoload-dev": { "psr-4": { - "Neos\\ContentRepository\\Tests\\": "Tests" + "Neos\\ContentRepository\\Core\\Tests\\": "Tests" } }, "suggest": { diff --git a/Neos.ContentRepository.Export/composer.json b/Neos.ContentRepository.Export/composer.json index 7cb8047054e..05b02307c4f 100644 --- a/Neos.ContentRepository.Export/composer.json +++ b/Neos.ContentRepository.Export/composer.json @@ -4,7 +4,7 @@ "type": "library", "require": { "php": ">=8.1", - "neos/contentrepository": "*", + "neos/contentrepository-core": "*", "league/flysystem": "^3", "webmozart/assert": "^1.11" }, diff --git a/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php b/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php index ea0910a1b39..0ff81183d20 100644 --- a/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php +++ b/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php @@ -8,8 +8,8 @@ use Neos\ContentRepository\Export\ProcessorInterface; use Neos\ContentRepository\Export\ProcessorResult; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ESCR\AssetUsage\AssetUsageFinder; use Neos\ESCR\AssetUsage\Dto\AssetUsageFilter; use Neos\Flow\ResourceManagement\PersistentResource; diff --git a/Neos.ContentRepository.Export/src/Processors/EventExportProcessor.php b/Neos.ContentRepository.Export/src/Processors/EventExportProcessor.php index 57c66719ec6..809c0d4eb89 100644 --- a/Neos.ContentRepository.Export/src/Processors/EventExportProcessor.php +++ b/Neos.ContentRepository.Export/src/Processors/EventExportProcessor.php @@ -8,8 +8,8 @@ use Neos\ContentRepository\Export\ProcessorInterface; use Neos\ContentRepository\Export\ProcessorResult; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Model\Event\StreamName; diff --git a/Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php b/Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php index bf0272a7d18..05180e9821d 100644 --- a/Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php +++ b/Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php @@ -3,21 +3,21 @@ namespace Neos\ContentRepository\Export\Processors; use League\Flysystem\Filesystem; -use Neos\ContentRepository\EventStore\DecoratedEvent; -use Neos\ContentRepository\EventStore\EventInterface; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\EventStore\EventPersister; +use Neos\ContentRepository\Core\EventStore\DecoratedEvent; +use Neos\ContentRepository\Core\EventStore\EventInterface; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; use Neos\ContentRepository\Export\Event\ValueObject\ExportedEvent; use Neos\ContentRepository\Export\ProcessorInterface; use Neos\ContentRepository\Export\ProcessorResult; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Event\ContentStreamWasCreated; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\EventStore\EventStoreInterface; use Neos\EventStore\Exception\ConcurrencyException; use Neos\EventStore\Model\Event; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Command/ContentRepositoryMigrateCommandController.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Command/ContentRepositoryMigrateCommandController.php index 5305831b4fb..7c68e162147 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Command/ContentRepositoryMigrateCommandController.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Command/ContentRepositoryMigrateCommandController.php @@ -18,11 +18,11 @@ use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Exception as DbalException; use Doctrine\DBAL\Exception\ConnectionException; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\ContentRepository\LegacyNodeMigration\LegacyMigrationService; use Neos\ContentRepository\LegacyNodeMigration\LegacyMigrationServiceFactory; -use Neos\ContentRepository\Service\ContentRepositoryBootstrapper; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Service\ContentRepositoryBootstrapper; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\ContentRepositoryRegistry\Factory\EventStore\DoctrineEventStoreFactory; use Neos\ContentRepositoryRegistry\Factory\EventStore\EventStoreFactoryInterface; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/AssetExtractor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/AssetExtractor.php index 74475f1ffcd..8fa8cc6fc64 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/AssetExtractor.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/AssetExtractor.php @@ -5,7 +5,7 @@ use Doctrine\DBAL\Platforms\PostgreSQL100Platform; use Neos\ContentRepository\LegacyNodeMigration\Exception\MigrationException; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Flow\Persistence\Doctrine\DataTypes\JsonArrayType; use Neos\Media\Domain\Model\Asset; use Neos\Utility\ObjectAccess; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/SerializedPropertyValuesAndReferences.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/SerializedPropertyValuesAndReferences.php index db02e5e9735..e06f22e1230 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/SerializedPropertyValuesAndReferences.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/SerializedPropertyValuesAndReferences.php @@ -2,8 +2,8 @@ declare(strict_types=1); namespace Neos\ContentRepository\LegacyNodeMigration\Helpers; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregate.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregate.php index de112d52374..5b477372e48 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregate.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregate.php @@ -3,10 +3,10 @@ namespace Neos\ContentRepository\LegacyNodeMigration\Helpers; use Neos\ContentRepository\LegacyNodeMigration\Exception\MigrationException; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregates.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregates.php index ef60544f96d..e364cca5ca9 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregates.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeAggregates.php @@ -2,14 +2,14 @@ declare(strict_types=1); namespace Neos\ContentRepository\LegacyNodeMigration\Helpers; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; use Neos\ContentRepository\LegacyNodeMigration\Exception\MigrationException; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeVariant.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeVariant.php index f8637016874..79c1b40aa95 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeVariant.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/VisitedNodeVariant.php @@ -2,8 +2,8 @@ declare(strict_types=1); namespace Neos\ContentRepository\LegacyNodeMigration\Helpers; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationService.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationService.php index 3fb73a9697f..2ca69c7364b 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationService.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationService.php @@ -17,8 +17,8 @@ use Doctrine\DBAL\Connection; use League\Flysystem\Filesystem; use League\Flysystem\Local\LocalFilesystemAdapter; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; use Neos\ContentRepository\Export\Asset\Adapters\DbalAssetLoader; use Neos\ContentRepository\Export\Asset\Adapters\FileSystemResourceLoader; use Neos\ContentRepository\Export\Asset\AssetExporter; @@ -26,11 +26,11 @@ use Neos\ContentRepository\Export\Processors\AssetRepositoryImportProcessor; use Neos\ContentRepository\Export\Processors\EventStoreImportProcessor; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; use Neos\ContentRepository\LegacyNodeMigration\Helpers\NodeDataLoader; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\EventStore\EventStoreInterface; use Neos\Flow\Persistence\PersistenceManagerInterface; use Neos\Flow\Property\PropertyMapper; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationServiceFactory.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationServiceFactory.php index ddbe908a40d..9dbe725d10b 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationServiceFactory.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/LegacyMigrationServiceFactory.php @@ -15,9 +15,9 @@ use Doctrine\DBAL\Connection; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\Flow\Persistence\PersistenceManagerInterface; use Neos\Flow\Property\PropertyMapper; use Neos\Flow\ResourceManagement\ResourceManager; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToAssetsProcessor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToAssetsProcessor.php index 92625906eea..640ce751b4d 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToAssetsProcessor.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToAssetsProcessor.php @@ -8,9 +8,9 @@ use Neos\ContentRepository\Export\ProcessorInterface; use Neos\ContentRepository\Export\ProcessorResult; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Media\Domain\Model\ResourceBasedInterface; use Neos\Utility\Exception\InvalidTypeException; use Neos\Utility\TypeHandling; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php index e888ad4aab0..b81cc995220 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php @@ -7,47 +7,47 @@ use Doctrine\DBAL\Platforms\PostgreSQL100Platform; use League\Flysystem\Filesystem; use League\Flysystem\FilesystemException; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\DimensionSpace\VariantType; -use Neos\ContentRepository\EventStore\EventInterface; -use Neos\ContentRepository\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\DimensionSpace\VariantType; +use Neos\ContentRepository\Core\EventStore\EventInterface; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; use Neos\ContentRepository\Export\Event\ValueObject\ExportedEvent; use Neos\ContentRepository\Export\ProcessorInterface; use Neos\ContentRepository\Export\ProcessorResult; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\Feature\Common\SerializedNodeReferences; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMappings; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignment; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignments; -use Neos\ContentRepository\Feature\NodeReferencing\Event\NodeReferencesWereSet; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\Feature\Common\SerializedNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMappings; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignment; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignments; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Event\NodeReferencesWereSet; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; use Neos\ContentRepository\LegacyNodeMigration\Exception\MigrationException; use Neos\ContentRepository\LegacyNodeMigration\Helpers\SerializedPropertyValuesAndReferences; use Neos\ContentRepository\LegacyNodeMigration\Helpers\VisitedNodeAggregate; use Neos\ContentRepository\LegacyNodeMigration\Helpers\VisitedNodeAggregates; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Node\PropertyName; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\Flow\Persistence\Doctrine\DataTypes\JsonArrayType; use Neos\Flow\Property\PropertyMapper; use Ramsey\Uuid\Uuid; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php index 6328b193a1b..4344f62a267 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php @@ -11,9 +11,9 @@ use League\Flysystem\Filesystem; use League\Flysystem\InMemory\InMemoryFilesystemAdapter; use Neos\Behat\Tests\Behat\FlowContextTrait; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; use Neos\ContentRepository\Export\Asset\AssetExporter; use Neos\ContentRepository\Export\Asset\AssetLoaderInterface; use Neos\ContentRepository\Export\Asset\ResourceLoaderInterface; @@ -23,13 +23,13 @@ use Neos\ContentRepository\Export\Event\ValueObject\ExportedEvents; use Neos\ContentRepository\Export\ProcessorResult; use Neos\ContentRepository\Export\Severity; -use Neos\ContentRepository\Infrastructure\Property\PropertyConverter; +use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter; use Neos\ContentRepository\LegacyNodeMigration\Helpers\EventExporter; use Neos\ContentRepository\LegacyNodeMigration\NodeDataToAssetsProcessor; use Neos\ContentRepository\LegacyNodeMigration\NodeDataToEventsProcessor; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\NodeOperationsTrait; use Neos\EventSourcing\EventStore\EventNormalizer; use Neos\Flow\Property\PropertyMapper; diff --git a/Neos.ContentRepository.LegacyNodeMigration/composer.json b/Neos.ContentRepository.LegacyNodeMigration/composer.json index abcc369e715..486ce15fd27 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/composer.json +++ b/Neos.ContentRepository.LegacyNodeMigration/composer.json @@ -7,7 +7,7 @@ ], "require": { "php": ">=8.1", - "neos/contentrepository": "*", + "neos/contentrepository-core": "*", "neos/contentrepository-export": "*", "league/flysystem": "^3" }, diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php index 819e0fe5750..54a9c979227 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ChildrenOperation.php @@ -11,15 +11,15 @@ * source code. */ -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeNames; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeNames; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FizzleParser; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php index 0443052be19..ad1a28722f9 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ClosestOperation.php @@ -14,7 +14,7 @@ use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\FlowQueryException; use Neos\Eel\FlowQuery\Operations\AbstractOperation; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * "closest" operation working on ContentRepository nodes. For each node in the context, diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php index ba0c7c0930a..5e71b0bcade 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FilterOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Utility\ObjectAccess; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php index 0860837bbd9..cf7ebd916d4 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/FindOperation.php @@ -11,21 +11,21 @@ * source code. */ -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeNames; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeNames; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FizzleParser; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\FlowQueryException; use Neos\Eel\FlowQuery\Operations\AbstractOperation; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php index 379a0cfaacd..aa8f39b6090 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/HasOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FizzleException; use Neos\Eel\FlowQuery\FlowQuery; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php index 878501092ab..a12aac4e4fd 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextAllOperation.php @@ -15,8 +15,8 @@ use Neos\Flow\Annotations as Flow; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; /** * "nextAll" operation working on ContentRepository nodes. It iterates over all diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php index 6ca4ff7202c..a97fb414287 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php index 69d7dea82a8..ab3849a5c27 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/NextUntilOperation.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php index 775acd14076..5859e94fa4e 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php index 87bc61df058..446b749fa98 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsOperation.php @@ -13,10 +13,10 @@ use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * "parents" operation working on ContentRepository nodes. It iterates over all diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php index 920b13fe6b4..905b434a9b2 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/ParentsUntilOperation.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php index 068f1326893..26e0c488ba7 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevAllOperation.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php index 693d7aa4984..87c83a6b800 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php index 22a384c1df9..a5290b2f9e8 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PrevUntilOperation.php @@ -12,8 +12,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php index 93e2841eec9..aadc893b5e8 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/PropertyOperation.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\PropertyName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\PropertyName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\FlowQueryException; diff --git a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php index 7971e55ed52..fef94d7130b 100644 --- a/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php +++ b/Neos.ContentRepository.NodeAccess/Classes/FlowQueryOperations/SiblingsOperation.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml b/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml index ea5da5851df..34c0b75a38a 100644 --- a/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml +++ b/Neos.ContentRepository.NodeAccess/Configuration/Settings.yaml @@ -40,8 +40,8 @@ Neos: unstableInternalWillChangeLater: projection: defaultProjectorsToBeBlocked: - 'Neos\ContentRepository\Projection\ContentStream\ContentStreamProjector': true - 'Neos\ContentRepository\Projection\Workspace\WorkspaceProjector': true + 'Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamProjector': true + 'Neos\ContentRepository\Core\Projection\Workspace\WorkspaceProjector': true NodeAccess: diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/AbstractQueryOperationsTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/AbstractQueryOperationsTest.php index ee8931ec06f..bbb3802ffb2 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/AbstractQueryOperationsTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/AbstractQueryOperationsTest.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\Flow\Tests\UnitTestCase; use PHPUnit\Framework\MockObject\MockObject; diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextAllOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextAllOperationTest.php index c236f3a8e12..aacf4101b91 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextAllOperationTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextAllOperationTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; use Neos\ContentRepository\Domain\Model\Node; use Neos\ContentRepository\Domain\Projection\Content\TraversableNodes; use Neos\ContentRepository\Domain\Service\Context; diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextOperationTest.php index be5bb85a628..c41cad42e36 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextOperationTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/NextOperationTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; use Neos\ContentRepository\Domain\Model\Node; use Neos\ContentRepository\Domain\Projection\Content\TraversableNodes; use Neos\ContentRepository\Domain\Service\Context; diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/ParentOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/ParentOperationTest.php index 15b65de8568..551ed3a5762 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/ParentOperationTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/ParentOperationTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; use Neos\ContentRepository\Domain\Projection\Content\TraversableNode; use Neos\ContentRepository\Domain\Service\Context; use Neos\ContentRepository\Eel\FlowQueryOperations\ParentOperation; diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevAllOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevAllOperationTest.php index cd0d9ba5360..7d0c9b3c2b6 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevAllOperationTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevAllOperationTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; use Neos\ContentRepository\Domain\Model\Node; use Neos\ContentRepository\Domain\Projection\Content\TraversableNodes; use Neos\ContentRepository\Domain\Service\Context; diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevOperationTest.php index 7bc9325e059..7581b74764d 100644 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevOperationTest.php +++ b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/PrevOperationTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; use Neos\ContentRepository\Domain\Model\Node; use Neos\ContentRepository\Domain\Projection\Content\TraversableNodes; use Neos\ContentRepository\Domain\Service\Context; diff --git a/Neos.ContentRepository.NodeAccess/composer.json b/Neos.ContentRepository.NodeAccess/composer.json index 260e44261f5..b79c3c3f756 100644 --- a/Neos.ContentRepository.NodeAccess/composer.json +++ b/Neos.ContentRepository.NodeAccess/composer.json @@ -6,7 +6,7 @@ "GPL-3.0-or-later" ], "require": { - "neos/contentrepository": "~9.0" + "neos/contentrepository-core": "~9.0" }, "autoload": { "psr-4": { diff --git a/Neos.ContentRepository.NodeMigration/composer.json b/Neos.ContentRepository.NodeMigration/composer.json index f7ad0c3e30a..bed729be508 100644 --- a/Neos.ContentRepository.NodeMigration/composer.json +++ b/Neos.ContentRepository.NodeMigration/composer.json @@ -5,7 +5,7 @@ "GPL-3.0-or-later" ], "require": { - "neos/contentrepository": "*" + "neos/contentrepository-core": "*" }, "require-dev": { }, diff --git a/Neos.ContentRepository.NodeMigration/src/Command/ExecuteMigration.php b/Neos.ContentRepository.NodeMigration/src/Command/ExecuteMigration.php index 661ed165ec3..699ff955ffb 100644 --- a/Neos.ContentRepository.NodeMigration/src/Command/ExecuteMigration.php +++ b/Neos.ContentRepository.NodeMigration/src/Command/ExecuteMigration.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\NodeMigration\Command; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Execute a Content Repository migration (which is defined in a YAML file) diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/DimensionSpacePointsFilterFactory.php b/Neos.ContentRepository.NodeMigration/src/Filter/DimensionSpacePointsFilterFactory.php index 636111c2bd8..567219a7527 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/DimensionSpacePointsFilterFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/DimensionSpacePointsFilterFactory.php @@ -14,11 +14,11 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\DimensionSpace\VariantType; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\DimensionSpace\VariantType; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * Filter nodes by origin dimension space point. Normally, check for exact matches; but if includeSpecializations=TRUE, diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/FilterFactoryInterface.php b/Neos.ContentRepository.NodeMigration/src/Filter/FilterFactoryInterface.php index fae496dfb07..b7798276447 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/FilterFactoryInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/FilterFactoryInterface.php @@ -4,7 +4,7 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; interface FilterFactoryInterface { diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/Filters.php b/Neos.ContentRepository.NodeMigration/src/Filter/Filters.php index 686782f9b79..b55d1a38808 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/Filters.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/Filters.php @@ -4,8 +4,8 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; use Neos\Flow\Annotations as Flow; #[Flow\Proxy(false)] diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/NodeAggregateBasedFilterInterface.php b/Neos.ContentRepository.NodeMigration/src/Filter/NodeAggregateBasedFilterInterface.php index a3112ffd22f..4082deb37fa 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/NodeAggregateBasedFilterInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/NodeAggregateBasedFilterInterface.php @@ -14,7 +14,7 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; /** * Filter instances are used to filter nodes to be worked on during a migration. diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/NodeBasedFilterInterface.php b/Neos.ContentRepository.NodeMigration/src/Filter/NodeBasedFilterInterface.php index 50afb479e42..8b862b5b81c 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/NodeBasedFilterInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/NodeBasedFilterInterface.php @@ -14,7 +14,7 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * Filter instances are used to filter nodes to be worked on during a migration. diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/NodeNameFilterFactory.php b/Neos.ContentRepository.NodeMigration/src/Filter/NodeNameFilterFactory.php index c42ce9b8a70..575b4599760 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/NodeNameFilterFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/NodeNameFilterFactory.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; /** * Filter nodes by node name. diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/NodeTypeFilterFactory.php b/Neos.ContentRepository.NodeMigration/src/Filter/NodeTypeFilterFactory.php index c6b3d97c046..4c13d681d87 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/NodeTypeFilterFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/NodeTypeFilterFactory.php @@ -14,9 +14,9 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; /** * Filter nodes by node type. diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/PropertyNotEmptyFilterFactory.php b/Neos.ContentRepository.NodeMigration/src/Filter/PropertyNotEmptyFilterFactory.php index 845836c303e..b9e2429e40d 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/PropertyNotEmptyFilterFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/PropertyNotEmptyFilterFactory.php @@ -14,7 +14,7 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * Filter nodes having the given property and its value not empty. diff --git a/Neos.ContentRepository.NodeMigration/src/Filter/PropertyValueFilterFactory.php b/Neos.ContentRepository.NodeMigration/src/Filter/PropertyValueFilterFactory.php index 9ae96555743..1067daac75b 100644 --- a/Neos.ContentRepository.NodeMigration/src/Filter/PropertyValueFilterFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Filter/PropertyValueFilterFactory.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\NodeMigration\Filter; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; /** * Filter nodes having the given property and its value not empty. diff --git a/Neos.ContentRepository.NodeMigration/src/NodeMigrationService.php b/Neos.ContentRepository.NodeMigration/src/NodeMigrationService.php index a7c3c286c44..934bb03a9d7 100644 --- a/Neos.ContentRepository.NodeMigration/src/NodeMigrationService.php +++ b/Neos.ContentRepository.NodeMigration/src/NodeMigrationService.php @@ -4,20 +4,20 @@ namespace Neos\ContentRepository\NodeMigration; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepository\NodeMigration\Filter\InvalidMigrationFilterSpecified; use Neos\ContentRepository\NodeMigration\Command\ExecuteMigration; use Neos\ContentRepository\NodeMigration\Filter\FiltersFactory; use Neos\ContentRepository\NodeMigration\Transformation\TransformationsFactory; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\Common\Exception\WorkspaceDoesNotExist; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceDoesNotExist; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; /** * Node Migrations are manually written adjustments to the Node tree; diff --git a/Neos.ContentRepository.NodeMigration/src/NodeMigrationServiceFactory.php b/Neos.ContentRepository.NodeMigration/src/NodeMigrationServiceFactory.php index eb682d1d732..d78d5a54316 100644 --- a/Neos.ContentRepository.NodeMigration/src/NodeMigrationServiceFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/NodeMigrationServiceFactory.php @@ -4,8 +4,8 @@ namespace Neos\ContentRepository\NodeMigration; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; use Neos\ContentRepository\NodeMigration\Filter\DimensionSpacePointsFilterFactory; use Neos\ContentRepository\NodeMigration\Filter\FiltersFactory; use Neos\ContentRepository\NodeMigration\Filter\NodeNameFilterFactory; diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php index 3dc0dbd7c11..35fcdb656dd 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php @@ -14,11 +14,11 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Command\AddDimensionShineThrough; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Command\AddDimensionShineThrough; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * Add a Dimension Space Point Shine-Through; diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php index fa1e0c9130b..31e3921fd39 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php @@ -14,15 +14,15 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValue; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValue; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; class AddNewPropertyTransformationFactory implements TransformationFactoryInterface { diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php index 2db3dc6dd53..9e39f1143c2 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php @@ -14,14 +14,14 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** @codingStandardsIgnoreStart */ /** @codingStandardsIgnoreEnd */ diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php index d9ae0d6dfa6..79848222d89 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php @@ -14,16 +14,16 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValue; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValue; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Change the value of a given property. diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php index b99b86596c1..3cc6b6753f5 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php @@ -14,8 +14,8 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * A globally-done transformation, like changing dimension space points globally. diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php index 01917e4c21f..96e5e590f27 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php @@ -14,11 +14,11 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Command\MoveDimensionSpacePoint; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Command\MoveDimensionSpacePoint; /** * move a dimension space point globally diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php index 05d7ac1797c..10ecf15056a 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php @@ -14,9 +14,9 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; /** * A node-aggregate-based transformation, like changing the node aggregate type diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php index 6cbb7e7b327..b1cb688fc05 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php @@ -14,10 +14,10 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * A node-specific transformation, like setting node properties. diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php index 2d54d0e3be9..148caa38602 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php @@ -14,15 +14,15 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Feature\Common\NodeVariantSelectionStrategy; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Feature\Common\NodeVariantSelectionStrategy; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Remove Node diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php index 60558e1618f..9111320e052 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php @@ -14,14 +14,14 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Remove the property from nodes diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php index cbd6fdb301a..f156f5fc487 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php @@ -14,13 +14,13 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; class RenameNodeAggregateTransformationFactory implements TransformationFactoryInterface { diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php index 86c63628d0f..007352fe1dd 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php @@ -14,16 +14,16 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Remove the property diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php index f4b2c90cd4a..e8f28e2163f 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php @@ -14,16 +14,16 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\CommandHandler\CommandResult; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValue; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\CommandHandler\CommandResult; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValue; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; /** * Strip all tags on a given property diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationFactoryInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationFactoryInterface.php index e98c700b41b..df0c2193ed7 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationFactoryInterface.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationFactoryInterface.php @@ -4,7 +4,7 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; interface TransformationFactoryInterface { diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/Transformations.php b/Neos.ContentRepository.NodeMigration/src/Transformation/Transformations.php index d5af2366053..6a7906c6cc0 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/Transformations.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/Transformations.php @@ -4,10 +4,10 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; final class Transformations { diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php index 87dcde0a0e2..3f0c1271ed8 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php @@ -4,7 +4,7 @@ namespace Neos\ContentRepository\NodeMigration\Transformation; -use Neos\ContentRepository\ContentRepository; +use Neos\ContentRepository\Core\ContentRepository; use Neos\ContentRepository\NodeMigration\MigrationException; use Neos\ContentRepository\NodeMigration\NodeMigrationService; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/AbstractNodePropertyPrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/AbstractNodePropertyPrivilege.php index 79d2e6c698d..438f61e7152 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/AbstractNodePropertyPrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/AbstractNodePropertyPrivilege.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilegeSubject; use Neos\Flow\Security\Authorization\Privilege\PrivilegeSubjectInterface; use Neos\Flow\Security\Exception\InvalidPrivilegeTypeException; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilege.php index 109670bc420..cbbfd195d58 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilege.php @@ -11,11 +11,11 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** @codingStandardsIgnoreStart */ -use Neos\ContentRepository\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; +use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties; /** @codingStandardsIgnoreEnd */ -use Neos\ContentRepository\Feature\NodeVariation\Command\CreateNodeVariant; +use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant; use Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilegeSubject; use Neos\Flow\Security\Authorization\Privilege\PrivilegeSubjectInterface; use Neos\Flow\Security\Exception\InvalidPrivilegeTypeException; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilegeSubject.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilegeSubject.php index d974333d17d..a9ba8494b02 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilegeSubject.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/CreateNodePrivilegeSubject.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Aop\JoinPointInterface; /** diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePrivilege.php index df9fd68adc0..70fb9529486 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePrivilege.php @@ -11,15 +11,15 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; -use Neos\ContentRepository\Feature\NodeDisabling\Command\DisableNodeAggregate; -use Neos\ContentRepository\Feature\NodeDisabling\Command\EnableNodeAggregate; -use Neos\ContentRepository\Feature\NodeMove\Command\MoveNodeAggregate; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetNodeReferences; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; use Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilegeSubject; use Neos\Flow\Security\Authorization\Privilege\PrivilegeSubjectInterface; use Neos\Flow\Security\Exception\InvalidPrivilegeTypeException; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePropertyPrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePropertyPrivilege.php index 9222365f0a8..d9fd60f05b9 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePropertyPrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/EditNodePropertyPrivilege.php @@ -11,12 +11,12 @@ * source code. */ -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; -use Neos\ContentRepository\Feature\NodeDisabling\Command\DisableNodeAggregate; -use Neos\ContentRepository\Feature\NodeDisabling\Command\EnableNodeAggregate; -use Neos\ContentRepository\Feature\NodeReferencing\Command\SetNodeReferences; -use Neos\ContentRepository\Feature\NodeModification\Command\SetSerializedNodeProperties; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences; +use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties; /** * A privilege to restrict editing of node properties. diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php index 182b455fa3e..cee78db1c72 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php @@ -11,10 +11,10 @@ * source code. */ -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Context as SecurityContext; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeSubject.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeSubject.php index 9db8da73abb..51035f43f0a 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeSubject.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeSubject.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Aop\JoinPointInterface; use Neos\Flow\Security\Authorization\Privilege\PrivilegeSubjectInterface; diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/PropertyAwareNodePrivilegeSubject.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/PropertyAwareNodePrivilegeSubject.php index 4d9733c5ad5..a39801606ed 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/PropertyAwareNodePrivilegeSubject.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/PropertyAwareNodePrivilegeSubject.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Aop\JoinPointInterface; /** diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/ReadNodePropertyPrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/ReadNodePropertyPrivilege.php index 69b590c95f4..3e848cf8835 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/ReadNodePropertyPrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/ReadNodePropertyPrivilege.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * A privilege to restrict reading of node properties. diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/RemoveNodePrivilege.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/RemoveNodePrivilege.php index d1730229dfa..1c4c0826cbe 100644 --- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/RemoveNodePrivilege.php +++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/RemoveNodePrivilege.php @@ -11,8 +11,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; use Neos\Flow\Security\Authorization\Privilege\Method\MethodPrivilegeSubject; use Neos\Flow\Security\Authorization\Privilege\PrivilegeSubjectInterface; use Neos\Flow\Security\Exception\InvalidPrivilegeTypeException; diff --git a/Neos.ContentRepository.Security/Classes/Service/AuthorizationService.php b/Neos.ContentRepository.Security/Classes/Service/AuthorizationService.php index 07f49b40180..1f59a549f4e 100644 --- a/Neos.ContentRepository.Security/Classes/Service/AuthorizationService.php +++ b/Neos.ContentRepository.Security/Classes/Service/AuthorizationService.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepository\Security\Authorization\Privilege\Node\CreateNodePrivilege; use Neos\ContentRepository\Security\Authorization\Privilege\Node\CreateNodePrivilegeSubject; use Neos\ContentRepository\Security\Authorization\Privilege\Node\EditNodePrivilege; @@ -24,7 +24,7 @@ use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; use Neos\Flow\Security\Context; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * This service provides API methods to check for privileges diff --git a/Neos.ContentRepository.StructureAdjustment/composer.json b/Neos.ContentRepository.StructureAdjustment/composer.json index 3516a7a56cf..62010d7be8e 100644 --- a/Neos.ContentRepository.StructureAdjustment/composer.json +++ b/Neos.ContentRepository.StructureAdjustment/composer.json @@ -5,7 +5,7 @@ "GPL-3.0-or-later" ], "require": { - "neos/contentrepository": "*" + "neos/contentrepository-core": "*" }, "require-dev": { }, diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DimensionAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DimensionAdjustment.php index bc854851c26..aa4afcb8c85 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DimensionAdjustment.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DimensionAdjustment.php @@ -4,9 +4,9 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\DimensionSpace\VariantType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\DimensionSpace\VariantType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; class DimensionAdjustment { diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php index eec367d81a3..7cd8b924757 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php @@ -4,20 +4,20 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePointSet; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePointSet; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\EventStore\Model\EventStream\ExpectedVersion; class DisallowedChildNodeAdjustment diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/LoadNodeTypeTrait.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/LoadNodeTypeTrait.php index a777cf7c76e..28ccd2109fb 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/LoadNodeTypeTrait.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/LoadNodeTypeTrait.php @@ -4,10 +4,10 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; trait LoadNodeTypeTrait { diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/ProjectedNodeIterator.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/ProjectedNodeIterator.php index 6baf66f4cc2..a72fb147cdc 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/ProjectedNodeIterator.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/ProjectedNodeIterator.php @@ -4,12 +4,12 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; /** * Low-Level helper service, iterating over the "real" Nodes in the Live workspace; that is, the nodes, diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php index a2dad2568e6..7e47be3a84c 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php @@ -4,18 +4,18 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValue; -use Neos\ContentRepository\Feature\Common\SerializedPropertyValues; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValue; +use Neos\ContentRepository\Core\Feature\Common\SerializedPropertyValues; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; class PropertyAdjustment { diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/RemoveNodeAggregateTrait.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/RemoveNodeAggregateTrait.php index 88e210785d6..b2ac855aa6d 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/RemoveNodeAggregateTrait.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/RemoveNodeAggregateTrait.php @@ -4,12 +4,12 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; trait RemoveNodeAggregateTrait diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/StructureAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/StructureAdjustment.php index cafd9875bfe..3b55b7de107 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/StructureAdjustment.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/StructureAdjustment.php @@ -4,8 +4,8 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; use Neos\Error\Messages\Message; final class StructureAdjustment extends Message diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php index 0c45b8e3b88..1622f714805 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php @@ -4,28 +4,28 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\Events; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\Common\TetheredNodeInternals; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignment; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeVariantAssignments; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMappings; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\Events; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\Common\TetheredNodeInternals; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignment; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeVariantAssignments; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMappings; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\EventStore\Model\EventStream\ExpectedVersion; -use Neos\ContentRepository\DimensionSpace; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Feature\ContentStreamEventStreamName; -use Neos\ContentRepository\Feature\Common\NodeVariationInternals; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\DimensionSpace; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName; +use Neos\ContentRepository\Core\Feature\Common\NodeVariationInternals; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; class TetheredNodeAdjustments { diff --git a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/UnknownNodeTypeAdjustment.php b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/UnknownNodeTypeAdjustment.php index 1ebd8b682ba..2e8a4c13f93 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/Adjustment/UnknownNodeTypeAdjustment.php +++ b/Neos.ContentRepository.StructureAdjustment/src/Adjustment/UnknownNodeTypeAdjustment.php @@ -4,8 +4,8 @@ namespace Neos\ContentRepository\StructureAdjustment\Adjustment; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; class UnknownNodeTypeAdjustment { diff --git a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php index 4fd73ea7f76..984ed68d6b2 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php +++ b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php @@ -4,13 +4,13 @@ namespace Neos\ContentRepository\StructureAdjustment; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\EventStore\EventPersister; -use Neos\ContentRepository\EventStore\EventsToPublish; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\EventStore\EventPersister; +use Neos\ContentRepository\Core\EventStore\EventsToPublish; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\ContentRepository\StructureAdjustment\Adjustment\DimensionAdjustment; use Neos\ContentRepository\StructureAdjustment\Adjustment\DisallowedChildNodeAdjustment; use Neos\ContentRepository\StructureAdjustment\Adjustment\ProjectedNodeIterator; diff --git a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentServiceFactory.php b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentServiceFactory.php index 2e7013285a7..e18b224ee62 100644 --- a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentServiceFactory.php +++ b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentServiceFactory.php @@ -4,9 +4,9 @@ namespace Neos\ContentRepository\StructureAdjustment; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/ContentGraphIntegrityCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/ContentGraphIntegrityCommandController.php index d997d220ed8..0e096878182 100644 --- a/Neos.ContentRepositoryRegistry/Classes/Command/ContentGraphIntegrityCommandController.php +++ b/Neos.ContentRepositoryRegistry/Classes/Command/ContentGraphIntegrityCommandController.php @@ -12,7 +12,7 @@ */ use Neos\Error\Messages\Result; -use Neos\ContentRepository\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; +use Neos\ContentRepository\Core\Projection\ContentGraph\ProjectionIntegrityViolationDetectionRunner; use Neos\Flow\Cli\CommandController; final class ContentGraphIntegrityCommandController extends CommandController diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php index 34429985200..711e283c15f 100644 --- a/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php +++ b/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php @@ -1,9 +1,9 @@ =8.1", - "neos/contentrepository": "*", + "neos/contentrepository-core": "*", "neos/media": "*" }, "require-dev": { diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/AddContextToNodeBasedReadModelInterfaceAspect.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/AddContextToNodeBasedReadModelInterfaceAspect.php index eb020a84f7a..4202f36deef 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/AddContextToNodeBasedReadModelInterfaceAspect.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/AddContextToNodeBasedReadModelInterfaceAspect.php @@ -4,7 +4,7 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\ContextInNodeBasedReadModel; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Aop\JoinPointInterface; diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyBaseWorkspace.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyBaseWorkspace.php index 845eba7c94d..54ea0407545 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyBaseWorkspace.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyBaseWorkspace.php @@ -5,7 +5,7 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\ContextInNodeBasedReadModel; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; use Neos\EventSourcedContentRepository\LegacyApi\Logging\LegacyLoggerInterface; use Neos\Flow\Log\Utility\LogEnvironment; diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyContext.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyContext.php index e7d5d10967e..ae719105d1b 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyContext.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyContext.php @@ -4,9 +4,9 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\ContextInNodeBasedReadModel; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\EventSourcedContentRepository\LegacyApi\Logging\LegacyLoggerInterface; diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacySite.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacySite.php index 7c5a2d20a60..5bcc9228c29 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacySite.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacySite.php @@ -4,7 +4,7 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\ContextInNodeBasedReadModel; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Neos\Domain\Service\SiteNodeUtility; use Neos\Flow\Annotations as Flow; use Neos\EventSourcedContentRepository\LegacyApi\Logging\LegacyLoggerInterface; diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyWorkspace.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyWorkspace.php index 135c4f4dc20..09ab0af31c0 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyWorkspace.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/ContextInNodeBasedReadModel/EmulatedLegacyWorkspace.php @@ -5,10 +5,10 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\ContextInNodeBasedReadModel; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; use Neos\EventSourcedContentRepository\LegacyApi\Logging\LegacyLoggerInterface; use Neos\Flow\Log\Utility\LogEnvironment; diff --git a/Neos.EventSourcedContentRepository.LegacyApi/Classes/FlowQueryContextOperation/ContextOperation.php b/Neos.EventSourcedContentRepository.LegacyApi/Classes/FlowQueryContextOperation/ContextOperation.php index c79895073d1..8079a38e395 100644 --- a/Neos.EventSourcedContentRepository.LegacyApi/Classes/FlowQueryContextOperation/ContextOperation.php +++ b/Neos.EventSourcedContentRepository.LegacyApi/Classes/FlowQueryContextOperation/ContextOperation.php @@ -4,9 +4,9 @@ namespace Neos\EventSourcedContentRepository\LegacyApi\FlowQueryContextOperation; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\FlowQueryException; diff --git a/Neos.EventSourcedNeosAdjustments/Patches/flowpack_elasticsearch_contentrepositoryadaptor.patch b/Neos.EventSourcedNeosAdjustments/Patches/flowpack_elasticsearch_contentrepositoryadaptor.patch index 2bde2d828dc..06f02c98844 100644 --- a/Neos.EventSourcedNeosAdjustments/Patches/flowpack_elasticsearch_contentrepositoryadaptor.patch +++ b/Neos.EventSourcedNeosAdjustments/Patches/flowpack_elasticsearch_contentrepositoryadaptor.patch @@ -7,8 +7,8 @@ index b91293e..b121d57 100644 use Flowpack\ElasticSearch\Domain\Model\Mapping; use Flowpack\ElasticSearch\Transfer\Exception\ApiException; -use Neos\ContentRepository\Domain\Model\Workspace; -+use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -+use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; ++use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; ++use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\Domain\Repository\NodeDataRepository; -use Neos\ContentRepository\Domain\Repository\WorkspaceRepository; -use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator; @@ -227,7 +227,7 @@ index a8ce910..11cfffe 100644 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexNameStrategyInterface; use Flowpack\ElasticSearch\Domain\Model\Client; use Flowpack\ElasticSearch\Domain\Model\Index; -+use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; ++use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\Domain\Model\NodeInterface; use Neos\Flow\Annotations as Flow; @@ -252,7 +252,7 @@ index 2d2283f..78e06cf 100644 use Flowpack\ElasticSearch\Domain\Model\Index; use Flowpack\ElasticSearch\Transfer\Exception\ApiException; -use Neos\ContentRepository\Domain\Model\NodeInterface; -+use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; ++use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\Domain\Service\Context; use Neos\ContentRepository\Domain\Service\ContextFactoryInterface; use Neos\ContentRepository\Search\Indexer\AbstractNodeIndexer; @@ -315,14 +315,14 @@ index 56a8278..91678b1 100644 -use Neos\ContentRepository\Domain\Factory\NodeFactory; -use Neos\ContentRepository\Domain\Model\NodeInterface; -+use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; ++use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Domain\NodeType\NodeTypeName; use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator; -use Neos\ContentRepository\Domain\Service\ContextFactoryInterface; use Neos\ContentRepository\Search\Indexer\NodeIndexingManager; +use Neos\EventSourcedContentRepository\ContentAccess\NodeAccessorManager; +use Neos\EventSourcedContentRepository\Domain\Context\Parameters\VisibilityConstraints; -+use Neos\ContentRepository\Projection\Content\ContentGraphInterface; ++use Neos\ContentRepository\Core\Projection\Content\ContentGraphInterface; +use Neos\EventSourcedContentRepository\Domain\Projection\Content\NodeInterface; +use Neos\EventSourcedContentRepository\Domain\Projection\Workspace\WorkspaceFinder; +use Neos\EventSourcedContentRepository\Domain\ValueObject\WorkspaceName; @@ -422,7 +422,7 @@ index 71be3a6..95802ab 100644 */ -use Neos\ContentRepository\Domain\Model\NodeInterface; -+use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; ++use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator; use Neos\ContentRepository\Utility; +use Neos\EventSourcedContentRepository\Domain\Projection\Content\NodeInterface; diff --git a/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_fusionAndSiteService.patch b/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_fusionAndSiteService.patch index 4936849f913..001f89a501f 100644 --- a/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_fusionAndSiteService.patch +++ b/Neos.EventSourcedNeosAdjustments/Patches/neos_neos-development-collection_fusionAndSiteService.patch @@ -7,7 +7,7 @@ index f0dc4bd8b..1e831ca3d 100644 */ -use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface; -+use Neos\ContentRepository\Projection\Content\NodeInterface; ++use Neos\ContentRepository\Core\Projection\Content\NodeInterface; use Neos\ContentRepository\Domain\Service\NodeTypeManager; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\Controller\ControllerContext; @@ -127,7 +127,7 @@ index 7af8ad843..190244177 100644 */ use GuzzleHttp\Psr7\Message; -+use Neos\ContentRepository\Projection\Content\NodeInterface; ++use Neos\ContentRepository\Core\Projection\Content\NodeInterface; use Neos\ContentRepository\Domain\Projection\Content\TraversableNodeInterface; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\View\AbstractView; diff --git a/Neos.Media.Browser/Classes/Controller/UsageController.php b/Neos.Media.Browser/Classes/Controller/UsageController.php index 8095aeb8b33..267bb343c24 100644 --- a/Neos.Media.Browser/Classes/Controller/UsageController.php +++ b/Neos.Media.Browser/Classes/Controller/UsageController.php @@ -12,9 +12,9 @@ * source code. */ -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Media.Browser/composer.json b/Neos.Media.Browser/composer.json index d230779dc29..8ebb9897fe6 100644 --- a/Neos.Media.Browser/composer.json +++ b/Neos.Media.Browser/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^8.1", "neos/media": "self.version", - "neos/contentrepository": "self.version", + "neos/contentrepository-core": "self.version", "neos/neos": "self.version", "neos/flow": "*", "neos/fluid-adaptor": "*", diff --git a/Neos.Neos.LegacyFusionCompatibility/Classes/TypeConverter/NewNodeConverter.php b/Neos.Neos.LegacyFusionCompatibility/Classes/TypeConverter/NewNodeConverter.php index 49be60337fd..93492a6edc0 100644 --- a/Neos.Neos.LegacyFusionCompatibility/Classes/TypeConverter/NewNodeConverter.php +++ b/Neos.Neos.LegacyFusionCompatibility/Classes/TypeConverter/NewNodeConverter.php @@ -12,8 +12,8 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Property\PropertyMappingConfigurationInterface; use Neos\Flow\Property\TypeConverter\AbstractTypeConverter; diff --git a/Neos.Neos.LegacyFusionCompatibility/composer.json b/Neos.Neos.LegacyFusionCompatibility/composer.json index f57e541e3d2..da3f1474d9e 100644 --- a/Neos.Neos.LegacyFusionCompatibility/composer.json +++ b/Neos.Neos.LegacyFusionCompatibility/composer.json @@ -6,7 +6,7 @@ "GPL-3.0-or-later" ], "require": { - "neos/contentrepository": "~9.0" + "neos/contentrepository-core": "~9.0" }, "autoload": { "psr-4": { diff --git a/Neos.Neos/Classes/Aspects/PluginUriAspect.php b/Neos.Neos/Classes/Aspects/PluginUriAspect.php index d325e809e1a..a80d6c67347 100644 --- a/Neos.Neos/Classes/Aspects/PluginUriAspect.php +++ b/Neos.Neos/Classes/Aspects/PluginUriAspect.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Aspects; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Aop\JoinPointInterface; diff --git a/Neos.Neos/Classes/Command/SiteCommandController.php b/Neos.Neos/Classes/Command/SiteCommandController.php index 573370d8a3e..bcfa1a05d10 100644 --- a/Neos.Neos/Classes/Command/SiteCommandController.php +++ b/Neos.Neos/Classes/Command/SiteCommandController.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Command; -use Neos\ContentRepository\Feature\Common\Exception\NodeNameIsAlreadyOccupied; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeNameIsAlreadyOccupied; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; use Neos\Flow\Package\PackageManager; diff --git a/Neos.Neos/Classes/Command/WorkspaceCommandController.php b/Neos.Neos/Classes/Command/WorkspaceCommandController.php index 83a4b3905fd..7fc8ab8b3db 100644 --- a/Neos.Neos/Classes/Command/WorkspaceCommandController.php +++ b/Neos.Neos/Classes/Command/WorkspaceCommandController.php @@ -14,21 +14,21 @@ namespace Neos\Neos\Command; -use Neos\ContentRepository\Feature\Common\Exception\WorkspaceDoesNotExist; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateRootWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist; -use Neos\ContentRepository\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishWorkspace; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceDoesNotExist; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; use Neos\Flow\Persistence\PersistenceManagerInterface; diff --git a/Neos.Neos/Classes/Controller/Backend/ContentController.php b/Neos.Neos/Classes/Controller/Backend/ContentController.php index d4d7a385b1a..734403d2dfb 100644 --- a/Neos.Neos/Classes/Controller/Backend/ContentController.php +++ b/Neos.Neos/Classes/Controller/Backend/ContentController.php @@ -14,12 +14,12 @@ namespace Neos\Neos\Controller\Backend; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\I18n\EelHelper\TranslationHelper; diff --git a/Neos.Neos/Classes/Controller/Frontend/NodeController.php b/Neos.Neos/Classes/Controller/Frontend/NodeController.php index 0b9e3b6c5c0..187bdaf806a 100644 --- a/Neos.Neos/Classes/Controller/Frontend/NodeController.php +++ b/Neos.Neos/Classes/Controller/Frontend/NodeController.php @@ -15,19 +15,19 @@ namespace Neos\Neos\Controller\Frontend; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ContentSubgraph; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\InMemoryCache; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Neos\FrontendRouting\Exception\NodeNotFoundException; diff --git a/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternals.php b/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternals.php index bd3a0798796..9631608b1e6 100644 --- a/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternals.php +++ b/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternals.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Controller\Module\Administration; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; use Neos\Neos\Presentation\Dimensions\VisualIntraDimensionalVariationGraph; use Neos\Neos\Presentation\Dimensions\VisualInterDimensionalVariationGraph; diff --git a/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternalsFactory.php b/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternalsFactory.php index 264efe9b0c1..958d8bcc28b 100644 --- a/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternalsFactory.php +++ b/Neos.Neos/Classes/Controller/Module/Administration/DimensionControllerInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Controller\Module\Administration; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php index b4c1a8b4149..70af95869e5 100755 --- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php +++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php @@ -14,19 +14,19 @@ namespace Neos\Neos\Controller\Module\Administration; -use Neos\ContentRepository\Feature\Common\Exception\NodeNameIsAlreadyOccupied; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Feature\NodeAggregateCommandHandler; -use Neos\ContentRepository\Feature\NodeRenaming\Command\ChangeNodeAggregateName; -use Neos\ContentRepository\Projection\ContentGraph\ContentGraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeNameIsAlreadyOccupied; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler; +use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Error\Messages\Message; use Neos\Flow\Log\Utility\LogEnvironment; @@ -44,7 +44,7 @@ use Neos\Neos\Domain\Repository\SiteRepository; use Neos\Neos\Domain\Service\NodeTypeNameFactory; use Neos\Neos\Domain\Service\SiteService; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\Neos\Domain\Service\UserService; use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult; use Neos\SiteKickstarter\Generator\SitePackageGeneratorInterface; diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php index 6c696ee9232..a341d1db7c2 100644 --- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php +++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php @@ -14,26 +14,26 @@ namespace Neos\Neos\Controller\Module\Management; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Feature\Common\NodeIdentifiersToPublishOrDiscard; -use Neos\ContentRepository\Feature\Common\NodeIdentifierToPublishOrDiscard; -use Neos\ContentRepository\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifiersToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\Common\NodeIdentifierToPublishOrDiscard; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists; use Neos\Neos\PendingChangesProjection\ChangeProjection; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; -use Neos\ContentRepository\Feature\WorkspacePublication\Command\PublishWorkspace; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceDiscarding\Command\DiscardWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\ContentRepositoryRegistry\Utility; use Neos\Diff\Diff; @@ -131,7 +131,7 @@ public function indexAction() ]; foreach ($contentRepository->getWorkspaceFinder()->findAll() as $workspace) { - /** @var \Neos\ContentRepository\Projection\Workspace\Workspace $workspace */ + /** @var \Neos\ContentRepository\Core\Projection\Workspace\Workspace $workspace */ // FIXME: This check should be implemented through a specialized Workspace Privilege or something similar // TODO $this->domainUserService->currentUserCanManageWorkspace($workspace) if (!$workspace->isPersonalWorkspace() && ($workspace->isInternalWorkspace())) { diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternals.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternals.php index 6e9f0de43d7..65a3945056f 100644 --- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternals.php +++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternals.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Controller\Module\Management; -use Neos\ContentRepository\Dimension\ContentDimension; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimension; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @deprecated really un-nice :D diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternalsFactory.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternalsFactory.php index 9f0cd9a6505..420416d8de3 100644 --- a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternalsFactory.php +++ b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesControllerInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Controller\Module\Management; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.Neos/Classes/Controller/Service/ContentDimensionsController.php b/Neos.Neos/Classes/Controller/Service/ContentDimensionsController.php index cec42d217b8..0528952eac6 100644 --- a/Neos.Neos/Classes/Controller/Service/ContentDimensionsController.php +++ b/Neos.Neos/Classes/Controller/Service/ContentDimensionsController.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Controller\Service; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\Controller\ActionController; diff --git a/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternals.php b/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternals.php index 62bb66127d7..80244759b1a 100644 --- a/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternals.php +++ b/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternals.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Controller\Service; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @deprecated diff --git a/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternalsFactory.php b/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternalsFactory.php index 3ca6baa2fd3..8710af996cf 100644 --- a/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternalsFactory.php +++ b/Neos.Neos/Classes/Controller/Service/ContentDimensionsControllerInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Controller\Service; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @deprecated diff --git a/Neos.Neos/Classes/Controller/Service/NodesController.php b/Neos.Neos/Classes/Controller/Service/NodesController.php index 81f753212af..68f5f95a4f9 100644 --- a/Neos.Neos/Classes/Controller/Service/NodesController.php +++ b/Neos.Neos/Classes/Controller/Service/NodesController.php @@ -14,24 +14,24 @@ namespace Neos\Neos\Controller\Service; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeVariation\Command\CreateNodeVariant; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\ContentGraph\SearchTerm; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeNames; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeNames; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\CatchUpTriggerWithSynchronousOption; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Domain/Exception/SiteNodeNameIsAlreadyInUseByAnotherSite.php b/Neos.Neos/Classes/Domain/Exception/SiteNodeNameIsAlreadyInUseByAnotherSite.php index 403dab8ab36..8703b153694 100644 --- a/Neos.Neos/Classes/Domain/Exception/SiteNodeNameIsAlreadyInUseByAnotherSite.php +++ b/Neos.Neos/Classes/Domain/Exception/SiteNodeNameIsAlreadyInUseByAnotherSite.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Exception; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; use Neos\Flow\Annotations as Flow; #[Flow\Proxy(false)] diff --git a/Neos.Neos/Classes/Domain/Exception/SiteNodeTypeIsInvalid.php b/Neos.Neos/Classes/Domain/Exception/SiteNodeTypeIsInvalid.php index 0a1c2e89858..65469fad668 100644 --- a/Neos.Neos/Classes/Domain/Exception/SiteNodeTypeIsInvalid.php +++ b/Neos.Neos/Classes/Domain/Exception/SiteNodeTypeIsInvalid.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Exception; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Flow\Annotations as Flow; use Neos\Neos\Domain\Service\NodeTypeNameFactory; diff --git a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php index 47461c12ccf..bcd75c80e52 100644 --- a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php +++ b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php @@ -16,7 +16,7 @@ use Neos\Flow\Annotations as Flow; use Neos\Cache\CacheAwareInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * The cache entry identifier data transfer object for nodes diff --git a/Neos.Neos/Classes/Domain/Model/PluginViewDefinition.php b/Neos.Neos/Classes/Domain/Model/PluginViewDefinition.php index 22c3454eb5d..4381115fd67 100644 --- a/Neos.Neos/Classes/Domain/Model/PluginViewDefinition.php +++ b/Neos.Neos/Classes/Domain/Model/PluginViewDefinition.php @@ -15,7 +15,7 @@ namespace Neos\Neos\Domain\Model; use Neos\Flow\I18n\EelHelper\TranslationHelper; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * A plugin view definition diff --git a/Neos.Neos/Classes/Domain/Model/SiteNodeName.php b/Neos.Neos/Classes/Domain/Model/SiteNodeName.php index 118b3802ba8..8e9eb749dc8 100644 --- a/Neos.Neos/Classes/Domain/Model/SiteNodeName.php +++ b/Neos.Neos/Classes/Domain/Model/SiteNodeName.php @@ -15,7 +15,7 @@ namespace Neos\Neos\Domain\Model; use Neos\Cache\CacheAwareInterface; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/Domain/Model/WorkspaceName.php b/Neos.Neos/Classes/Domain/Model/WorkspaceName.php index 2a708de4f94..c59ba79951d 100644 --- a/Neos.Neos/Classes/Domain/Model/WorkspaceName.php +++ b/Neos.Neos/Classes/Domain/Model/WorkspaceName.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Model; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName as ContentRepositoryWorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName as ContentRepositoryWorkspaceName; /** * The workspace name value for Neos contexts diff --git a/Neos.Neos/Classes/Domain/Service/DefaultPrototypeGeneratorInterface.php b/Neos.Neos/Classes/Domain/Service/DefaultPrototypeGeneratorInterface.php index cc1dafb1bde..f67c22534e9 100644 --- a/Neos.Neos/Classes/Domain/Service/DefaultPrototypeGeneratorInterface.php +++ b/Neos.Neos/Classes/Domain/Service/DefaultPrototypeGeneratorInterface.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * Generate a Fusion prototype definition for a given node type diff --git a/Neos.Neos/Classes/Domain/Service/FusionService.php b/Neos.Neos/Classes/Domain/Service/FusionService.php index 9fd33842cd6..8a1d8d90d67 100644 --- a/Neos.Neos/Classes/Domain/Service/FusionService.php +++ b/Neos.Neos/Classes/Domain/Service/FusionService.php @@ -14,16 +14,16 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\Controller\ControllerContext; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Neos\Domain\Model\Site; use Neos\Neos\Domain\Repository\SiteRepository; use Neos\Utility\Files; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\Fusion\Core\Parser; use Neos\Fusion\Core\Runtime; diff --git a/Neos.Neos/Classes/Domain/Service/NodeSearchService.php b/Neos.Neos/Classes/Domain/Service/NodeSearchService.php index 24e8f23f85d..4c95f23ec19 100644 --- a/Neos.Neos/Classes/Domain/Service/NodeSearchService.php +++ b/Neos.Neos/Classes/Domain/Service/NodeSearchService.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/Domain/Service/NodeSearchServiceInterface.php b/Neos.Neos/Classes/Domain/Service/NodeSearchServiceInterface.php index a433da62889..abd58aa5681 100644 --- a/Neos.Neos/Classes/Domain/Service/NodeSearchServiceInterface.php +++ b/Neos.Neos/Classes/Domain/Service/NodeSearchServiceInterface.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; /** * Interface for the node search service for finding nodes based on a fulltext search diff --git a/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php b/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php index 72194cc4fcd..84468499c8a 100644 --- a/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php +++ b/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php @@ -14,11 +14,11 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Domain/Service/NodeTypeNameFactory.php b/Neos.Neos/Classes/Domain/Service/NodeTypeNameFactory.php index 77964e98cfa..344685afd0b 100644 --- a/Neos.Neos/Classes/Domain/Service/NodeTypeNameFactory.php +++ b/Neos.Neos/Classes/Domain/Service/NodeTypeNameFactory.php @@ -15,7 +15,7 @@ namespace Neos\Neos\Domain\Service; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; #[Flow\Proxy(false)] final class NodeTypeNameFactory diff --git a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php index e2fb934db75..de2b2f2f610 100644 --- a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php +++ b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php @@ -15,12 +15,12 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Neos\Domain\Model\Site; diff --git a/Neos.Neos/Classes/Domain/Service/SiteService.php b/Neos.Neos/Classes/Domain/Service/SiteService.php index 800f4f859e9..006d7562397 100644 --- a/Neos.Neos/Classes/Domain/Service/SiteService.php +++ b/Neos.Neos/Classes/Domain/Service/SiteService.php @@ -14,11 +14,11 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Flow\Persistence\PersistenceManagerInterface; use Neos\Media\Domain\Model\Asset; diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php index c2a88461b50..a05c61882c2 100644 --- a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php +++ b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php @@ -14,31 +14,31 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Feature\Common\NodeVariantSelectionStrategy; -use Neos\ContentRepository\Feature\Common\PropertyValuesToWrite; -use Neos\ContentRepository\Feature\NodeCreation\Command\CreateNodeAggregateWithNode; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\Feature\NodeVariation\Command\CreateNodeVariant; -use Neos\ContentRepository\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateRootWorkspace; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\Service\ContentRepositoryBootstrapper; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Feature\Common\NodeVariantSelectionStrategy; +use Neos\ContentRepository\Core\Feature\Common\PropertyValuesToWrite; +use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Service\ContentRepositoryBootstrapper; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\Neos\Domain\Exception\LiveWorkspaceIsMissing; use Neos\Neos\Domain\Exception\SitesNodeIsMissing; use Neos\Neos\Domain\Model\Site; diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternalsFactory.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternalsFactory.php index 4d00caa46b9..ca457ad0078 100644 --- a/Neos.Neos/Classes/Domain/Service/SiteServiceInternalsFactory.php +++ b/Neos.Neos/Classes/Domain/Service/SiteServiceInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.Neos/Classes/Domain/Service/UserService.php b/Neos.Neos/Classes/Domain/Service/UserService.php index 965b89aab62..4cb2380c9ae 100644 --- a/Neos.Neos/Classes/Domain/Service/UserService.php +++ b/Neos.Neos/Classes/Domain/Service/UserService.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Domain\Service; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Flow\Persistence\Exception\IllegalObjectTypeException; use Neos\Flow\Persistence\PersistenceManagerInterface; diff --git a/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php b/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php index e3a7b85931b..95cbe89fa63 100644 --- a/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php +++ b/Neos.Neos/Classes/Eel/FlowQueryOperations/SortOperation.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Eel\FlowQueryOperations; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Eel\FlowQuery\FlowQuery; use Neos\Eel\FlowQuery\FlowQueryException; use Neos\Eel\FlowQuery\Operations\AbstractOperation; diff --git a/Neos.Neos/Classes/EventLog/Domain/Model/NodeEvent.php b/Neos.Neos/Classes/EventLog/Domain/Model/NodeEvent.php index 588a598aaa1..9fbe2fd043f 100644 --- a/Neos.Neos/Classes/EventLog/Domain/Model/NodeEvent.php +++ b/Neos.Neos/Classes/EventLog/Domain/Model/NodeEvent.php @@ -16,7 +16,7 @@ use Doctrine\ORM\EntityNotFoundException; use Doctrine\ORM\Mapping as ORM; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Persistence\PersistenceManagerInterface; use Neos\Utility\Arrays; diff --git a/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php b/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php index b5963d38aa2..de1fd540ea0 100644 --- a/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php +++ b/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php @@ -15,9 +15,9 @@ namespace Neos\Neos\EventLog\Integrations; use Doctrine\ORM\EntityManagerInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Persistence\PersistenceManagerInterface; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DelegatingResolver.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DelegatingResolver.php index a5c4dedba59..248a7620a77 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DelegatingResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DelegatingResolver.php @@ -14,9 +14,9 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\UriConstraints; use Neos\Flow\ObjectManagement\ObjectManagerInterface; use Neos\Neos\Domain\Model\SiteNodeName; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverFactoryInterface.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverFactoryInterface.php index 320971f4a52..0cdc38e09bf 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverFactoryInterface.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverFactoryInterface.php @@ -4,7 +4,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; /** * API Contract for creating a {@see DimensionResolverInterface} from Settings (usually diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverInterface.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverInterface.php index 84fed176f77..93c97f19742 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverInterface.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/DimensionResolverInterface.php @@ -4,7 +4,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\UriConstraints; use Neos\Neos\Domain\Model\SiteNodeName; use Neos\Neos\FrontendRouting\DimensionResolution\Resolver\CompositeResolver; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/RequestToDimensionSpacePointContext.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/RequestToDimensionSpacePointContext.php index fa5076941d5..4f3924aa8cc 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/RequestToDimensionSpacePointContext.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/RequestToDimensionSpacePointContext.php @@ -4,7 +4,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\RouteParameters; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php index 47939c9de33..3167a3deddc 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Dimension\ContentDimension; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimension; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverFactoryInterface; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverInterface; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternals.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternals.php index 1dff3b8388f..27ca332d6d2 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternals.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternals.php @@ -14,8 +14,8 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @deprecated TODO CLEAN UP diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternalsFactory.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternalsFactory.php index dd82525614f..a8a2376590e 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternalsFactory.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactoryInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @deprecated TODO CLEAN UP diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/CompositeResolver.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/CompositeResolver.php index 137dedcf4a2..2b17438f1be 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/CompositeResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/CompositeResolver.php @@ -14,7 +14,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\UriConstraints; use Neos\Neos\Domain\Model\SiteNodeName; use Neos\Neos\FrontendRouting\DimensionResolution\RequestToDimensionSpacePointContext; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolver.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolver.php index 066ee13478c..55293d8aefb 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolver.php @@ -14,7 +14,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\UriConstraints; use Neos\Neos\Domain\Model\SiteNodeName; use Neos\Neos\FrontendRouting\DimensionResolution\RequestToDimensionSpacePointContext; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolverFactory.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolverFactory.php index 2c7dd46251e..06d3be1486e 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolverFactory.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/NoopResolverFactory.php @@ -14,7 +14,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverFactoryInterface; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverInterface; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php index cf0e63415e2..cf46dc429c9 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php @@ -14,8 +14,8 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Mvc\Routing\Dto\UriConstraints; use Neos\Neos\Domain\Model\SiteNodeName; use Neos\Neos\FrontendRouting\DimensionResolution\RequestToDimensionSpacePointContext; diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segment.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segment.php index 6ec2c951f86..dc081a11ad0 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segment.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segment.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; /** * @Flow\Proxy(false) diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMapping.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMapping.php index 26703438008..b28ecbce923 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMapping.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMapping.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; /** * @Flow\Proxy(false) diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMappingElement.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMappingElement.php index 7edd0eb8132..92af46e7106 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMappingElement.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/SegmentMappingElement.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; /** * @Flow\Proxy(false) diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segments.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segments.php index 0f27c12afd1..3e5423447b8 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segments.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver/Segments.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; use Neos\Utility\PositionalArraySorter; /** diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolverFactory.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolverFactory.php index 745e0ee9de0..0ce615aeb4f 100644 --- a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolverFactory.php +++ b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolverFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\FrontendRouting\DimensionResolution\Resolver; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverFactoryInterface; use Neos\Neos\FrontendRouting\DimensionResolution\DimensionResolverInterface; diff --git a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php index bb502358b1f..78dd7d0467d 100644 --- a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php +++ b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php @@ -14,10 +14,10 @@ namespace Neos\Neos\FrontendRouting; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Mvc\Routing\RoutingMiddleware; use Neos\Neos\FrontendRouting\Exception\NodeNotFoundException; diff --git a/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php b/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php index b9fd5935a5a..334f1f10077 100644 --- a/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php @@ -15,9 +15,9 @@ namespace Neos\Neos\FrontendRouting; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; use Neos\Neos\FrontendRouting\Exception\InvalidShortcutException; use Neos\Neos\FrontendRouting\Exception\NodeNotFoundException; use Neos\Neos\FrontendRouting\Projection\DocumentNodeInfo; diff --git a/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php b/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php index 335fb7f50b2..fa7e586c5f1 100644 --- a/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php +++ b/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php @@ -15,7 +15,7 @@ namespace Neos\Neos\FrontendRouting; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; use Neos\Flow\Http\Exception as HttpException; use Neos\Flow\Mvc\ActionRequest; use Neos\Flow\Mvc\Exception\NoMatchingRouteException; diff --git a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentNodeInfo.php b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentNodeInfo.php index 1d1d62373ae..35d967ec802 100644 --- a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentNodeInfo.php +++ b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentNodeInfo.php @@ -15,9 +15,9 @@ namespace Neos\Neos\FrontendRouting\Projection; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\Routing\Dto\RouteTags; use Neos\Neos\Domain\Model\SiteNodeName; diff --git a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathFinder.php b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathFinder.php index ba82d6a3e55..e43317c45de 100644 --- a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathFinder.php +++ b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathFinder.php @@ -7,9 +7,9 @@ use Neos\Flow\Annotations as Flow; use Doctrine\DBAL\Connection; use Doctrine\DBAL\DBALException; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\Neos\Domain\Model\SiteNodeName; use Neos\Neos\FrontendRouting\Exception\NodeNotFoundException; diff --git a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjection.php b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjection.php index 947e4d13efb..a7c556ac27e 100644 --- a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjection.php +++ b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjection.php @@ -10,30 +10,30 @@ use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Types\Types; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePointSet; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; -use Neos\ContentRepository\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionShineThroughWasAdded; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; +use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\RootNodeCreation\Event\RootNodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Event\RootWorkspaceWasCreated; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjectionFactory.php b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjectionFactory.php index fe7ba43dc79..13b4f140218 100644 --- a/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjectionFactory.php +++ b/Neos.Neos/Classes/FrontendRouting/Projection/DocumentUriPathProjectionFactory.php @@ -4,12 +4,12 @@ namespace Neos\Neos\FrontendRouting\Projection; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\Projection\Projections; +use Neos\ContentRepository\Core\Projection\Projections; /** * @implements ProjectionFactoryInterface diff --git a/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionMiddleware.php b/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionMiddleware.php index 24f1a003d0a..8161ddbeaca 100644 --- a/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionMiddleware.php +++ b/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionMiddleware.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\SiteDetection; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Neos\Domain\Model\Site; use Neos\Neos\Domain\Repository\DomainRepository; use Neos\Neos\Domain\Repository\SiteRepository; diff --git a/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionResult.php b/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionResult.php index 88f337afadc..3983028b32a 100644 --- a/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionResult.php +++ b/Neos.Neos/Classes/FrontendRouting/SiteDetection/SiteDetectionResult.php @@ -5,7 +5,7 @@ namespace Neos\Neos\FrontendRouting\SiteDetection; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; use Neos\Flow\Http\ServerRequestAttributes; use Neos\Flow\Mvc\Routing\Dto\RouteParameters; use Neos\Neos\Domain\Model\SiteNodeName; diff --git a/Neos.Neos/Classes/Fusion/AbstractMenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/AbstractMenuItemsImplementation.php index 16a6c58677a..7c6edcb51d2 100644 --- a/Neos.Neos/Classes/Fusion/AbstractMenuItemsImplementation.php +++ b/Neos.Neos/Classes/Fusion/AbstractMenuItemsImplementation.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Fusion\Exception as FusionException; use Neos\Fusion\FusionObjects\AbstractFusionObject; diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php index 7a8edc1613a..85656e71ad9 100644 --- a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php +++ b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php @@ -14,14 +14,14 @@ namespace Neos\Neos\Fusion\Cache; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\Fusion\Core\Cache\ContentCache; use Neos\Media\Domain\Model\AssetInterface; use Neos\Media\Domain\Model\AssetVariantInterface; diff --git a/Neos.Neos/Classes/Fusion/Cache/FusionCachingAspect.php b/Neos.Neos/Classes/Fusion/Cache/FusionCachingAspect.php index e888261ba76..88dfa47be12 100644 --- a/Neos.Neos/Classes/Fusion/Cache/FusionCachingAspect.php +++ b/Neos.Neos/Classes/Fusion/Cache/FusionCachingAspect.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion\Cache; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Aop\JoinPointInterface; use Neos\Cache\Frontend\VariableFrontend; diff --git a/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php b/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php index 62209061237..343d30ffc50 100644 --- a/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php +++ b/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php @@ -12,14 +12,14 @@ * source code. */ -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventInterface; -use Neos\ContentRepository\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Projection\CatchUpHookInterface; -use Neos\ContentRepository\Projection\ContentGraph\NodeAggregate; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventInterface; +use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Projection\CatchUpHookInterface; +use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\EventStore\Model\EventEnvelope; class GraphProjectorCatchUpHookForCacheFlushing implements CatchUpHookInterface diff --git a/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushingFactory.php b/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushingFactory.php index 4bedef67476..7dfa6022cd6 100644 --- a/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushingFactory.php +++ b/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushingFactory.php @@ -12,8 +12,8 @@ * source code. */ -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; class GraphProjectorCatchUpHookForCacheFlushingFactory implements CatchUpHookFactoryInterface { diff --git a/Neos.Neos/Classes/Fusion/ContentElementEditableImplementation.php b/Neos.Neos/Classes/Fusion/ContentElementEditableImplementation.php index ba97d1bb4fb..6ddcdc300ee 100644 --- a/Neos.Neos/Classes/Fusion/ContentElementEditableImplementation.php +++ b/Neos.Neos/Classes/Fusion/ContentElementEditableImplementation.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; use Neos\Fusion\FusionObjects\AbstractFusionObject; diff --git a/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php b/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php index 631f1cc709a..9f4464b75e6 100644 --- a/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php +++ b/Neos.Neos/Classes/Fusion/ContentElementWrappingImplementation.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; use Neos\Fusion\FusionObjects\AbstractFusionObject; diff --git a/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php b/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php index 721558cd84a..9617d930455 100644 --- a/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php +++ b/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Neos\FrontendRouting\NodeUriBuilder; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php index e6f9e42e6a9..e9dd1137d68 100644 --- a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php +++ b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementation.php @@ -4,11 +4,11 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternals.php b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternals.php index 3fcd72512f5..123520464f7 100644 --- a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternals.php +++ b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternals.php @@ -4,10 +4,10 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\DimensionSpace\ContentDimensionZookeeper; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\DimensionSpace\ContentDimensionZookeeper; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @deprecated really un-nice :D diff --git a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternalsFactory.php b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternalsFactory.php index d5c9cc59e39..c898bcf5e1a 100644 --- a/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternalsFactory.php +++ b/Neos.Neos/Classes/Fusion/DimensionsMenuItemsImplementationInternalsFactory.php @@ -4,8 +4,8 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php b/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php index ccdf727ebcd..c1e080f8fa5 100644 --- a/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php +++ b/Neos.Neos/Classes/Fusion/ExceptionHandlers/NodeWrappingHandler.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion\ExceptionHandlers; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; diff --git a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php index a06f0139b72..853d3664d6b 100644 --- a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php +++ b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php @@ -15,7 +15,7 @@ namespace Neos\Neos\Fusion\ExceptionHandlers; use GuzzleHttp\Psr7\Message; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Exception as FlowException; diff --git a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php index dfa00c01923..85f58a8b508 100644 --- a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php +++ b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php @@ -15,14 +15,14 @@ namespace Neos\Neos\Fusion\Helper; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\ProtectedContextAwareInterface; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Neos\Domain\Model\NodeCacheEntryIdentifier; use Neos\Neos\Exception; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * Caching helper to make cache tag generation easier. diff --git a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php index 6957b717ad7..fa8778a1a04 100644 --- a/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php +++ b/Neos.Neos/Classes/Fusion/Helper/LinkHelper.php @@ -15,9 +15,9 @@ namespace Neos\Neos\Fusion\Helper; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Eel\ProtectedContextAwareInterface; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php index 47f2e5e55db..a625659c7fc 100644 --- a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php +++ b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Fusion\Helper; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Eel\ProtectedContextAwareInterface; diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php b/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php index fb2a2d84ccd..0c236da1cc8 100644 --- a/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php +++ b/Neos.Neos/Classes/Fusion/Helper/NodeLabelToken.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion\Helper; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Eel\Helper\StringHelper; use Neos\Eel\ProtectedContextAwareInterface; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php b/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php index c36a930fe59..c757cecf71e 100644 --- a/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php +++ b/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php @@ -14,12 +14,12 @@ namespace Neos\Neos\Fusion\Helper; -use Neos\ContentRepository\Dimension\ContentDimensionIdentifier; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionIdentifier; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; use Neos\Eel\ProtectedContextAwareInterface; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\Feature\Common\Exception\NodeTypeNotFoundException; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\Feature\Common\Exception\NodeTypeNotFoundException; /** * Render Content Dimension Names, Node Labels diff --git a/Neos.Neos/Classes/Fusion/MenuItem.php b/Neos.Neos/Classes/Fusion/MenuItem.php index 1adb66e5936..2d22abed4eb 100644 --- a/Neos.Neos/Classes/Fusion/MenuItem.php +++ b/Neos.Neos/Classes/Fusion/MenuItem.php @@ -4,7 +4,7 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * A menu item diff --git a/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php b/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php index 73b661ceb27..50d4ee1acc4 100644 --- a/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php +++ b/Neos.Neos/Classes/Fusion/MenuItemsImplementation.php @@ -14,12 +14,12 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Subtree; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifiers; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifiers; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintsWithSubNodeTypes; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; use Neos\Fusion\Exception as FusionException; /** diff --git a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php index acef84f4b0d..c2eb57ee132 100644 --- a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php +++ b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Neos\FrontendRouting\NodeUriBuilder; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Fusion/PluginImplementation.php b/Neos.Neos/Classes/Fusion/PluginImplementation.php index 127b0a00c0d..fc9a0da7e74 100644 --- a/Neos.Neos/Classes/Fusion/PluginImplementation.php +++ b/Neos.Neos/Classes/Fusion/PluginImplementation.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\ActionRequest; use Neos\Flow\Mvc\ActionResponse; diff --git a/Neos.Neos/Classes/Fusion/PluginViewImplementation.php b/Neos.Neos/Classes/Fusion/PluginViewImplementation.php index 52f9e9f5160..181ffa261d3 100644 --- a/Neos.Neos/Classes/Fusion/PluginViewImplementation.php +++ b/Neos.Neos/Classes/Fusion/PluginViewImplementation.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Fusion; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\ActionRequest; diff --git a/Neos.Neos/Classes/NodeTypePostprocessor/CreationDialogPostprocessor.php b/Neos.Neos/Classes/NodeTypePostprocessor/CreationDialogPostprocessor.php index 0238f0d8c11..667f6ec1a02 100644 --- a/Neos.Neos/Classes/NodeTypePostprocessor/CreationDialogPostprocessor.php +++ b/Neos.Neos/Classes/NodeTypePostprocessor/CreationDialogPostprocessor.php @@ -14,8 +14,8 @@ namespace Neos\Neos\NodeTypePostprocessor; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; use Neos\Flow\Annotations as Flow; use Neos\Utility\Arrays; use Neos\Utility\PositionalArraySorter; diff --git a/Neos.Neos/Classes/NodeTypePostprocessor/DefaultPropertyEditorPostprocessor.php b/Neos.Neos/Classes/NodeTypePostprocessor/DefaultPropertyEditorPostprocessor.php index aaf30fd9989..bf6c8316da2 100644 --- a/Neos.Neos/Classes/NodeTypePostprocessor/DefaultPropertyEditorPostprocessor.php +++ b/Neos.Neos/Classes/NodeTypePostprocessor/DefaultPropertyEditorPostprocessor.php @@ -15,8 +15,8 @@ namespace Neos\Neos\NodeTypePostprocessor; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\Utility\Arrays; use Neos\Neos\Exception; diff --git a/Neos.Neos/Classes/NodeTypePostprocessor/IconNameMappingPostprocessor.php b/Neos.Neos/Classes/NodeTypePostprocessor/IconNameMappingPostprocessor.php index 12a2f1a98c0..a11fbc465c1 100644 --- a/Neos.Neos/Classes/NodeTypePostprocessor/IconNameMappingPostprocessor.php +++ b/Neos.Neos/Classes/NodeTypePostprocessor/IconNameMappingPostprocessor.php @@ -15,8 +15,8 @@ namespace Neos\Neos\NodeTypePostprocessor; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\Neos\Service\IconNameMappingService; use Neos\Utility\Arrays; diff --git a/Neos.Neos/Classes/NodeTypePostprocessor/NodeTypePresetPostprocessor.php b/Neos.Neos/Classes/NodeTypePostprocessor/NodeTypePresetPostprocessor.php index ea022ca2799..96f6f372da6 100644 --- a/Neos.Neos/Classes/NodeTypePostprocessor/NodeTypePresetPostprocessor.php +++ b/Neos.Neos/Classes/NodeTypePostprocessor/NodeTypePresetPostprocessor.php @@ -15,8 +15,8 @@ namespace Neos\Neos\NodeTypePostprocessor; use Neos\Flow\Annotations as Flow; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; use Neos\Utility\Arrays; /** diff --git a/Neos.Neos/Classes/NodeTypePostprocessor/PluginNodeTypePostprocessor.php b/Neos.Neos/Classes/NodeTypePostprocessor/PluginNodeTypePostprocessor.php index bd3032714ff..9d1e7fb22ca 100644 --- a/Neos.Neos/Classes/NodeTypePostprocessor/PluginNodeTypePostprocessor.php +++ b/Neos.Neos/Classes/NodeTypePostprocessor/PluginNodeTypePostprocessor.php @@ -17,8 +17,8 @@ use Neos\Flow\Annotations as Flow; use Neos\Flow\Configuration\ConfigurationManager; use Neos\Neos\Service\PluginService; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypePostprocessorInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypePostprocessorInterface; /** * This Processor updates the PluginViews NodeType with the existing @@ -41,7 +41,7 @@ class PluginNodeTypePostprocessor implements NodeTypePostprocessorInterface /** * Returns the processed Configuration * - * @param \Neos\ContentRepository\SharedModel\NodeType\NodeType $nodeType (uninitialized) The node type to process + * @param \Neos\ContentRepository\Core\SharedModel\NodeType\NodeType $nodeType (uninitialized) The node type to process * @param array $configuration input configuration * @param array $options The processor options * @return void diff --git a/Neos.Neos/Classes/Package.php b/Neos.Neos/Classes/Package.php index 12ff99ea42d..a83e763c8b1 100644 --- a/Neos.Neos/Classes/Package.php +++ b/Neos.Neos/Classes/Package.php @@ -14,7 +14,7 @@ namespace Neos\Neos; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; use Neos\Flow\Cache\CacheManager; use Neos\Flow\Core\Bootstrap; use Neos\Flow\Monitor\FileMonitor; diff --git a/Neos.Neos/Classes/PendingChangesProjection/Change.php b/Neos.Neos/Classes/PendingChangesProjection/Change.php index a4b1ad948fe..69d850a2ad8 100644 --- a/Neos.Neos/Classes/PendingChangesProjection/Change.php +++ b/Neos.Neos/Classes/PendingChangesProjection/Change.php @@ -16,10 +16,10 @@ use Neos\Flow\Annotations as Flow; use Doctrine\DBAL\Connection; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\NodeRemoval\Command\RemoveNodeAggregate; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; /** * Change Read Model diff --git a/Neos.Neos/Classes/PendingChangesProjection/ChangeFinder.php b/Neos.Neos/Classes/PendingChangesProjection/ChangeFinder.php index bcd04508f3b..f2dfa6ca4e1 100644 --- a/Neos.Neos/Classes/PendingChangesProjection/ChangeFinder.php +++ b/Neos.Neos/Classes/PendingChangesProjection/ChangeFinder.php @@ -14,9 +14,9 @@ namespace Neos\Neos\PendingChangesProjection; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionStateInterface; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/PendingChangesProjection/ChangeProjection.php b/Neos.Neos/Classes/PendingChangesProjection/ChangeProjection.php index 0217f08820d..c29bd54bc40 100644 --- a/Neos.Neos/Classes/PendingChangesProjection/ChangeProjection.php +++ b/Neos.Neos/Classes/PendingChangesProjection/ChangeProjection.php @@ -19,26 +19,26 @@ use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Types\Types; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\EventStore\EventNormalizer; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeMoveMapping; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodePeerVariantWasCreated; -use Neos\ContentRepository\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\ProjectionInterface; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; -use Neos\ContentRepository\Feature\NodeMove\Event\NodeAggregateWasMoved; -use Neos\ContentRepository\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; -use Neos\ContentRepository\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\Feature\NodeModification\Event\NodePropertiesWereSet; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; -use Neos\ContentRepository\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeMoveMapping; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeGeneralizationVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated; +use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\ProjectionInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Event\DimensionSpacePointWasMoved; +use Neos\ContentRepository\Core\Feature\NodeMove\Event\NodeAggregateWasMoved; +use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved; +use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasDisabled; +use Neos\ContentRepository\Core\Feature\NodeDisabling\Event\NodeAggregateWasEnabled; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\EventStore\CatchUp\CatchUp; use Neos\EventStore\DoctrineAdapter\DoctrineCheckpointStorage; use Neos\EventStore\Model\Event; diff --git a/Neos.Neos/Classes/PendingChangesProjection/ChangeProjectionFactory.php b/Neos.Neos/Classes/PendingChangesProjection/ChangeProjectionFactory.php index b435bca592c..883bc66f7ac 100644 --- a/Neos.Neos/Classes/PendingChangesProjection/ChangeProjectionFactory.php +++ b/Neos.Neos/Classes/PendingChangesProjection/ChangeProjectionFactory.php @@ -14,14 +14,14 @@ namespace Neos\Neos\PendingChangesProjection; -use Neos\ContentRepository\Factory\ProjectionFactoryDependencies; -use Neos\ContentRepository\Infrastructure\DbalClientInterface; -use Neos\ContentRepository\Projection\CatchUpHookFactoryInterface; +use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies; +use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface; +use Neos\ContentRepository\Core\Projection\CatchUpHookFactoryInterface; use Neos\Neos\PendingChangesProjection\ChangeProjection; -use Neos\ContentRepository\Projection\ProjectionFactoryInterface; -use Neos\ContentRepository\Projection\Projections; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; -use Neos\ContentRepository\Projection\Workspace\WorkspaceProjection; +use Neos\ContentRepository\Core\Projection\ProjectionFactoryInterface; +use Neos\ContentRepository\Core\Projection\Projections; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceProjection; use Neos\Neos\FrontendRouting\Projection\DocumentUriPathProjection; /** diff --git a/Neos.Neos/Classes/Presentation/Dimensions/VisualContentDimension.php b/Neos.Neos/Classes/Presentation/Dimensions/VisualContentDimension.php index 829536b1a3f..4acdf06ec3f 100644 --- a/Neos.Neos/Classes/Presentation/Dimensions/VisualContentDimension.php +++ b/Neos.Neos/Classes/Presentation/Dimensions/VisualContentDimension.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Presentation\Dimensions; -use Neos\ContentRepository\Dimension\ContentDimension; -use Neos\ContentRepository\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\Dimension\ContentDimension; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/Presentation/Dimensions/VisualInterDimensionalVariationGraph.php b/Neos.Neos/Classes/Presentation/Dimensions/VisualInterDimensionalVariationGraph.php index 3c8e31eaca7..4f7740f5d3c 100644 --- a/Neos.Neos/Classes/Presentation/Dimensions/VisualInterDimensionalVariationGraph.php +++ b/Neos.Neos/Classes/Presentation/Dimensions/VisualInterDimensionalVariationGraph.php @@ -14,11 +14,11 @@ namespace Neos\Neos\Presentation\Dimensions; -use Neos\ContentRepository\Dimension\ContentDimension; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; -use Neos\ContentRepository\Dimension\ContentDimensionValue; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Dimension\ContentDimension; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionValue; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/Presentation/Dimensions/VisualIntraDimensionalVariationGraph.php b/Neos.Neos/Classes/Presentation/Dimensions/VisualIntraDimensionalVariationGraph.php index 5aae42cbcef..0808d301b78 100644 --- a/Neos.Neos/Classes/Presentation/Dimensions/VisualIntraDimensionalVariationGraph.php +++ b/Neos.Neos/Classes/Presentation/Dimensions/VisualIntraDimensionalVariationGraph.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Presentation\Dimensions; -use Neos\ContentRepository\Dimension\ContentDimensionSourceInterface; +use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface; use Neos\Flow\Annotations as Flow; /** diff --git a/Neos.Neos/Classes/Presentation/Dimensions/VisualWeightedDimensionSpacePoint.php b/Neos.Neos/Classes/Presentation/Dimensions/VisualWeightedDimensionSpacePoint.php index fa52a63be19..67622be59f1 100644 --- a/Neos.Neos/Classes/Presentation/Dimensions/VisualWeightedDimensionSpacePoint.php +++ b/Neos.Neos/Classes/Presentation/Dimensions/VisualWeightedDimensionSpacePoint.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Presentation\Dimensions; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\WeightedDimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\WeightedDimensionSpacePoint; use Neos\Flow\Annotations as Flow; #[Flow\Proxy(false)] diff --git a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php index f4fafb8f589..c98e304d9c3 100644 --- a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php +++ b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php @@ -14,8 +14,8 @@ namespace Neos\Neos\Routing\Cache; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\Routing\RouterCachingService; diff --git a/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php b/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php index 3c5d6ba6ad4..715de9a6c30 100644 --- a/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php +++ b/Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Routing; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Aop\JoinPointInterface; diff --git a/Neos.Neos/Classes/Service/BackendRedirectionService.php b/Neos.Neos/Classes/Service/BackendRedirectionService.php index 393871f4e6f..baa49ba6251 100644 --- a/Neos.Neos/Classes/Service/BackendRedirectionService.php +++ b/Neos.Neos/Classes/Service/BackendRedirectionService.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\ActionRequest; diff --git a/Neos.Neos/Classes/Service/ContentElementEditableService.php b/Neos.Neos/Classes/Service/ContentElementEditableService.php index 05706d6f516..8c85be3c326 100644 --- a/Neos.Neos/Classes/Service/ContentElementEditableService.php +++ b/Neos.Neos/Classes/Service/ContentElementEditableService.php @@ -14,10 +14,10 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; diff --git a/Neos.Neos/Classes/Service/ContentElementWrappingService.php b/Neos.Neos/Classes/Service/ContentElementWrappingService.php index 78e7547ad41..8ad2d433dcb 100644 --- a/Neos.Neos/Classes/Service/ContentElementWrappingService.php +++ b/Neos.Neos/Classes/Service/ContentElementWrappingService.php @@ -14,11 +14,11 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepository\Security\Service\AuthorizationService; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; diff --git a/Neos.Neos/Classes/Service/Controller/AbstractServiceController.php b/Neos.Neos/Classes/Service/Controller/AbstractServiceController.php index 70d20c5dcbd..6bc58d39d18 100644 --- a/Neos.Neos/Classes/Service/Controller/AbstractServiceController.php +++ b/Neos.Neos/Classes/Service/Controller/AbstractServiceController.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Service\Controller; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; use Neos\Flow\Annotations as Flow; use Neos\Flow\Exception as FlowException; use Neos\Flow\Log\ThrowableStorageInterface; diff --git a/Neos.Neos/Classes/Service/Controller/DataSourceController.php b/Neos.Neos/Classes/Service/Controller/DataSourceController.php index a879b26d724..ec4245a5d18 100644 --- a/Neos.Neos/Classes/Service/Controller/DataSourceController.php +++ b/Neos.Neos/Classes/Service/Controller/DataSourceController.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Service\Controller; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\View\JsonView; use Neos\Flow\ObjectManagement\ObjectManagerInterface; diff --git a/Neos.Neos/Classes/Service/DataSource/DataSourceInterface.php b/Neos.Neos/Classes/Service/DataSource/DataSourceInterface.php index 29b74090930..3eaa01e42a5 100644 --- a/Neos.Neos/Classes/Service/DataSource/DataSourceInterface.php +++ b/Neos.Neos/Classes/Service/DataSource/DataSourceInterface.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Service\DataSource; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * Data source interface for providing generic data diff --git a/Neos.Neos/Classes/Service/EditorContentStreamZookeeper.php b/Neos.Neos/Classes/Service/EditorContentStreamZookeeper.php index 25efeca5fac..2678637448b 100644 --- a/Neos.Neos/Classes/Service/EditorContentStreamZookeeper.php +++ b/Neos.Neos/Classes/Service/EditorContentStreamZookeeper.php @@ -14,14 +14,14 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\Feature\WorkspaceCreation\Command\CreateWorkspace; -use Neos\ContentRepository\Feature\WorkspaceRebase\Command\RebaseWorkspace; -use Neos\ContentRepository\Projection\Workspace\Workspace; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\User\UserIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceDescription; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceTitle; +use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace; +use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace; +use Neos\ContentRepository\Core\Projection\Workspace\Workspace; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\User\UserIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceTitle; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\CatchUpTriggerWithSynchronousOption; use Neos\Flow\Core\Bootstrap; @@ -82,9 +82,9 @@ final class EditorContentStreamZookeeper * * @param Authentication\TokenInterface $token * @throws \Exception - * @throws \Neos\ContentRepository\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist - * @throws \Neos\ContentRepository\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists - * @throws \Neos\ContentRepository\Feature\Common\Exception\WorkspaceDoesNotExist + * @throws \Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\BaseWorkspaceDoesNotExist + * @throws \Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists + * @throws \Neos\ContentRepository\Core\Feature\Common\Exception\WorkspaceDoesNotExist * @throws \Neos\Flow\Persistence\Exception\InvalidQueryException */ public function relayEditorAuthentication(Authentication\TokenInterface $token): void diff --git a/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php b/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php index 7cb8bf0badb..b3df15e92b2 100644 --- a/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php +++ b/Neos.Neos/Classes/Service/ImageVariantGarbageCollector.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ESCR\AssetUsage\Dto\AssetUsageFilter; use Neos\ESCR\AssetUsage\Projector\AssetUsageRepository; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Neos/Classes/Service/LinkingService.php b/Neos.Neos/Classes/Service/LinkingService.php index afb3774f1c2..62e32930ce9 100644 --- a/Neos.Neos/Classes/Service/LinkingService.php +++ b/Neos.Neos/Classes/Service/LinkingService.php @@ -14,13 +14,13 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\NodeHiddenState\NodeHiddenStateFinder; -use Neos\ContentRepository\Projection\NodeHiddenState\NodeHiddenStateProjection; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\NodeHiddenState\NodeHiddenStateFinder; +use Neos\ContentRepository\Core\Projection\NodeHiddenState\NodeHiddenStateProjection; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Http\BaseUriProvider; diff --git a/Neos.Neos/Classes/Service/Mapping/NodeReferenceConverter.php b/Neos.Neos/Classes/Service/Mapping/NodeReferenceConverter.php index 1d4599ed385..2f39dddef46 100644 --- a/Neos.Neos/Classes/Service/Mapping/NodeReferenceConverter.php +++ b/Neos.Neos/Classes/Service/Mapping/NodeReferenceConverter.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Service\Mapping; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Property\PropertyMappingConfigurationInterface; use Neos\Flow\Property\TypeConverter\AbstractTypeConverter; diff --git a/Neos.Neos/Classes/Service/Mapping/NodeTypeStringConverter.php b/Neos.Neos/Classes/Service/Mapping/NodeTypeStringConverter.php index ac731303b63..efeb1117d98 100644 --- a/Neos.Neos/Classes/Service/Mapping/NodeTypeStringConverter.php +++ b/Neos.Neos/Classes/Service/Mapping/NodeTypeStringConverter.php @@ -17,7 +17,7 @@ use Neos\Flow\Annotations as Flow; use Neos\Flow\Property\PropertyMappingConfigurationInterface; use Neos\Flow\Property\TypeConverter\AbstractTypeConverter; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * Convert a boolean to a JavaScript compatible string representation. diff --git a/Neos.Neos/Classes/Service/NodeTypeSchemaBuilder.php b/Neos.Neos/Classes/Service/NodeTypeSchemaBuilder.php index fd2eb3f5971..cf3ea1b0a45 100644 --- a/Neos.Neos/Classes/Service/NodeTypeSchemaBuilder.php +++ b/Neos.Neos/Classes/Service/NodeTypeSchemaBuilder.php @@ -14,9 +14,9 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * Renders the Node Type Schema in a format the User Interface understands; diff --git a/Neos.Neos/Classes/Service/PluginService.php b/Neos.Neos/Classes/Service/PluginService.php index 55f4c9e85d2..bb9a396ac36 100644 --- a/Neos.Neos/Classes/Service/PluginService.php +++ b/Neos.Neos/Classes/Service/PluginService.php @@ -14,16 +14,16 @@ namespace Neos\Neos\Service; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeNames; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeNames; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Context; diff --git a/Neos.Neos/Classes/Service/View/NodeView.php b/Neos.Neos/Classes/Service/View/NodeView.php index 284384331ab..6e8777e34f1 100644 --- a/Neos.Neos/Classes/Service/View/NodeView.php +++ b/Neos.Neos/Classes/Service/View/NodeView.php @@ -14,14 +14,14 @@ namespace Neos\Neos\Service\View; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\Nodes; -use Neos\ContentRepository\Projection\NodeHiddenState\NodeHiddenStateFinder; -use Neos\ContentRepository\Projection\NodeHiddenState\NodeHiddenStateProjection; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraintParser; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes; +use Neos\ContentRepository\Core\Projection\NodeHiddenState\NodeHiddenStateFinder; +use Neos\ContentRepository\Core\Projection\NodeHiddenState\NodeHiddenStateProjection; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraintParser; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeConstraints; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Log\Utility\LogEnvironment; diff --git a/Neos.Neos/Classes/TypeConverter/NodeAddressToStringConverter.php b/Neos.Neos/Classes/TypeConverter/NodeAddressToStringConverter.php index fc7d8138012..aca8e408b4d 100644 --- a/Neos.Neos/Classes/TypeConverter/NodeAddressToStringConverter.php +++ b/Neos.Neos/Classes/TypeConverter/NodeAddressToStringConverter.php @@ -14,7 +14,7 @@ namespace Neos\Neos\TypeConverter; -use Neos\ContentRepository\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; use Neos\Flow\Annotations as Flow; use Neos\Flow\Property\PropertyMappingConfigurationInterface; use Neos\Flow\Property\TypeConverter\AbstractTypeConverter; diff --git a/Neos.Neos/Classes/TypeConverter/NodeConverter.php b/Neos.Neos/Classes/TypeConverter/NodeConverter.php index d283705e6ca..b32c281ba02 100644 --- a/Neos.Neos/Classes/TypeConverter/NodeConverter.php +++ b/Neos.Neos/Classes/TypeConverter/NodeConverter.php @@ -14,8 +14,8 @@ namespace Neos\Neos\TypeConverter; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Property\PropertyMappingConfigurationInterface; diff --git a/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php b/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php index b39fc2811a7..16b57afd014 100644 --- a/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php +++ b/Neos.Neos/Classes/Utility/NodeUriPathSegmentGenerator.php @@ -15,7 +15,7 @@ namespace Neos\Neos\Utility; use Behat\Transliterator\Transliterator; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\I18n\Locale; use Neos\Neos\Exception; diff --git a/Neos.Neos/Classes/Validation/Validator/NodeNameValidator.php b/Neos.Neos/Classes/Validation/Validator/NodeNameValidator.php index 746e72efdfe..1143e094fcd 100644 --- a/Neos.Neos/Classes/Validation/Validator/NodeNameValidator.php +++ b/Neos.Neos/Classes/Validation/Validator/NodeNameValidator.php @@ -14,7 +14,7 @@ namespace Neos\Neos\Validation\Validator; -use Neos\ContentRepository\SharedModel\Node\NodeName; +use Neos\ContentRepository\Core\SharedModel\Node\NodeName; use Neos\Flow\Validation\Validator\RegularExpressionValidator; /** diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php index a045fb37632..7bb720aa716 100644 --- a/Neos.Neos/Classes/View/FusionExceptionView.php +++ b/Neos.Neos/Classes/View/FusionExceptionView.php @@ -15,10 +15,10 @@ namespace Neos\Neos\View; use GuzzleHttp\Psr7\ServerRequest; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Core\Bootstrap; diff --git a/Neos.Neos/Classes/View/FusionExceptionViewInternals.php b/Neos.Neos/Classes/View/FusionExceptionViewInternals.php index fd49bbfd295..afc4cbd176b 100644 --- a/Neos.Neos/Classes/View/FusionExceptionViewInternals.php +++ b/Neos.Neos/Classes/View/FusionExceptionViewInternals.php @@ -14,9 +14,9 @@ namespace Neos\Neos\View; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\DimensionSpace\InterDimensionalVariationGraph; -use Neos\ContentRepository\Factory\ContentRepositoryServiceInterface; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface; /** * @deprecated really un-nice :D diff --git a/Neos.Neos/Classes/View/FusionExceptionViewInternalsFactory.php b/Neos.Neos/Classes/View/FusionExceptionViewInternalsFactory.php index ffcd21d4300..37a9d40b093 100644 --- a/Neos.Neos/Classes/View/FusionExceptionViewInternalsFactory.php +++ b/Neos.Neos/Classes/View/FusionExceptionViewInternalsFactory.php @@ -14,8 +14,8 @@ namespace Neos\Neos\View; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryDependencies; -use Neos\ContentRepository\Factory\ContentRepositoryServiceFactoryInterface; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies; +use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface; /** * @implements ContentRepositoryServiceFactoryInterface diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php index 1e85f541414..cd3ec0ba8a5 100644 --- a/Neos.Neos/Classes/View/FusionView.php +++ b/Neos.Neos/Classes/View/FusionView.php @@ -15,7 +15,7 @@ namespace Neos\Neos\View; use GuzzleHttp\Psr7\Message; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Mvc\View\AbstractView; diff --git a/Neos.Neos/Classes/View/FusionViewI18nTrait.php b/Neos.Neos/Classes/View/FusionViewI18nTrait.php index f25f5dc4617..f751f8977e6 100644 --- a/Neos.Neos/Classes/View/FusionViewI18nTrait.php +++ b/Neos.Neos/Classes/View/FusionViewI18nTrait.php @@ -14,7 +14,7 @@ namespace Neos\Neos\View; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\Flow\Annotations as Flow; use Neos\Flow\I18n\Exception\InvalidLocaleIdentifierException; use Neos\Flow\I18n\Locale; diff --git a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php index ef1454c0ec3..98dc854a9b5 100644 --- a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Backend; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper; diff --git a/Neos.Neos/Classes/ViewHelpers/ContentElement/EditableViewHelper.php b/Neos.Neos/Classes/ViewHelpers/ContentElement/EditableViewHelper.php index 962ba8e3870..9919d194c3c 100644 --- a/Neos.Neos/Classes/ViewHelpers/ContentElement/EditableViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/ContentElement/EditableViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\ContentElement; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManagerInterface; use Neos\FluidAdaptor\Core\ViewHelper\AbstractTagBasedViewHelper; diff --git a/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php b/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php index 2051424f317..364c276e3ff 100644 --- a/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/ContentElement/WrapViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\ContentElement; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper; use Neos\FluidAdaptor\Core\ViewHelper\Exception as ViewHelperException; diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php index bf3ac10c6a8..6814cb3c39f 100644 --- a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php @@ -14,13 +14,13 @@ namespace Neos\Neos\ViewHelpers\Link; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Http\Exception as HttpException; diff --git a/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php index 1a79a50d38f..cb0a9bdbc65 100644 --- a/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Node/ClosestDocumentViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Node; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Annotations as Flow; use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper; use Neos\Neos\Ui\ContentRepository\Service\NodeService; diff --git a/Neos.Neos/Classes/ViewHelpers/Rendering/AbstractRenderingStateViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Rendering/AbstractRenderingStateViewHelper.php index e6011c4b3db..e2f65d1b06a 100644 --- a/Neos.Neos/Classes/ViewHelpers/Rendering/AbstractRenderingStateViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Rendering/AbstractRenderingStateViewHelper.php @@ -14,9 +14,9 @@ namespace Neos\Neos\ViewHelpers\Rendering; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Security\Authorization\PrivilegeManager; diff --git a/Neos.Neos/Classes/ViewHelpers/Rendering/InBackendViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Rendering/InBackendViewHelper.php index dd13d179321..e7565bcdf60 100644 --- a/Neos.Neos/Classes/ViewHelpers/Rendering/InBackendViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Rendering/InBackendViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Rendering; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * ViewHelper to find out if Neos is rendering the backend. diff --git a/Neos.Neos/Classes/ViewHelpers/Rendering/InEditModeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Rendering/InEditModeViewHelper.php index f08e2bcaef1..6d4f9ece5c1 100644 --- a/Neos.Neos/Classes/ViewHelpers/Rendering/InEditModeViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Rendering/InEditModeViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Rendering; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * ViewHelper to find out if Neos is rendering an edit mode. diff --git a/Neos.Neos/Classes/ViewHelpers/Rendering/InPreviewModeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Rendering/InPreviewModeViewHelper.php index a903cd02c22..480bb4d30f8 100644 --- a/Neos.Neos/Classes/ViewHelpers/Rendering/InPreviewModeViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Rendering/InPreviewModeViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Rendering; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * ViewHelper to find out if Neos is rendering a preview mode. diff --git a/Neos.Neos/Classes/ViewHelpers/Rendering/LiveViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Rendering/LiveViewHelper.php index 4e160fff3d5..597221bd3ad 100644 --- a/Neos.Neos/Classes/ViewHelpers/Rendering/LiveViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Rendering/LiveViewHelper.php @@ -14,7 +14,7 @@ namespace Neos\Neos\ViewHelpers\Rendering; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; /** * ViewHelper to find out if Neos is rendering the live website. diff --git a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php index 0edd9b1c399..36f8a3ca557 100644 --- a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php +++ b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php @@ -14,13 +14,13 @@ namespace Neos\Neos\ViewHelpers\Uri; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodePath; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodePath; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; use Neos\Flow\Annotations as Flow; use Neos\Flow\Http\Exception as HttpException; diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php index efc4956a27a..69916ad8e00 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/BrowserTrait.php @@ -27,7 +27,7 @@ trait BrowserTrait * @return \Neos\Flow\ObjectManagement\ObjectManagerInterface */ abstract protected function getObjectManager(); - abstract protected function getCurrentNodeAddress(string $alias = null): \Neos\ContentRepository\SharedModel\NodeAddress; + abstract protected function getCurrentNodeAddress(string $alias = null): \Neos\ContentRepository\Core\SharedModel\NodeAddress; /** * @var \Neos\Flow\Http\Client\Browser @@ -136,7 +136,7 @@ protected function replacePlaceholders($nodeAddressString) { $nodeAddresses = $this->getCurrentNodeAddresses(); foreach ($nodeAddresses as $alias => $nodeAddress) { - /* @var $nodeAddress \Neos\ContentRepository\SharedModel\NodeAddress */ + /* @var $nodeAddress \Neos\ContentRepository\Core\SharedModel\NodeAddress */ $nodeAddressString = str_replace($alias, $nodeAddress->serializeForUri(), $nodeAddressString); } diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FlowQueryTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FlowQueryTrait.php index c958b51aca1..a7c10a695b8 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FlowQueryTrait.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FlowQueryTrait.php @@ -11,11 +11,11 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; use Neos\ContentRepository\NodeAccess\FlowQueryOperations\FindOperation; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\ContentRepository\Tests\Behavior\Features\Helper\ContentGraphs; use Neos\Eel\FlowQuery\FlowQuery; use PHPUnit\Framework\Assert; @@ -93,7 +93,7 @@ public function iExpectANodeIdentifiedByAggregateIdentifierToExistInTheFlowQuery $expectedNodeAggregateIdentifier = NodeAggregateIdentifier::fromString($serializedExpectedNodeAggregateIdentifier); $expectationMet = false; foreach ($this->currentFlowQuery->getContext() as $node) { - /** @var \Neos\ContentRepository\Projection\ContentGraph\Node $node */ + /** @var \Neos\ContentRepository\Core\Projection\ContentGraph\Node $node */ if ($node->nodeAggregateIdentifier->equals($expectedNodeAggregateIdentifier)) { $expectationMet = true; break; diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php index a480b1347cf..3a908e02473 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/RoutingTrait.php @@ -17,14 +17,14 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use GuzzleHttp\Psr7\Uri; -use Neos\ContentRepository\ContentRepository; -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\NodeAddress; -use Neos\ContentRepository\SharedModel\NodeAddressFactory; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; -use Neos\ContentRepository\SharedModel\Workspace\WorkspaceName; +use Neos\ContentRepository\Core\ContentRepository; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\NodeAddress; +use Neos\ContentRepository\Core\SharedModel\NodeAddressFactory; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\Flow\Http\ServerRequestAttributes; use Neos\Flow\Mvc\ActionRequest; use Neos\Flow\Mvc\Exception\NoMatchingRouteException; diff --git a/Neos.Neos/Tests/Functional/AbstractNodeTest.php b/Neos.Neos/Tests/Functional/AbstractNodeTest.php index 13b21321d44..b41c7069dff 100644 --- a/Neos.Neos/Tests/Functional/AbstractNodeTest.php +++ b/Neos.Neos/Tests/Functional/AbstractNodeTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Property\PropertyMapper; use Neos\Flow\Tests\FunctionalTestCase; use Neos\Media\TypeConverter\AssetInterfaceConverter; diff --git a/Neos.Neos/Tests/Functional/Domain/Service/Fixtures/TestablePrototypeGenerator.php b/Neos.Neos/Tests/Functional/Domain/Service/Fixtures/TestablePrototypeGenerator.php index e936d7410db..a39d0b23b6c 100644 --- a/Neos.Neos/Tests/Functional/Domain/Service/Fixtures/TestablePrototypeGenerator.php +++ b/Neos.Neos/Tests/Functional/Domain/Service/Fixtures/TestablePrototypeGenerator.php @@ -13,7 +13,7 @@ use Neos\Flow\Annotations as Flow; use Neos\Neos\Domain\Service\DefaultPrototypeGeneratorInterface; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; /** * A testable prototype generator diff --git a/Neos.Neos/Tests/Functional/Domain/Service/FusionServiceTest.php b/Neos.Neos/Tests/Functional/Domain/Service/FusionServiceTest.php index bbdb24fd0f9..c80eeee8035 100644 --- a/Neos.Neos/Tests/Functional/Domain/Service/FusionServiceTest.php +++ b/Neos.Neos/Tests/Functional/Domain/Service/FusionServiceTest.php @@ -18,7 +18,7 @@ use Neos\Flow\Tests\FunctionalTestCase; use Neos\Neos\Domain\Service\FusionService; use Neos\Neos\Tests\Functional\Domain\Service\Fixtures\TestablePrototypeGenerator; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; /** * Tests for the TypoFusionService diff --git a/Neos.Neos/Tests/Functional/Fusion/Cache/ContentCacheFlusherTest.php b/Neos.Neos/Tests/Functional/Fusion/Cache/ContentCacheFlusherTest.php index 2c4eada6a63..72ae26d3aba 100644 --- a/Neos.Neos/Tests/Functional/Fusion/Cache/ContentCacheFlusherTest.php +++ b/Neos.Neos/Tests/Functional/Fusion/Cache/ContentCacheFlusherTest.php @@ -13,7 +13,7 @@ use Neos\ContentRepository\Domain\Model\Workspace; use Neos\ContentRepository\Domain\Repository\WorkspaceRepository; -use Neos\ContentRepository\Projection\Workspace\WorkspaceFinder; +use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder; use Neos\Flow\Tests\FunctionalTestCase; use Neos\Neos\Fusion\Cache\ContentCacheFlusher; use Neos\Neos\Fusion\Helper\CachingHelper; diff --git a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php index aa155efcda7..51830947b99 100644 --- a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php +++ b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php @@ -11,18 +11,18 @@ * source code. */ -use Neos\ContentRepository\DimensionSpace\DimensionSpacePoint; -use Neos\ContentRepository\Factory\ContentRepositoryIdentifier; -use Neos\ContentRepository\Projection\ContentGraph\ContentSubgraphIdentity; -use Neos\ContentRepository\Projection\ContentGraph\Node; -use Neos\ContentRepository\Projection\ContentGraph\PropertyCollectionInterface; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateClassification; -use Neos\ContentRepository\SharedModel\Node\NodeAggregateIdentifier; -use Neos\ContentRepository\SharedModel\Node\OriginDimensionSpacePoint; -use Neos\ContentRepository\SharedModel\NodeType\NodeType; -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeName; -use Neos\ContentRepository\Projection\ContentGraph\VisibilityConstraints; -use Neos\ContentRepository\SharedModel\Workspace\ContentStreamIdentifier; +use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; +use Neos\ContentRepository\Core\Factory\ContentRepositoryIdentifier; +use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphIdentity; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollectionInterface; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification; +use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIdentifier; +use Neos\ContentRepository\Core\SharedModel\Node\OriginDimensionSpacePoint; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeType; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeName; +use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; +use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamIdentifier; use Neos\Fusion\Tests\Functional\FusionObjects\AbstractFusionObjectTest; use PHPUnit\Framework\MockObject\MockObject; diff --git a/Neos.Neos/Tests/Functional/Service/NodeTypeSchemaBuilderTest.php b/Neos.Neos/Tests/Functional/Service/NodeTypeSchemaBuilderTest.php index 94c5181ba1b..315718475ca 100644 --- a/Neos.Neos/Tests/Functional/Service/NodeTypeSchemaBuilderTest.php +++ b/Neos.Neos/Tests/Functional/Service/NodeTypeSchemaBuilderTest.php @@ -11,7 +11,7 @@ * source code. */ -use Neos\ContentRepository\SharedModel\NodeType\NodeTypeManager; +use Neos\ContentRepository\Core\SharedModel\NodeType\NodeTypeManager; use Neos\Flow\Configuration\ConfigurationManager; use Neos\Flow\Tests\FunctionalTestCase; use Neos\Neos\Service\NodeTypeSchemaBuilder; diff --git a/Neos.Neos/Tests/Unit/Aspects/FusionCachingAspectTest.php b/Neos.Neos/Tests/Unit/Aspects/FusionCachingAspectTest.php index 6ecc2cae965..ac0ff1f0871 100644 --- a/Neos.Neos/Tests/Unit/Aspects/FusionCachingAspectTest.php +++ b/Neos.Neos/Tests/Unit/Aspects/FusionCachingAspectTest.php @@ -12,7 +12,7 @@ */ use Neos\Cache\Frontend\VariableFrontend; -use Neos\ContentRepository\Projection\ContentGraph\Node; +use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\Flow\Aop\Advice\AdviceChain; use Neos\Flow\Aop\JoinPointInterface; use Neos\Flow\Tests\UnitTestCase; diff --git a/Neos.Neos/Tests/Unit/Domain/NodeTypePostprocessor/CreationDialogPostprocessorTest.php b/Neos.Neos/Tests/Unit/Domain/NodeTypePostprocessor/CreationDialogPostprocessorTest.php index ec6af3acbb9..1e36cef4efa 100644 --- a/Neos.Neos/Tests/Unit/Domain/NodeTypePostprocessor/CreationDialogPostprocessorTest.php +++ b/Neos.Neos/Tests/Unit/Domain/NodeTypePostprocessor/CreationDialogPostprocessorTest.php @@ -1,7 +1,7 @@