Skip to content

Commit

Permalink
Merge pull request #81 from daniellienert/task/refactor-rawarray
Browse files Browse the repository at this point in the history
TASK: Replace RawArray with DataStructure
  • Loading branch information
mhsdesign committed Nov 12, 2023
2 parents 0a33761 + 7ee3a85 commit 8b4002c
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Resources/Private/Fusion/Elements/FileUpload.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ prototype(Neos.Form.Builder:FileUpload.Definition) < prototype(Neos.Form.Builder
formElementType = 'Neos.Form:FileUpload'

properties {
allowedExtensions = Neos.Fusion:RawArray
allowedExtensions = Neos.Fusion:DataStructure
}
}
}
4 changes: 2 additions & 2 deletions Resources/Private/Fusion/Elements/ImageUpload.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ prototype(Neos.Form.Builder:ImageUpload.Definition) < prototype(Neos.Form.Builde
formElementType = 'Neos.Form:ImageUpload'

properties {
allowedTypes = Neos.Fusion:RawArray
allowedTypes = Neos.Fusion:DataStructure
}
}
}
6 changes: 3 additions & 3 deletions Resources/Private/Fusion/Finisher.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ prototype(Neos.Form.Builder:Finisher.Definition) {
@class = 'Neos\\Form\\Builder\\Fusion\\FinisherImplementation'

formElementType = ${null}
options = Neos.Fusion:RawArray
options = Neos.Fusion:DataStructure
}

prototype(Neos.Form.Builder:FinisherCollection) < prototype(Neos.Fusion:RawArray) {
}
prototype(Neos.Form.Builder:FinisherCollection) < prototype(Neos.Fusion:DataStructure) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ prototype(Neos.Form.Builder:FlashMessageFinisher.Definition) < prototype(Neos.Fo
options {
messageBody = ${null}
messageTitle = ''
messageArguments = Neos.Fusion:RawArray
messageArguments = Neos.Fusion:DataStructure
messageCode = ${null}
severity = 'OK'
}
}
}
4 changes: 2 additions & 2 deletions Resources/Private/Fusion/Finishers/RedirectFinisher.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ prototype(Neos.Form.Builder:RedirectFinisher.Definition) < prototype(Neos.Form.B
package = ${null}
controller = ${null}
action = ''
arguments = Neos.Fusion:RawArray
arguments = Neos.Fusion:DataStructure
uri = ''
delay = 0
statusCode = 303
Expand All @@ -27,4 +27,4 @@ prototype(Neos.Form.Builder:NodeBasedFinisherCollection) {
}
}
}
}
}
6 changes: 3 additions & 3 deletions Resources/Private/Fusion/Form.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ prototype(Neos.Form.Builder:Form) {
presetName = 'default'
formElementType = 'Neos.Form:Form'

renderingOptions = Neos.Fusion:RawArray
renderCallbacks = Neos.Fusion:RawArray
renderingOptions = Neos.Fusion:DataStructure
renderCallbacks = Neos.Fusion:DataStructure
firstPage = Neos.Form.Builder:FormPage.Definition {
elements = Neos.Form.Builder:ElementCollection
}
Expand All @@ -21,4 +21,4 @@ prototype(Neos.Form.Builder:Form) {
1 = 'none'
}
}
}
}
8 changes: 4 additions & 4 deletions Resources/Private/Fusion/FormElement.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ prototype(Neos.Form.Builder:FormElement.Definition) {
required = ${true}
label = ${null}
defaultValue = ${null}
properties = Neos.Fusion:RawArray
properties = Neos.Fusion:DataStructure

rendererClassName = ${null}
renderingOptions = Neos.Fusion:RawArray
renderingOptions = Neos.Fusion:DataStructure

validators = Neos.Form.Builder:ValidatorCollection
}
Expand All @@ -17,5 +17,5 @@ prototype(Neos.Form.Builder:SelectionFormElement.Definition) < prototype(Neos.Fo
properties.options = Neos.Form.Builder:SelectOptionCollection
}

prototype(Neos.Form.Builder:ElementCollection) < prototype(Neos.Fusion:RawArray) {
}
prototype(Neos.Form.Builder:ElementCollection) < prototype(Neos.Fusion:DataStructure) {
}
6 changes: 3 additions & 3 deletions Resources/Private/Fusion/FormPage.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ prototype(Neos.Form.Builder:FormPage.Definition) {

identifier = 'page'
formElementType = 'Neos.Form:Page'
renderingOptions = Neos.Fusion:RawArray
renderingOptions = Neos.Fusion:DataStructure
label = ${null}
elements = Neos.Form.Builder:ElementCollection
}

prototype(Neos.Form.Builder:PageCollection) < prototype(Neos.Fusion:RawArray) {
}
prototype(Neos.Form.Builder:PageCollection) < prototype(Neos.Fusion:DataStructure) {
}
6 changes: 3 additions & 3 deletions Resources/Private/Fusion/Validator.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ prototype(Neos.Form.Builder:Validator.Definition) {

formElementType = ${null}

options = Neos.Fusion:RawArray
options = Neos.Fusion:DataStructure
}

prototype(Neos.Form.Builder:ValidatorCollection) < prototype(Neos.Fusion:RawArray) {
}
prototype(Neos.Form.Builder:ValidatorCollection) < prototype(Neos.Fusion:DataStructure) {
}

0 comments on commit 8b4002c

Please sign in to comment.