Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9.0: Support multiple Content Repository instances, decouple CR from Flow #3848

Merged
merged 118 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
e06631b
neos/eventstore package
skurfuerst Jul 22, 2022
4f0aa06
TASK: first step of prototype
skurfuerst Jul 22, 2022
6c6e398
ContentStream Creation/Forking/Removal Commands and Events Simplifica…
skurfuerst Jul 22, 2022
2d56253
DimensionSpaceAdjustment Commands and Events simplification
skurfuerst Jul 22, 2022
e025f80
event and command handler restructurings
skurfuerst Jul 22, 2022
e5e2494
Merge remote-tracking branch 'origin/9.0' into 90-contentrepository
skurfuerst Jul 22, 2022
f128f99
event and command handler restructurings
skurfuerst Jul 22, 2022
deaaf64
NodeAggregateCommandHandler restructuring
skurfuerst Jul 23, 2022
7662615
WIP: WorkspaceCommandHandler restructuring
skurfuerst Jul 23, 2022
e9114f0
Update EventNormalizer
skurfuerst Jul 23, 2022
1d1ba08
first version of ContentRepositoryFactory
skurfuerst Jul 24, 2022
f01ed8a
adapt ContentGraphProjection to new Projection API; add tableNamePref…
skurfuerst Jul 24, 2022
ba0fc6c
fix TableNamePrefix in ContentSubgraph
skurfuerst Jul 24, 2022
7229a1f
wiring of ContentGraphProjection
skurfuerst Jul 24, 2022
5957a1f
ContentStreamProjection
skurfuerst Jul 24, 2022
1ced4ef
WorkspaceProjection
skurfuerst Jul 24, 2022
b67dbbe
ChangeProjection
skurfuerst Jul 24, 2022
4359b4a
Factory WIP
skurfuerst Jul 24, 2022
7a23f34
TASK: add eventstore-doctrineadapter dependency
skurfuerst Jul 24, 2022
0f9edd6
update composer.json
skurfuerst Jul 24, 2022
99399ab
build checkpoint storage properly
skurfuerst Jul 24, 2022
c3c111d
Merge branch '90-contentrepository' of https://github.com/neos/neos-d…
skurfuerst Jul 24, 2022
f2bf9e9
always load ContentGraph through ContentRepository in CommandHandlers
skurfuerst Jul 24, 2022
3fdf44a
centralize readSideMemoryCacheManager in NodeAggregateCommandHandler
skurfuerst Jul 24, 2022
3eb4bb4
NodeDuplicationCommandHandler
skurfuerst Jul 24, 2022
da9c461
Merge remote-tracking branch 'origin/9.0' into 90-contentrepository
skurfuerst Jul 25, 2022
442fd79
use match in NodeAggregateCommandHandler
skurfuerst Jul 25, 2022
683c101
introduce eventPersister and make workspaceCommandHandler work concep…
skurfuerst Jul 25, 2022
bb97b6a
FEATURE: extensible projection factory
skurfuerst Jul 25, 2022
4644577
remove ProjectionCatchUpTriggerFactoryInterface
skurfuerst Jul 25, 2022
3d877eb
FEATURE: Structure adjustment
skurfuerst Jul 25, 2022
7dc2120
remove ThrowableStorage dependency
skurfuerst Jul 25, 2022
0cba793
fix API in ContentRepositoryFactory to depend on ContentDimensionSour…
skurfuerst Jul 25, 2022
75b8570
Neos\ContentRepository\Projection\Content -> Neos\ContentRepository\P…
skurfuerst Jul 25, 2022
ad75157
cleanup package keys; remove legacy factories
skurfuerst Jul 25, 2022
6702028
TASK: update neos.neos dependency
skurfuerst Jul 25, 2022
e0e2176
TASK: Clean up composer names
skurfuerst Jul 25, 2022
ca04325
Refactor Node Identity -> Node::getSubgraphIdentity()->...
skurfuerst Jul 26, 2022
e6bdac6
refactored DocumentUriPathProjection; add factories in ContentReposit…
skurfuerst Jul 26, 2022
2371e97
FEATURE: Introduce ContentRepositoryServices, and extract StructureAd…
skurfuerst Jul 26, 2022
a358979
FEATURE: extract NodeMigration to extra service
skurfuerst Jul 26, 2022
7db8fa5
create CR Services for ContentStreamPruner and WorkspaceMaintenanceSe…
skurfuerst Jul 26, 2022
95e72f7
remove ReadSideCacheManager; auto-clear caches when nodes are publish…
skurfuerst Jul 27, 2022
3781c16
fix some namespaces
skurfuerst Jul 27, 2022
a539168
remove leftover classes in CR
skurfuerst Jul 27, 2022
dd03d2f
CatchUpHandlerFactory
skurfuerst Jul 27, 2022
a7f85ef
fix command controllers
skurfuerst Jul 30, 2022
0baacaa
adjust lots of Neos APIs to work basically with multiple CRs
skurfuerst Jul 30, 2022
0f0d719
adjust lots of Neos APIs to work basically with multiple CRs
skurfuerst Jul 31, 2022
592abb9
adjust lots of Neos UI APIs to work basically with multiple CRs; conv…
skurfuerst Aug 1, 2022
1fbfb17
REFACTOR: remove ContentStreamRepository and ContentStream object; ad…
skurfuerst Aug 1, 2022
194233b
CatchUpHandler -> CatchUpHook; add CatchUpHook::onBeforeBatchCompleted
skurfuerst Aug 1, 2022
3cabee1
remove non-needed files
skurfuerst Aug 1, 2022
cde563c
remove TODO after discussion
skurfuerst Aug 1, 2022
fd2131c
add comments for some dirty code ;) maybe we'll get rid of it soon
skurfuerst Aug 1, 2022
0c54783
make NodeTypeSchemaBuilder a normal class and no ContentRepositorySer…
skurfuerst Aug 1, 2022
ab8771c
REFACTOR: NodeTypeConstraintParser::create should accept a NodeTypeMa…
skurfuerst Aug 1, 2022
716345b
TASK: disable ContentRepositoryMigrateCommandController, will be re-e…
skurfuerst Aug 1, 2022
fe3abae
TASK: clearly distinguish between Content Repository Settings and Con…
skurfuerst Aug 1, 2022
51b6d6e
REFACTOR: make content cache flushing synchronous and part of blocking
skurfuerst Aug 2, 2022
6a7c539
fix Neos.Fusion:GlobalCacheIdentifiers
skurfuerst Aug 2, 2022
3e00d46
fix FlowQuery Operations
skurfuerst Aug 2, 2022
0a3c6e5
REFACTOR: remove NodeAccessorInterface::getContentStreamIdentifier an…
skurfuerst Aug 2, 2022
3bd70d8
disable ContentRepositoryExportService, as it will change anyways wit…
skurfuerst Aug 2, 2022
c5c5a32
fix EditorContentStreamZookeeper
skurfuerst Aug 2, 2022
5a3da6a
fix Neos.ContentRepository.Security
skurfuerst Aug 2, 2022
de96d6a
move ContentRepositoryIdentifier to correct namespace
skurfuerst Aug 2, 2022
9ab6bb4
update composer.json to include all packages
skurfuerst Aug 2, 2022
575baa7
remove leftover (old) Behat tests which won't work anymore
skurfuerst Aug 2, 2022
0046abd
improve error messages in ContentRepositoryRegistry if configuration …
skurfuerst Aug 2, 2022
32c3f40
initial version of adjusted Behat tests (not working yet)
skurfuerst Aug 2, 2022
399f7c1
remove obsolete classes
skurfuerst Aug 2, 2022
38c2964
testcases start to run (still slowly ;) )
skurfuerst Aug 2, 2022
b16ce59
quite some testcases start to run
skurfuerst Aug 2, 2022
122b4a0
improve test speed by not resetting the DB with @fixtures anymore
skurfuerst Aug 2, 2022
aedebbe
ensure we always use CreateRootWorkspace in testcases instead of Root…
skurfuerst Aug 3, 2022
6c665ce
REFACTOR: NodeAggregateWasMoved PHP 8.1
skurfuerst Aug 3, 2022
9a72b3d
BUGFIX: ContentStreamFinder::findVersionForContentStream
skurfuerst Aug 3, 2022
fd37dc8
replace direct remaining CommandHandler calls in testcases by calls t…
skurfuerst Aug 3, 2022
b812b5b
REFACTOR: WorkspaceWasCreated to PHP 8.1 (and explicit serializers/de…
skurfuerst Aug 3, 2022
dc192b4
REFACTOR: WorkspaceWasDiscarded to PHP 8.1 (and explicit serializers/…
skurfuerst Aug 3, 2022
22b0819
REFACTOR: WorkspaceWasPartiallyDiscarded to PHP 8.1 (and explicit ser…
skurfuerst Aug 3, 2022
d86015f
REFACTOR: WorkspaceWasPartiallyPublished to PHP 8.1 (and explicit ser…
skurfuerst Aug 3, 2022
0276aa0
REFACTOR: WorkspaceWasPublished to PHP 8.1 (and explicit serializers/…
skurfuerst Aug 3, 2022
5b5da7f
REFACTOR: WorkspaceRebaseFailed / WorkspaceWasRebased to PHP 8.1 (and…
skurfuerst Aug 3, 2022
b1d0a5f
improve docs on WorkspaceWasCreated and RootWorkspaceWasCreated
skurfuerst Aug 3, 2022
aca6225
fix some testcases
skurfuerst Aug 3, 2022
4af60cc
fix StructureAdjustment test cases
skurfuerst Aug 3, 2022
fcccf43
fix ProjectionIntegrityViolationDetection test cases
skurfuerst Aug 3, 2022
f2c66e0
BUGFIX: fix PublishIndividualNodesFromWorkspace and DiscardIndividual…
skurfuerst Aug 3, 2022
206ac96
BUGFIX: fix node migrations to not rely on PSR ContainerInterface
skurfuerst Aug 4, 2022
7c187f8
BUGFIX: activate ProxyAwareObjectNormalizer
skurfuerst Aug 4, 2022
3b629cb
TASK: run phpcs (auto-fix issues)
skurfuerst Aug 4, 2022
0dea20e
TASK: PHPCS compatibility
skurfuerst Aug 4, 2022
3a6a697
fix most PHPStan Errors
skurfuerst Aug 4, 2022
b1085b5
Merge remote-tracking branch 'origin/9.0' into 90-contentrepository
skurfuerst Aug 7, 2022
c7027d1
Merge remote-tracking branch 'origin/9.0' into 90-contentrepository
skurfuerst Aug 8, 2022
4095e3c
try to fix composer
skurfuerst Aug 8, 2022
b24d3c1
flow help runs again
skurfuerst Aug 8, 2022
bfcd791
FEATURE: Neos Frontend roughly renders :D :D :D
skurfuerst Aug 9, 2022
3248589
BUGFIX: Dimensions Menu implementation
skurfuerst Aug 10, 2022
f86702d
BUGFIX: fix error message on non registered projection
skurfuerst Aug 10, 2022
021607c
BUGFIX: fix NodeHiddenStateProjection::getState
skurfuerst Aug 10, 2022
abf9c7f
TASK: revert ImageInterface handling, as this is different behavior here
skurfuerst Aug 10, 2022
ece7c24
TASK: register ContentCacheFlusher (but still does not fully work)
skurfuerst Aug 10, 2022
5cc2c50
BUGFIX: fix image uploading
skurfuerst Aug 10, 2022
8b325ad
BUGFIX: fix namespace of NodeVariantSelectionStrategy (fix NodeDeleti…
skurfuerst Aug 10, 2022
7299fdc
BUGFIX: fix workspace module exceptions
skurfuerst Aug 10, 2022
b8a8b14
BUGFIX: fix content cache flushing
skurfuerst Aug 10, 2022
75f55e0
BUGFIX: start implementing missing neos UI routes
skurfuerst Aug 11, 2022
aa61a8b
TASK: improve comments
skurfuerst Aug 11, 2022
b964495
make PHPCS happy
skurfuerst Aug 11, 2022
cc0a938
make PHPStan and PHPCS happy
skurfuerst Aug 11, 2022
2c41788
try to fix CI
skurfuerst Aug 11, 2022
8ef87d9
try to fix CI
skurfuerst Aug 11, 2022
09e0def
try to fix CI
skurfuerst Aug 11, 2022
b17e5ff
try to fix CI
skurfuerst Aug 11, 2022
fee108e
try to fix CI
skurfuerst Aug 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"suggest": {
},
"scripts": {
"lint:phpcs": "../../bin/phpcs --colors --standard=PSR12 ./Neos.ContentGraph.DoctrineDbalAdapter/src ./Neos.ContentGraph.PostgreSQLAdapter/src ./Neos.ContentRepository.BehavioralTests/Classes ./Neos.ContentRepository.DimensionSpace/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.DimensionSpace/src ./Neos.ContentRepository/src ./Neos.EventSourcedContentRepository.LegacyApi/Classes ./Neos.EventSourcedNeosAdjustments/Classes ./Neos.Neos/Classes",
"lint:phpstan": "../../bin/phpstan analyse",
"lint": [
"@lint:phpcs",
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,11 @@ jobs:
git -C ../${{ env.NEOS_FOLDER }} checkout -b build
composer config repositories.neos '{ "type": "path", "url": "../${{ env.NEOS_FOLDER }}", "options": { "symlink": false } }'
composer require --no-update neos/neos-development-collection:"dev-build as ${{ env.NEOS_BRANCH_ALIAS }}"
# workaround for picking https://github.com/neos/Neos.EventSourcing/commit/a2865c36f676c9c8c77f165a842098cb62188e5b
composer require --no-update neos/event-sourcing:"dev-master#a2865c36f676c9c8c77f165a842098cb62188e5b"
# workaround for not-yet-released neos/eventstore packages
composer require --no-update neos/eventstore:"dev-main"
composer require --no-update neos/eventstore-doctrineadapter:"dev-main"
composer require --no-update neos/neos-ui:"dev-90-contentrepository"
composer require --no-update neos/neos-ui-compiled:"dev-9.0 as dev-90-contentrepository"

- name: Cache Composer packages
id: composer-cache
Expand Down
46 changes: 0 additions & 46 deletions .travis_composer.json

This file was deleted.

59 changes: 0 additions & 59 deletions ESCR/.travis_composer.json

This file was deleted.

27 changes: 2 additions & 25 deletions ESCR/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,7 @@ Neos\ContentRepository\Projection\Content\ContentGraphInterface:
```yaml
# Configuration/Settings.yaml

Neos:
EventSourcedContentRepository:
unstableInternalWillChangeLater:
testing:
projectorsToBeReset:
'Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjector': true
activeContentGraphs:
'Postgres': 'Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\ContentHypergraph'
projection:
defaultProjectorsToBeBlocked:
'Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjector': true


```

Expand All @@ -187,20 +177,7 @@ Neos:
```yaml
# Configuration/Settings.yaml

Neos:
EventSourcedContentRepository:
unstableInternalWillChangeLater:
testing:
projectorsToBeReset:
'Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjector': true
'Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\GraphProjector': false
activeContentGraphs:
'Postgres': 'Neos\ContentGraph\PostgreSQLAdapter\Domain\Repository\ContentHypergraph'
'DoctrineDBAL': false
projection:
defaultProjectorsToBeBlocked:
'Neos\ContentGraph\PostgreSQLAdapter\Domain\Projection\HypergraphProjector': true
'Neos\ContentGraph\DoctrineDbalAdapter\Domain\Projection\GraphProjector': false

```


Expand Down
2 changes: 1 addition & 1 deletion Neos.ContentGraph.DoctrineDbalAdapter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Doctrine DBAL database backend for the Neos content graph",
"license": "GPL-3.0+",
"require": {
"neos/content-repository": "*",
"neos/contentrepository": "*",
"doctrine/dbal": "*",
"doctrine/migrations": "*"
},
Expand Down
Loading