Merge branch 'release/8.3.3'

einpraegsam · einpraegsam · commit 5cf398c867bf · 2021-07-27T22:10:05.000+02:00
diff --git a/Classes/Domain/Factory/FileFactory.php b/Classes/Domain/Factory/FileFactory.php
@@ -134,7 +134,7 @@ protected function makeFileInstance(
         if ($size === 0) {
             $size = filesize($file->getNewPathAndFilename(true));
         }
-        $file->setSize($size);
+        $file->setSize((int)$size);
         if ($type === '') {
             $type = mime_content_type($file->getNewPathAndFilename(true));
         }
diff --git a/Classes/Domain/Model/Answer.php b/Classes/Domain/Model/Answer.php
@@ -228,7 +228,7 @@ protected function convertToJson($value): string
         if (is_array($value)) {
             $value = json_encode($value);
         }
-        return $value;
+        return (string)$value;
     }
 
     /**
diff --git a/Classes/Domain/Model/Mail.php b/Classes/Domain/Model/Mail.php
@@ -527,7 +527,7 @@ public function setMarketingPageFunnel(array $marketingPageFunnel): Mail
     public function getMarketingPageFunnel(): array
     {
         if (ArrayUtility::isJsonArray($this->marketingPageFunnel)) {
-            return json_decode($this->marketingPageFunnel);
+            return json_decode($this->marketingPageFunnel, true);
         }
         return (array)$this->marketingPageFunnel;
     }
diff --git a/Classes/Domain/Service/SaveToAnyTableService.php b/Classes/Domain/Service/SaveToAnyTableService.php
@@ -61,7 +61,7 @@ class SaveToAnyTableService
      *
      * @var string
      */
-    protected $additionalWhere;
+    protected $additionalWhere = '';
 
     /**
      * Switch on devLog
diff --git a/Classes/Hook/FlexFormManipulationHook.php b/Classes/Hook/FlexFormManipulationHook.php
@@ -54,7 +54,7 @@ public function getFlexFormDS_postProcessDS(
     ): void {
         unset($configuration, $fieldName);
         if ($this->isPowermailFlexForm($table, $row)) {
-            foreach ($this->getFieldConfiguration($row['pid']) as $key => $fieldConfiguration) {
+            foreach ($this->getFieldConfiguration((int)$row['pid']) as $key => $fieldConfiguration) {
                 $sheet = $this->getSheetNameAndRemoveFromConfiguration($fieldConfiguration);
                 $dataStructArray['sheets'][$sheet]['ROOT']['el'][$key]['TCEforms'] = $fieldConfiguration;
             }
@@ -117,7 +117,7 @@ public function parseDataStructureByIdentifierPostProcess(array $dataStructure,
             && !empty($identifier['pid'])
             && MathUtility::canBeInterpretedAsInteger($identifier['pid'])
         ) {
-            foreach ($this->getFieldConfiguration($identifier['pid']) as $key => $fieldConfiguration) {
+            foreach ($this->getFieldConfiguration((int)$identifier['pid']) as $key => $fieldConfiguration) {
                 $sheet = $this->getSheetNameAndRemoveFromConfiguration($fieldConfiguration);
                 $dataStructure['sheets'][$sheet]['ROOT']['el'][$key]['TCEforms'] = $fieldConfiguration;
             }
@@ -128,7 +128,7 @@ public function parseDataStructureByIdentifierPostProcess(array $dataStructure,
     /**
      * Get field configuration from page TSconfig
      *
-     * @param integer $pid Record pid
+     * @param int $pid Record pid
      * @return array
      * @throws Exception
      */
