Merge pull request #138 from andreaswolf/issue-132

[TASK] Only support rules equal and higher TYPO3 10

Author: sabbelasichon

e2e/run-test.sh

@@ -10,7 +10,7 @@ cd $TESTS_BASE_DIR
 rm -r composer.lock vendor || true
 composer install
 
-TEST_DIR=typo3-flexform
+TEST_DIR=typo3-yaml
 
 cd $TEST_DIR
 

e2e/typo3-flexform/expected-output/FlexFormWithSelect.xml

@@ -0,0 +1,50 @@
+finishers:
+  -
+    options:
+      recipients:
+        [email protected]: Bar
+        [email protected]: Bar
+      subject: 'Kontaktanfrage von Website'
+      senderAddress: '{email}'
+      senderName: '{lastName}'
+      format: html
+      attachUploads: true
+      replyToRecipients:
+        - [email protected]
+      carbonCopyRecipients:
+        - [email protected]
+      blindCarbonCopyRecipients:
+        - [email protected]
+    identifier: EmailToReceiver
+  -
+    options:
+      recipients:
+        [email protected]: Bar
+        [email protected]: Bar
+      subject: 'Kontaktanfrage von Website'
+      senderAddress: '{email}'
+      senderName: '{lastName}'
+      format: html
+      attachUploads: true
+      replyToRecipients:
+        - [email protected]
+      carbonCopyRecipients:
+        - [email protected]
+      blindCarbonCopyRecipients:
+        - [email protected]
+    identifier: EmailToSender
+variants:
+  -
+    identifier: variant-1
+    condition: 'formValues["foo"] == "bar"'
+    finishers:
+      -
+        identifier: EmailToReceiver
+        options:
+          subject: 'Example Subject'
+          senderAddress: [email protected]
+          senderName: '{text-2} {text-1}'
+          replyToRecipients:
+            - '{email}'
+          recipients:
+            [email protected]: 'Example Recipient'

e2e/typo3-flexform/fixtures/FlexFormWithSelect.xml

@@ -0,0 +1,45 @@
+finishers:
+  -
+    options:
+      recipients:
+        [email protected]: 'Bar'
+      subject: 'Kontaktanfrage von Website'
+      recipientAddress: [email protected]
+      recipientName: Bar
+      replyToAddress: [email protected]
+      senderAddress: '{email}'
+      senderName: '{lastName}'
+      carbonCopyAddress: [email protected]
+      blindCarbonCopyAddress: [email protected]
+      format: html
+      attachUploads: true
+    identifier: EmailToReceiver
+  -
+    options:
+      recipients:
+        [email protected]: 'Bar'
+      subject: 'Kontaktanfrage von Website'
+      recipientAddress: [email protected]
+      recipientName: Bar
+      replyToAddress: [email protected]
+      senderAddress: '{email}'
+      senderName: '{lastName}'
+      carbonCopyAddress: [email protected]
+      blindCarbonCopyAddress: [email protected]
+      format: html
+      attachUploads: true
+    identifier: EmailToSender
+variants:
+  -
+    identifier: variant-1
+    condition: 'formValues["foo"] == "bar"'
+    finishers:
+      -
+        identifier: EmailToReceiver
+        options:
+          subject: 'Example Subject'
+          recipientAddress: [email protected]
+          recipientName: 'Example Recipient'
+          senderAddress: [email protected]
+          senderName: '{text-2} {text-1}'
+          replyToAddress: '{email}'

e2e/typo3-yaml/expected-output/my_form.form.yaml

@@ -2,11 +2,9 @@
 
 declare(strict_types=1);
 
-use a9f\Typo3Fractor\Set\Typo3LevelSetList;
 use a9f\Typo3Fractor\Set\Typo3SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(Typo3LevelSetList::UP_TO_TYPO3_9);
     $containerConfigurator->import(Typo3SetList::TYPO3_10);
 };

e2e/typo3-yaml/fixtures/my_form.form.yaml

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
+use a9f\Typo3Fractor\TYPO3v10\Fluid\RemoveNoCacheHashAndUseCacheHashAttributeFractor;
 use a9f\Typo3Fractor\TYPO3v10\Yaml\EmailFinisherFractor;
+use a9f\Typo3Fractor\TYPO3v10\Yaml\TranslationFileFractor;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -12,4 +14,6 @@
         ->autowire();
 
     $services->set(EmailFinisherFractor::class);
+    $services->set(TranslationFileFractor::class);
+    $services->set(RemoveNoCacheHashAndUseCacheHashAttributeFractor::class);
 };

e2e/typo3-flexform/fractor.php e2e/typo3-yaml/fractor.php

@@ -2,11 +2,14 @@
 
 declare(strict_types=1);
 
+use a9f\Typo3Fractor\TYPO3v12\Fluid\AbstractMessageGetSeverityFluidRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
     $services->defaults()
         ->autoconfigure()
         ->autowire();
+
+    $services->set(AbstractMessageGetSeverityFluidRector::class);
 };