Merge branch 'release/8.3.0'

einpraegsam · einpraegsam · commit 29d5e816bc11 · 2021-02-16T13:49:53.000+01:00
diff --git a/.github/workflows/ter-release.yml b/.github/workflows/ter-release.yml
@@ -0,0 +1,34 @@
+name: TER release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  ter-release:
+    name: TER release
+    runs-on: ubuntu-latest
+    env:
+      TYPO3_EXTENSION_KEY: 'powermail'
+      REPOSITORY_URL: 'https://github.com/einpraegsam/powermail'
+      TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}
+      TYPO3_API_USERNAME: ${{ secrets.TYPO3_API_USERNAME }}
+      TYPO3_API_PASSWORD: ${{ secrets.TYPO3_API_PASSWORD }}
+
+    steps:
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: intl, mbstring, xml, soap, zip, curl
+
+      - name: Install EXT:tailor
+        run: composer global require typo3/tailor --prefer-dist --no-progress --no-suggest
+
+      - name: Upload EXT:${{ env.EXTENSION_KEY }} as ${{ steps.get_version.outputs.VERSION }} to TER
+        run: php ~/.composer/vendor/bin/tailor ter:publish ${{ steps.get_version.outputs.VERSION }} --artefact=${{ env.REPOSITORY_URL }}/archive/${{ steps.get_version.outputs.VERSION }}.zip --comment="New release of version ${{ steps.get_version.outputs.VERSION }} - see details, changelog and documentation on ${{ env.REPOSITORY_URL }}"
diff --git a/Classes/Domain/Model/Mail.php b/Classes/Domain/Model/Mail.php
@@ -258,6 +258,9 @@ public function setBody(string $body): Mail
      */
     public function getFeuser()
     {
+        if ($this->feuser instanceof LazyLoadingProxy) {
+            $this->feuser->_loadRealInstance();
+        }
         return $this->feuser;
     }
 
diff --git a/Classes/Domain/Service/Mail/ReceiverMailReceiverPropertiesService.php b/Classes/Domain/Service/Mail/ReceiverMailReceiverPropertiesService.php
@@ -11,11 +11,11 @@
 use In2code\Powermail\Utility\ObjectUtility;
 use In2code\Powermail\Utility\TemplateUtility;
 use In2code\Powermail\Utility\TypoScriptUtility;
-use TYPO3\CMS\Beuser\Domain\Model\Demand;
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Repository\BackendUserRepository;
 use TYPO3\CMS\Extbase\Object\Exception;
+use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
 use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 
@@ -182,14 +182,15 @@ protected function getEmailsFromFeGroup(array $emailArray, int $uid): array
      * @param int $uid be_groups.uid
      * @return array
      * @throws Exception
+     * @throws InvalidQueryException
      */
     protected function getEmailsFromBeGroup(array $emailArray, int $uid): array
     {
         if ((int)$this->settings['receiver']['type'] === self::RECEIVERS_BACKENDGROUP && !empty($uid)) {
+            /** @var BackendUserRepository $beUserRepository */
             $beUserRepository = ObjectUtility::getObjectManager()->get(BackendUserRepository::class);
-            $demand = ObjectUtility::getObjectManager()->get(Demand::class);
-            $demand->setBackendUserGroup($uid);
-            $users = $beUserRepository->findDemanded($demand);
+            $query = $beUserRepository->createQuery();
+            $users = $query->matching($query->contains('usergroup', $uid))->execute();
             $emailArray = [];
             /** @var User $user */
             foreach ($users as $user) {
diff --git a/Classes/Domain/Service/Mail/SendDisclaimedMailPreflight.php b/Classes/Domain/Service/Mail/SendDisclaimedMailPreflight.php
@@ -91,7 +91,7 @@ public function sendMail(Mail $mail): void
                 'format' => $this->settings['sender']['mailformat'],
                 'variables' => ['mail' => $mail]
             ];
-            $this->sendMailService->sendMail($email, $mail, $this->settings, 'optin');
+            $this->sendMailService->sendMail($email, $mail, $this->settings, 'disclaimer');
         }
     }
 }
diff --git a/Classes/Domain/Validator/ForeignValidator.php b/Classes/Domain/Validator/ForeignValidator.php
@@ -70,7 +70,7 @@ protected function addErrors(Result $result): void
         if (!empty($errors)) {
             /** @var Error $error */
             foreach ($errors as $error) {
-                $this->addError($error->getMessage(), $error->getCode());
+                $this->addError($error->getMessage(), $error->getCode(), $error->getArguments(), $error->getTitle());
             }
             $this->setValidState(false);
         }
