From 4fadc92685826093a644d1020341d7d9b199eed6 Mon Sep 17 00:00:00 2001 From: Sebastian Kurfuerst Date: Sun, 28 Aug 2022 12:23:24 +0200 Subject: [PATCH] replace remaining Neos.ContentRepository occurences --- .codeclimate.yml | 2 +- .composer.json | 6 +- .../Features/Bootstrap/FeatureContext.php | 58 +++++++++---------- .../Behavior/Bootstrap/FeatureContext.php | 52 ++++++++--------- .../docker-compose-full.yml | 2 +- .../Functional/Command/BehatTestHelper.php | 8 +-- .../Command/LegacyBehatTestHelper.php | 8 +-- .../Behavior/Bootstrap/FeatureContext.php | 2 +- .../Features/Bootstrap/FeatureContext.php | 30 +++++----- .../Functional/Command/BehatTestHelper.php | 8 +-- phpstan.neon | 2 +- 11 files changed, 89 insertions(+), 89 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 0f17f021f3b..33cb7839fe8 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -6,7 +6,7 @@ exclude_paths: - 'Neos.Media.Browser/Tests/*' - 'Neos.SiteKickstarter/Tests/*' - 'Neos.NodeTypes/Tests/*' - - 'Neos.ContentRepository/Tests/*' + - 'Neos.ContentRepository.Core/Tests/*' - 'Neos.Fusion/Tests/*' - 'Neos.Diff/Tests/*' - 'Neos.Neos/Migrations/*' diff --git a/.composer.json b/.composer.json index b32638fbde0..72263a27dba 100644 --- a/.composer.json +++ b/.composer.json @@ -12,18 +12,18 @@ "suggest": { }, "scripts": { - "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes", + "lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository.Core/Classes ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes", "lint:phpstan": "../../bin/phpstan analyse", "lint": [ "@lint:phpcs", "@lint:phpstan" ], "test:unit": [ - "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml Neos.ContentRepository/Tests/Unit", + "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml Neos.ContentRepository.Core/Tests/Unit", "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml Neos.ContentRepositoryRegistry/Tests/Unit" ], "test:functional": [ - "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository/Tests/Functional" + "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.Core/Tests/Functional" ], "test:behavioral": [ "mkdir -p ../../Build/Behat/; cp -R Neos.ContentRepository.BehavioralTests/DistributionBehatTemplate/* ../../Build/Behat/; cd ../../Build/Behat/; composer install; cd ../../Packages/Neos", diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php index 849a019cf9c..15f53852b52 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php @@ -12,37 +12,37 @@ */ require_once(__DIR__ . '/../../../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); require_once(__DIR__ . '/../../../../../../Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); require_once(__DIR__ . '/ProjectionIntegrityViolationDetectionTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); use Neos\Behat\Tests\Behat\FlowContextTrait; use Neos\ContentGraph\DoctrineDbalAdapter\Tests\Behavior\Features\Bootstrap\ProjectionIntegrityViolationDetectionTrait; diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php index fedd75379fb..5e81040052f 100644 --- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php +++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php @@ -12,32 +12,32 @@ */ require_once(__DIR__ . '/../../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/ContentStreamForking.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCopying.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeCreation.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeDisabling.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeModification.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeMove.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeReferencing.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRemoval.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeRenaming.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeTypeChange.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/NodeVariation.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); require_once(__DIR__ . '/../../../../../Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); require_once(__DIR__ . '/../../../../../Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php'); diff --git a/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml b/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml index b063ac7eeff..c22bd28f30f 100644 --- a/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml +++ b/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml @@ -34,7 +34,7 @@ services: # if you want to edit certain folders directly, mount them here: - ./Packages/Neos/Neos.ContentRepository.BehavioralTests/:/app/Packages/Neos/Neos.ContentRepository.BehavioralTests/:cached - - ./Packages/Neos/Neos.ContentRepository/Tests/Behavior/:/app/Packages/Neos/Neos.ContentRepository/Tests/Behavior/:cached + - ./Packages/Neos/Neos.ContentRepository.Core/Tests/Behavior/:/app/Packages/Neos/Neos.ContentRepository.Core/Tests/Behavior/:cached - ./Packages/Neos/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/:/app/Packages/Neos/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/:cached ports: diff --git a/Neos.ContentRepository.Core/Tests/Functional/Command/BehatTestHelper.php b/Neos.ContentRepository.Core/Tests/Functional/Command/BehatTestHelper.php index 948a174200b..667a86f2cee 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Command/BehatTestHelper.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Command/BehatTestHelper.php @@ -15,11 +15,11 @@ require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php'); if (file_exists(FLOW_PATH_PACKAGES . '/Neos')) { - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } else { - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\NodeAuthorizationTrait; diff --git a/Neos.ContentRepository.Core/Tests/Functional/Command/LegacyBehatTestHelper.php b/Neos.ContentRepository.Core/Tests/Functional/Command/LegacyBehatTestHelper.php index 2a7302499a5..05e8ee59e2f 100644 --- a/Neos.ContentRepository.Core/Tests/Functional/Command/LegacyBehatTestHelper.php +++ b/Neos.ContentRepository.Core/Tests/Functional/Command/LegacyBehatTestHelper.php @@ -14,11 +14,11 @@ require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php'); if (file_exists(FLOW_PATH_PACKAGES . '/Neos')) { - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } else { - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } use Neos\ContentRepository\Tests\Behavior\Features\Bootstrap\NodeAuthorizationTrait; diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php index 4344f62a267..e3b7a7f0f23 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php @@ -2,7 +2,7 @@ declare(strict_types=1); require_once(__DIR__ . '/../../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php'); -require_once(__DIR__ . '/../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); use Behat\Behat\Context\Context; use Behat\Gherkin\Node\PyStringNode; diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php index 35c19c23525..1bb42a68a59 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php @@ -41,25 +41,25 @@ use Neos\Utility\ObjectAccess; use PHPUnit\Framework\Assert; -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentSubgraphTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/CurrentUserTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeAggregateTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectedNodeTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/MigrationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/StructureAdjustmentsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/ReadModelInstantiationTrait.php'); require_once(__DIR__ . '/../../../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php'); require_once(__DIR__ . '/../../../../../../Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); require_once(__DIR__ . '/../../../../../../Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); -require_once(__DIR__ . '/../../../../../Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); +require_once(__DIR__ . '/../../../../../Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/EventSourcedTrait.php'); require_once(__DIR__ . '/HistoryDefinitionsTrait.php'); diff --git a/Neos.Neos/Tests/Functional/Command/BehatTestHelper.php b/Neos.Neos/Tests/Functional/Command/BehatTestHelper.php index bf71b0b4636..bbee146be42 100644 --- a/Neos.Neos/Tests/Functional/Command/BehatTestHelper.php +++ b/Neos.Neos/Tests/Functional/Command/BehatTestHelper.php @@ -14,11 +14,11 @@ require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/IsolatedBehatStepsTrait.php'); require_once(FLOW_PATH_PACKAGES . '/Framework/Neos.Flow/Tests/Behavior/Features/Bootstrap/SecurityOperationsTrait.php'); if (file_exists(FLOW_PATH_PACKAGES . '/Neos')) { - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Neos/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } else { - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); - require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeOperationsTrait.php'); + require_once(FLOW_PATH_PACKAGES . '/Application/Neos.ContentRepository.Core/Tests/Behavior/Features/Bootstrap/NodeAuthorizationTrait.php'); } use Neos\Flow\Tests\Behavior\Features\Bootstrap\SecurityOperationsTrait; diff --git a/phpstan.neon b/phpstan.neon index 9fae3159c38..7cf05da6c4e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -4,7 +4,7 @@ parameters: - Neos.ContentGraph.DoctrineDbalAdapter/src - Neos.ContentGraph.PostgreSQLAdapter/src - Neos.ContentRepository.BehavioralTests/Classes - - Neos.ContentRepository/src + - Neos.ContentRepository.Core/Classes - Neos.EventSourcedContentRepository.LegacyApi/Classes - Neos.ContentRepository.Security/Classes - Neos.Neos/Classes