Merge pull request #32 from sbruggmann/neos-4-0

TASK: Make the comments package Neos 4.0 ready
webexcess · Nov 6, 2018 · 65be01d · 65be01d
2 parents 8887d2c + 4befd12
commit 65be01d
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 50 deletions.
diff --git a/Documentation/Examples/ExtendTheCommentForm.md b/Documentation/Examples/ExtendTheCommentForm.md
@@ -24,37 +24,37 @@ _Vendor.Blog/Configuration/NodeTypes.Comment.yaml_
 _Vendor.Blog/Classes/Vendor/Blog/Domain/Model/Comment.php_
 
 	<?php
-	
+
 	namespace Vendor\Blog\Domain\Model;
-	
+
 	use Neos\Flow\Annotations as Flow;
 	use WebExcess\Comments\Domain\Model\Comment as CommentOriginal;
 	use WebExcess\Comments\Domain\Model\CommentInterface;
-	
+
 	class Comment extends CommentOriginal implements CommentInterface
 	{
-	
+
 		/**
 		 * @var string
 		 */
 		protected $phone;
-	
+
 		/**
 		 * @return string
 		 */
 		public function getPhone()
 		{
 			return $this->phone;
 		}
-	
+
 		/**
 		 * @param string $phone
 		 */
 		public function setPhone($phone)
 		{
 			$this->phone = $phone;
 		}
-	
+
 	}
 
 **Replace the original Comment-Model with your version**
@@ -101,14 +101,14 @@ _Vendor.Blog/Resources/Private/Templates/Comments/Index.html_
 
 _Vendor.Blog/Resources/Private/Partials/Comments/TextField.html_
 
-	<f:form.validationResults for="comment.{fieldname}">
+	<f:validation.results for="comment.{fieldname}">
 		<div class="mf-input{f:if(condition: validationResults.flattenedErrors, then: ' mf-has-error')}">
 			<f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" class="mf-input-field" />
 			<div class="mf-input-bar"></div>
 			<label for="{fieldname}" class="mf-input-label"><f:translate id="properties.phone.{fieldname}" package="Vendor.Blog" source="NodeTypes/Comment" value="{f:translate(id: 'comment.form.{fieldname}', package: 'WebExcess.Comments')}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
 			<f:render partial="Validation" arguments="{fieldname: fieldname}" />
 		</div>
-	</f:form.validationResults>
+	</f:validation.results>
 
 **Add your field translation**
 

diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ This package provides your visitors the possibility to comment stuff and discuss
 | Neos | Package | Maintained |
 |------|---------|------------|
 | 3.x  | 0.0.x   | YES        |
