From a4d048b35760efe5cd966db06bb894f9d40c2675 Mon Sep 17 00:00:00 2001 From: robinroloff <116283647+robinroloff@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:56:17 +0100 Subject: [PATCH 1/9] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ea5514d..93f7b2d 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "license": "GPL-3.0+", "require": { "php": ">=8.1", - "neos/neos": "~8.2 || 9.0.x-dev ", - "neos/fusion": "~8.2 || 9.0.x-dev", + "neos/neos": "~8.2 || ^9.0 ", + "neos/fusion": "~8.2 || ^9.0 ", "neos/fusion-form": "~2.0 || dev-master", "sitegeist/inspectorgadget": "~2.0", "sitegeist/neos-symfonymailer": "~1.1", From 553da2a02420bb78b15400fda2f1b28eeace472f Mon Sep 17 00:00:00 2001 From: robinroloff <116283647+robinroloff@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:59:59 +0100 Subject: [PATCH 2/9] Update composer.json --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index 93f7b2d..c088e95 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,12 @@ "sitegeist/fusionform-upload": "~1.0", "sitegeist/fusionform-friendlycaptcha": "~1.0" }, + "repositories": { + "inspectorgadget": { + "type": "vcs", + "url": "https://github.com/robinroloff/Sitegeist.InspectorGadget" + } + }, "require-dev": { "phpstan/phpstan": "~1.10.16", "phpunit/phpunit": "~9.6.8", From 95682f12d82c9353417f0a1cc4414830ca7a18c0 Mon Sep 17 00:00:00 2001 From: robinroloff Date: Wed, 29 Jan 2025 17:20:36 +0100 Subject: [PATCH 3/9] declare neos9 compatibility --- composer.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/composer.json b/composer.json index c088e95..1855660 100644 --- a/composer.json +++ b/composer.json @@ -8,17 +8,11 @@ "neos/neos": "~8.2 || ^9.0 ", "neos/fusion": "~8.2 || ^9.0 ", "neos/fusion-form": "~2.0 || dev-master", - "sitegeist/inspectorgadget": "~2.0", + "sitegeist/inspectorgadget": "*", "sitegeist/neos-symfonymailer": "~1.1", "sitegeist/fusionform-upload": "~1.0", "sitegeist/fusionform-friendlycaptcha": "~1.0" }, - "repositories": { - "inspectorgadget": { - "type": "vcs", - "url": "https://github.com/robinroloff/Sitegeist.InspectorGadget" - } - }, "require-dev": { "phpstan/phpstan": "~1.10.16", "phpunit/phpunit": "~9.6.8", From 4a6c238b93a2cbee27dc9bd40f55bfa25b769ec0 Mon Sep 17 00:00:00 2001 From: robinroloff Date: Wed, 29 Jan 2025 17:27:35 +0100 Subject: [PATCH 4/9] Changed fusion in order to adapt to changes to the Node class. --- NodeTypes/Form.fusion | 4 ++-- .../Fusion/Prototypes/ActionCollection.Definition.fusion | 2 +- .../Private/Fusion/Prototypes/ActionCollection.Preview.fusion | 2 +- .../Private/Fusion/Prototypes/FieldCollection.Schema.fusion | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NodeTypes/Form.fusion b/NodeTypes/Form.fusion index be47b5e..f9fb522 100644 --- a/NodeTypes/Form.fusion +++ b/NodeTypes/Form.fusion @@ -15,7 +15,7 @@ prototype(Sitegeist.PaperTiger:Form) < prototype(Neos.Neos:ContentComponent) { renderer = Neos.Fusion:Case { runtimeForm { - condition = ${node.context.live} + condition = ${!renderingMode.isEdit} renderer = Neos.Fusion:Join { anchor = ${props.anchor} @@ -47,7 +47,7 @@ prototype(Sitegeist.PaperTiger:Form) < prototype(Neos.Neos:ContentComponent) { } backend { - condition = ${node.context.inBackend} + condition = ${renderingMode.isEdit} renderer = afx` diff --git a/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion b/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion index 80302b0..0d18ecb 100644 --- a/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion +++ b/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion @@ -18,6 +18,6 @@ prototype(Sitegeist.PaperTiger:ActionCollection.Definition.ContentCase) < protot default { @position = 'end' condition = true - type = ${node.nodeType.name + '.Definition'} + type = ${node.nodeTypeName + '.Definition'} } } diff --git a/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion b/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion index b6a44ba..cf49ff0 100644 --- a/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion +++ b/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion @@ -12,7 +12,7 @@ prototype(Sitegeist.PaperTiger:ActionCollection.Preview.ContentCase) < prototype default { @position = 'end' condition = true - type = ${node.nodeType.name + '.Preview'} + type = ${node.nodeTypeName + '.Preview'} } } diff --git a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion index b71454f..5eed880 100644 --- a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion +++ b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion @@ -10,9 +10,9 @@ prototype(Sitegeist.PaperTiger:FieldCollection.Schema) < prototype(Neos.Fusion:C name = ${q(node).is('[instanceof Sitegeist.PaperTiger:Mixin.Name]') ? q(node).property('name') : q(node).property('_identifier')} schema = Neos.Fusion:Renderer { @if.canRender = Neos.Fusion:CanRender { - type = ${node.nodeType.name + '.Schema'} + type = ${node.nodeTypeName + '.Schema'} } - type = ${node.nodeType.name + '.Schema'} + type = ${node.nodeTypeName + '.Schema'} } value = ${(this.name && this.schema) ? Array.set(carry, this.name, this.schema) : carry} } From afc51b5757f7ce61d19fa15e0f18d9321b52de07 Mon Sep 17 00:00:00 2001 From: robinroloff Date: Mon, 10 Mar 2025 08:35:11 +0100 Subject: [PATCH 5/9] updated some fusion for neos 9 --- NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion | 2 +- NodeTypes/Field/Hidden/Hidden.fusion | 2 +- NodeTypes/Field/Honeypot/Honeypot.fusion | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion index 5df874b..616959e 100644 --- a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion +++ b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion @@ -3,7 +3,7 @@ prototype(Sitegeist.PaperTiger:Field.FriendlyCaptcha) < prototype(Neos.Neos:Cont renderer = Neos.Fusion:Case { backend { - condition = ${node.context.inBackend} + condition = ${renderingMode.isEdit} renderer = afx`