diff --git a/Classes/Utility/TemplateUtility.php b/Classes/Utility/TemplateUtility.php
@@ -36,6 +36,7 @@ public static function getTemplateFolders(string $part = 'template'): array
         );
         if (!empty($extbaseConfig['view'][$part . 'RootPaths'])) {
             $templatePaths = $extbaseConfig['view'][$part . 'RootPaths'];
+            ksort($templatePaths, SORT_NUMERIC);
             $templatePaths = array_values($templatePaths);
         }
         if (empty($templatePaths)) {
@@ -163,6 +164,6 @@ public static function fluidParseString(string $string, array $variables = []):
         $standaloneView = ObjectUtility::getObjectManager()->get(StandaloneView::class);
         $standaloneView->setTemplateSource($string);
         $standaloneView->assignMultiple($variables);
-        return $standaloneView->render();
+        return $standaloneView->render() ?? '';
     }
 }
diff --git a/Documentation/Changelog/Readme.md b/Documentation/Changelog/Readme.md
@@ -4,6 +4,11 @@
 
 | Version     | Release Date | Description                                                                                                           |
 |------------ |--------------|-----------------------------------------------------------------------------------------------------------------------|
+| 8.3.0       | 2021-02-16   | Feature: Add autodeployment functionality to TER                                                                      |
+|             |              | Bugfix: Foreign-Validator compatibility to core methods                                                               |
+|             |              | Bugfix: Reanimate sending emails to backend users                                                                     |
+|             |              | Bugfix: Harden template utility functions against type errors                                                         |
+|             |              | Bugfix: Resolve LazyLoadingProxy to fe_users relations                                                                |
 | 8.2.4       | 2020-12-02   | Bugfix: Fix possible exception when extending powermail with own validators and using a confirmation view             |
 | 8.2.3       | 2020-11-08   | Bugfix: Set tx_powermail_domain_model_mail.fe_user value for logged in users                                          |
 |             |              | Bugfix: Fix link from PluginPreview to powermail module                                                               |
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -9,7 +9,7 @@
         and easy to use mailform extension with a lots of features
         (spam prevention, marketing information, optin, ajax submit, diagram analysis, etc...)',
     'category' => 'plugin',
-    'version' => '8.2.4',
+    'version' => '8.3.0',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
     'author_email' => 'alexander.kellner@in2code.de',

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,9 @@ public function setBody(string $body): Mail`
`258`	`258`	`*/`
`259`	`259`	`public function getFeuser()`
`260`	`260`	`{`
	`261`	`+ if ($this->feuser instanceof LazyLoadingProxy) {`
	`262`	`+ $this->feuser->_loadRealInstance();`
	`263`	`+ }`
`261`	`264`	`return $this->feuser;`
`262`	`265`	`}`
`263`	`266`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function sendMail(Mail $mail): void`
`91`	`91`	`'format' => $this->settings['sender']['mailformat'],`
`92`	`92`	`'variables' => ['mail' => $mail]`
`93`	`93`	`];`
`94`		`- $this->sendMailService->sendMail($email, $mail, $this->settings, 'optin');`
	`94`	`+ $this->sendMailService->sendMail($email, $mail, $this->settings, 'disclaimer');`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function addErrors(Result $result): void`
`70`	`70`	`if (!empty($errors)) {`
`71`	`71`	`/** @var Error $error */`
`72`	`72`	`foreach ($errors as $error) {`
`73`		`- $this->addError($error->getMessage(), $error->getCode());`
	`73`	`+ $this->addError($error->getMessage(), $error->getCode(), $error->getArguments(), $error->getTitle());`
`74`	`74`	`}`
`75`	`75`	`$this->setValidState(false);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public static function getTemplateFolders(string $part = 'template'): array`
`36`	`36`	`);`
`37`	`37`	`if (!empty($extbaseConfig['view'][$part . 'RootPaths'])) {`
`38`	`38`	`$templatePaths = $extbaseConfig['view'][$part . 'RootPaths'];`
	`39`	`+ ksort($templatePaths, SORT_NUMERIC);`
`39`	`40`	`$templatePaths = array_values($templatePaths);`
`40`	`41`	`}`
`41`	`42`	`if (empty($templatePaths)) {`
`@@ -163,6 +164,6 @@ public static function fluidParseString(string $string, array $variables = []):`
`163`	`164`	`$standaloneView = ObjectUtility::getObjectManager()->get(StandaloneView::class);`
`164`	`165`	`$standaloneView->setTemplateSource($string);`
`165`	`166`	`$standaloneView->assignMultiple($variables);`
`166`		`- return $standaloneView->render();`
	`167`	`+ return $standaloneView->render() ?? '';`
`167`	`168`	`}`
`168`	`169`	`}`