From 80f6a9bc520d41009626594ef9fe941068dcbe21 Mon Sep 17 00:00:00 2001
From: batabana <36864084+batabana@users.noreply.github.com>
Date: Thu, 26 Oct 2023 09:52:35 +0200
Subject: [PATCH] TASK: neos 9 compatibility
---
Configuration/Routes.yaml | 2 +-
Resources/Private/Fusion/Collection.fusion | 4 ++--
Resources/Private/Fusion/List.fusion | 2 +-
Resources/Private/Fusion/PaginatedCollection.fusion | 8 ++++----
Resources/Private/Fusion/Pagination.fusion | 4 ++--
composer.json | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Configuration/Routes.yaml b/Configuration/Routes.yaml
index de915c8..fd7f7d1 100644
--- a/Configuration/Routes.yaml
+++ b/Configuration/Routes.yaml
@@ -8,5 +8,5 @@
'@action': 'show'
routeParts:
node:
- handler: Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface
+ handler: Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface
appendExceedingArguments: TRUE
diff --git a/Resources/Private/Fusion/Collection.fusion b/Resources/Private/Fusion/Collection.fusion
index 7925b81..c6d913f 100644
--- a/Resources/Private/Fusion/Collection.fusion
+++ b/Resources/Private/Fusion/Collection.fusion
@@ -1,10 +1,10 @@
-prototype(Flowpack.Listable:Collection) < prototype(Neos.Fusion:Collection) {
+prototype(Flowpack.Listable:Collection) < prototype(Neos.Fusion:Loop) {
listClass = ''
itemClass = ''
@context.itemClass = ${this.itemClass}
@process.tmpl = ${'
'}
- collection = 'must-be-set'
+ items = 'must-be-set'
itemName = 'node'
iterationName = 'iteration'
itemRenderer = Flowpack.Listable:ContentCaseShort
diff --git a/Resources/Private/Fusion/List.fusion b/Resources/Private/Fusion/List.fusion
index 03a756b..474a224 100644
--- a/Resources/Private/Fusion/List.fusion
+++ b/Resources/Private/Fusion/List.fusion
@@ -15,7 +15,7 @@ prototype(Flowpack.Listable:List) < prototype(Neos.Fusion:Component) {
@if.listNotEmpty = ${props.list != null}
attributes.class = ${props.wrapClass}
- content = Neos.Fusion:Array {
+ content = Neos.Fusion:Join {
listTitleTag = Neos.Fusion:Tag {
tagName = 'h2'
attributes.class = ${props.listTitleClass}
diff --git a/Resources/Private/Fusion/PaginatedCollection.fusion b/Resources/Private/Fusion/PaginatedCollection.fusion
index fbfb039..8505fb3 100644
--- a/Resources/Private/Fusion/PaginatedCollection.fusion
+++ b/Resources/Private/Fusion/PaginatedCollection.fusion
@@ -9,8 +9,8 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone
showPreviousNextLinks = false
listRenderer = 'Flowpack.Listable:Collection'
- renderer = Neos.Fusion:Array {
- @context.data = Neos.Fusion:RawArray {
+ renderer = Neos.Fusion:Join {
+ @context.data = Neos.Fusion:DataStructure {
collection = Neos.Fusion:Case {
@context.limit = ${props.currentPage * props.itemsPerPage}
@context.offset = ${(props.currentPage - 1) * props.itemsPerPage}
@@ -33,7 +33,7 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone
list = Neos.Fusion:Renderer {
type = ${props.listRenderer}
- element.collection = ${data.collection}
+ element.items = ${data.collection}
}
pagination = Flowpack.Listable:Pagination {
currentPage = ${props.currentPage}
@@ -47,7 +47,7 @@ prototype(Flowpack.Listable:PaginatedCollection) < prototype(Neos.Fusion:Compone
@cache {
mode = 'dynamic'
entryIdentifier {
- node = ${node}
+ node = ${Neos.Caching.entryIdentifierForNode(node)}
}
entryDiscriminator = ${request.arguments.currentPage}
context {
diff --git a/Resources/Private/Fusion/Pagination.fusion b/Resources/Private/Fusion/Pagination.fusion
index 5a8f41e..eab47a9 100644
--- a/Resources/Private/Fusion/Pagination.fusion
+++ b/Resources/Private/Fusion/Pagination.fusion
@@ -7,7 +7,7 @@ prototype(Flowpack.Listable:PaginationArray) {
showPreviousNextLinks = false
}
-prototype(Flowpack.Listable:PaginationParameters) < prototype(Neos.Fusion:RawArray)
+prototype(Flowpack.Listable:PaginationParameters) < prototype(Neos.Fusion:DataStructure)
prototype(Flowpack.Listable:Pagination) < prototype(Neos.Fusion:Component) {
totalCount = 'to-be-set'
@@ -20,7 +20,7 @@ prototype(Flowpack.Listable:Pagination) < prototype(Neos.Fusion:Component) {
currentItemClass = 'isCurrent'
currentPage = ${request.arguments.currentPage || 1}
- renderer = Neos.Fusion:Collection {
+ renderer = Neos.Fusion:Loop {
@if.paginationNeeded = ${(props.totalCount/props.itemsPerPage) > 1}
@process.tmpl = ${''}
collection = Flowpack.Listable:PaginationArray {
diff --git a/composer.json b/composer.json
index 4ed6277..a99bc23 100755
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
"description": "Tiny extension for listing things",
"license": "MIT",
"require": {
- "neos/neos": "^3.3 || ^4.0 || ^5.0 || ^7.0 || ^8.0 || dev-master"
+ "neos/neos": "^9.0"
},
"autoload": {
"psr-4": {