+| 4.x  | 0.1.x   | YES        |
 
 ## Installation
 ```

diff --git a/Resources/Private/Partials/FormElements/Bootstrap/Checkbox.html b/Resources/Private/Partials/FormElements/Bootstrap/Checkbox.html
@@ -1,9 +1,9 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-check{f:if(condition: validationResults.flattenedErrors, then: ' has-danger')}">
         <label class="form-check-label">
             <f:form.checkbox property="{fieldname}" id="{fieldname}" class="form-check-input" value="1" /> <comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}
         </label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Bootstrap/Error.html b/Resources/Private/Partials/FormElements/Bootstrap/Error.html
@@ -1,7 +1,7 @@
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <f:if condition="{validationResults.flattenedErrors}">
         <div class="form-group has-danger">
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </div>
     </f:if>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Bootstrap/TextArea.html b/Resources/Private/Partials/FormElements/Bootstrap/TextArea.html
@@ -1,8 +1,8 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' has-danger')}">
         <label for="{fieldname}" class="form-control-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:form.textarea property="{fieldname}" id="{fieldname}" rows="3" class="form-control" errorClass="form-control-danger" />
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Bootstrap/TextField.html b/Resources/Private/Partials/FormElements/Bootstrap/TextField.html
@@ -1,8 +1,8 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' has-danger')}">
         <label for="{fieldname}" class="form-control-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" class="form-control" errorClass="form-control-danger" />
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Float/Checkbox.html b/Resources/Private/Partials/FormElements/Float/Checkbox.html
@@ -1,5 +1,5 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-checkbox{f:if(condition: validationResults.flattenedErrors, then: ' has-error')}">
         <label class="form-checkbox-legend">
             <f:form.checkbox property="{fieldname}" id="{fieldname}" class="form-check-input" value="1" />
@@ -8,4 +8,4 @@
         </label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Float/Error.html b/Resources/Private/Partials/FormElements/Float/Error.html
@@ -1,7 +1,7 @@
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <f:if condition="{validationResults.flattenedErrors}">
         <div class="form-input has-error">
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </div>
     </f:if>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Float/TextArea.html b/Resources/Private/Partials/FormElements/Float/TextArea.html
@@ -1,8 +1,8 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-textarea{f:if(condition: validationResults.flattenedErrors, then: ' has-error')}">
         <f:form.textarea property="{fieldname}" id="{fieldname}" rows="3" class="form-textarea-field" />
         <label for="{fieldname}" class="form-textarea-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Float/TextField.html b/Resources/Private/Partials/FormElements/Float/TextField.html
@@ -1,8 +1,8 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-input{f:if(condition: validationResults.flattenedErrors, then: ' has-error')}">
         <f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" class="form-input-field" />
         <label for="{fieldname}" class="form-input-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Foundation/Checkbox.html b/Resources/Private/Partials/FormElements/Foundation/Checkbox.html
@@ -1,8 +1,8 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' is-invalid-label')}">
         <f:form.checkbox property="{fieldname}" id="{fieldname}" value="1" />
         <label for="{fieldname}"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Foundation/Error.html b/Resources/Private/Partials/FormElements/Foundation/Error.html
@@ -1,9 +1,9 @@
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <f:if condition="{validationResults.flattenedErrors}">
         <div class="form-group is-invalid-label">
             <label>
                 <f:render partial="Validation" arguments="{fieldname: fieldname}" />
             </label>
         </div>
     </f:if>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Foundation/TextArea.html b/Resources/Private/Partials/FormElements/Foundation/TextArea.html
@@ -1,10 +1,10 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' is-invalid-label')}">
         <label>
             <comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}
             <f:form.textarea property="{fieldname}" id="{fieldname}" rows="3" class="form-control" />
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </label>
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Foundation/TextField.html b/Resources/Private/Partials/FormElements/Foundation/TextField.html
@@ -1,10 +1,10 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="form-group{f:if(condition: validationResults.flattenedErrors, then: ' is-invalid-label')}">
         <label>
             <comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}
             <f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" class="form-control" />
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </label>
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Material/Checkbox.html b/Resources/Private/Partials/FormElements/Material/Checkbox.html
@@ -1,5 +1,5 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="mf-checkbox{f:if(condition: validationResults.flattenedErrors, then: ' mf-has-error')}">
         <label>
             <f:form.checkbox property="{fieldname}" id="{fieldname}" class="form-check-input" value="1" />
@@ -8,4 +8,4 @@
         </label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Material/Error.html b/Resources/Private/Partials/FormElements/Material/Error.html
@@ -1,7 +1,7 @@
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <f:if condition="{validationResults.flattenedErrors}">
         <div class="mf-input mf-has-error">
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </div>
     </f:if>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Material/TextArea.html b/Resources/Private/Partials/FormElements/Material/TextArea.html
@@ -1,9 +1,9 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="mf-textarea{f:if(condition: validationResults.flattenedErrors, then: ' mf-has-error')}">
         <f:form.textarea property="{fieldname}" id="{fieldname}" rows="3" class="mf-textarea-field" />
         <div class="mf-textarea-bar"></div>
         <label for="{fieldname}" class="mf-textarea-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/Material/TextField.html b/Resources/Private/Partials/FormElements/Material/TextField.html
@@ -1,9 +1,9 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="mf-input{f:if(condition: validationResults.flattenedErrors, then: ' mf-has-error')}">
         <f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" class="mf-input-field" />
         <div class="mf-input-bar"></div>
         <label for="{fieldname}" class="mf-input-label"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/WebExcess/Checkbox.html b/Resources/Private/Partials/FormElements/WebExcess/Checkbox.html
@@ -1,10 +1,10 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="clearfix{f:if(condition: validationResults.flattenedErrors, then: ' error')}">
         <label>
             <f:form.checkbox property="{fieldname}" id="{fieldname}" value="1" />
             <span><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</span>
         </label>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/WebExcess/Error.html b/Resources/Private/Partials/FormElements/WebExcess/Error.html
@@ -1,7 +1,7 @@
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <f:if condition="{validationResults.flattenedErrors}">
         <div class="clearfix error">
             <f:render partial="Validation" arguments="{fieldname: fieldname}" />
         </div>
     </f:if>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/WebExcess/TextArea.html b/Resources/Private/Partials/FormElements/WebExcess/TextArea.html
@@ -1,10 +1,10 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="clearfix{f:if(condition: validationResults.flattenedErrors, then: ' error')}">
         <label for="{fieldname}"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <div class="input">
             <f:form.textarea property="{fieldname}" id="{fieldname}" rows="3" />
         </div>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/Resources/Private/Partials/FormElements/WebExcess/TextField.html b/Resources/Private/Partials/FormElements/WebExcess/TextField.html
@@ -1,10 +1,10 @@
 {namespace comments=WebExcess\Comments\ViewHelpers}
-<f:form.validationResults for="comment.{fieldname}">
+<f:validation.results for="comment.{fieldname}">
     <div class="clearfix{f:if(condition: validationResults.flattenedErrors, then: ' error')}">
         <label for="{fieldname}"><comments:translate id="comment.form.{fieldname}" />{f:if(condition: required, then: '<sup class="is-required">*</sup>')}</label>
         <div class="input">
             <f:form.textfield property="{fieldname}" id="{fieldname}" type="{f:if(condition: type, then: type, else: 'text')}" />
         </div>
         <f:render partial="Validation" arguments="{fieldname: fieldname}" />
     </div>
-</f:form.validationResults>
+</f:validation.results>
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     ],
     "require": {
         "neos/neos": "*",
-        "flowpack/listable": "~2.0.1",
+        "flowpack/listable": "~3.0",
         "neos/swiftmailer": "~6.0.0"
     },
     "suggest": {