diff --git a/Configuration/TCA/tx_powermail_domain_model_answer.php b/Configuration/TCA/tx_powermail_domain_model_answer.php
@@ -91,12 +91,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'endtime' => [
@@ -107,12 +102,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'value' => [
diff --git a/Configuration/TCA/tx_powermail_domain_model_field.php b/Configuration/TCA/tx_powermail_domain_model_field.php
@@ -396,12 +396,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'endtime' => [
@@ -412,12 +407,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'title' => [
diff --git a/Configuration/TCA/tx_powermail_domain_model_form.php b/Configuration/TCA/tx_powermail_domain_model_form.php
@@ -97,12 +97,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'endtime' => [
@@ -113,12 +108,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'title' => [
diff --git a/Configuration/TCA/tx_powermail_domain_model_mail.php b/Configuration/TCA/tx_powermail_domain_model_mail.php
@@ -108,12 +108,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'endtime' => [
@@ -124,12 +119,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'crdate' => [
diff --git a/Configuration/TCA/tx_powermail_domain_model_page.php b/Configuration/TCA/tx_powermail_domain_model_page.php
@@ -97,12 +97,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'endtime' => [
@@ -113,12 +108,7 @@
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
                 'eval' => 'datetime,int',
-                'size' => 13,
-                'checkbox' => 0,
-                'default' => 0,
-                'range' => [
-                    'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
-                ],
+                'default' => 0
             ],
         ],
         'title' => [
diff --git a/Documentation/Changelog/Readme.md b/Documentation/Changelog/Readme.md
@@ -4,6 +4,8 @@
 
 | Version     | Release Date | Description                                                                                                           |
 |------------ |--------------|-----------------------------------------------------------------------------------------------------------------------|
+| 8.3.3       | 2021-07-27   | Bugfix: Fix some more typehint problems                                                                               |
+|             |              | Bugfix: Fix a problem with start- and endtime in backend records                                                      |
 | 8.3.2       | 2021-04-30   | Bugfix: Fix typehint error with overwriteValueFromTypoScript()                                                        |
 | 8.3.1       | 2021-03-08   | Bugfix: Don't validate captcha fields of already persisted mails (in double optin)                                    |
 | 8.3.0       | 2021-02-16   | Feature: Add autodeployment functionality to TER                                                                      |
diff --git a/Documentation/FAQ/Readme.md b/Documentation/FAQ/Readme.md
@@ -93,6 +93,15 @@ plugin.tx_powermail.settings.setup.sender.overwrite.senderName = TEXT
 plugin.tx_powermail.settings.setup.sender.overwrite.senderName.value = Server from domain.org
 ```
 
+To set a sender email address for the double-opt-in confirmation email (to sender), you could use this TypoScript:
+
+```
+plugin.tx_powermail.settings.setup.optin.overwrite.senderEmail = TEXT
+plugin.tx_powermail.settings.setup.optin.overwrite.senderEmail.value = server@domain.org
+plugin.tx_powermail.settings.setup.optin.overwrite.senderName = TEXT
+plugin.tx_powermail.settings.setup.optin.overwrite.senderName.value = Server from domain.org
+```
+
 Please ask your server administrator for a valid email address.
 
 
diff --git a/composer.json b/composer.json
@@ -11,7 +11,15 @@
   "authors": [
     {
       "name": "Alex Kellner",
-      "email": "alexander.kellner@in2code.de"
+      "email": "alexander.kellner@in2code.de",
+      "role": "Product and technical owner",
+      "homepage": "https://www.in2code.de"
+    },
+    {
+      "name": "Marcus Schwemer",
+      "email": "marcus.schwemer@in2code.de",
+      "role": "Developer",
+      "homepage": "https://www.in2code.de"
     }
   ],
   "type": "typo3-cms-extension",
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -1,27 +1,22 @@
 <?php
-/***************************************************************
- * Extension Manager/Repository config file for ext "powermail".
- ***************************************************************/
 
 $EM_CONF[$_EXTKEY] = [
     'title' => 'powermail',
     'description' => 'Powermail is a well-known, editor-friendly, powerful
         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.3.2',
+    'version' => '8.3.3',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
-    'author_email' => 'alexander.kellner@in2code.de',
+    'author_email' => 'service@in2code.de',
     'author_company' => 'in2code.de',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.0.0-10.99.99',
-            'php' => '7.0.0-7.99.99'
+            'typo3' => '10.0.0-10.99.99'
         ],
         'conflicts' => [
         ],
-        'suggests' => [],
-    ],
-    '_md5_values_when_last_written' => '',
+        'suggests' => []
+    ]
 ];

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ protected function makeFileInstance(`
`134`	`134`	`if ($size === 0) {`
`135`	`135`	`$size = filesize($file->getNewPathAndFilename(true));`
`136`	`136`	`}`
`137`		`- $file->setSize($size);`
	`137`	`+ $file->setSize((int)$size);`
`138`	`138`	`if ($type === '') {`
`139`	`139`	`$type = mime_content_type($file->getNewPathAndFilename(true));`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ protected function convertToJson($value): string`
`228`	`228`	`if (is_array($value)) {`
`229`	`229`	`$value = json_encode($value);`
`230`	`230`	`}`
`231`		`- return $value;`
	`231`	`+ return (string)$value;`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ public function setMarketingPageFunnel(array $marketingPageFunnel): Mail`
`527`	`527`	`public function getMarketingPageFunnel(): array`
`528`	`528`	`{`
`529`	`529`	`if (ArrayUtility::isJsonArray($this->marketingPageFunnel)) {`
`530`		`- return json_decode($this->marketingPageFunnel);`
	`530`	`+ return json_decode($this->marketingPageFunnel, true);`
`531`	`531`	`}`
`532`	`532`	`return (array)$this->marketingPageFunnel;`
`533`	`533`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class SaveToAnyTableService`
`61`	`61`	`*`
`62`	`62`	`* @var string`
`63`	`63`	`*/`
`64`		`- protected $additionalWhere;`
	`64`	`+ protected $additionalWhere = '';`
`65`	`65`
`66`	`66`	`/**`
`67`	`67`	`* Switch on devLog`