Merge branch 'release/7.2.1'

.github/workflows/testing.yaml

@@ -102,7 +102,7 @@ jobs:
  steps:
  - name: Checkout
  uses: actions/checkout@v2
- - uses: jonaseberle/github-action-setup-ddev@v1
+ - uses: ddev/github-action-setup-ddev@v1
  - name: "Composer Install"
  run: "ddev composer install"
  - name: "Initialize TYPO3 in ddev"

Classes/Controller/AbstractController.php

@@ -272,8 +272,8 @@ public function finalCreate(
  ConfigurationUtility::getValue('new./email./createUserNotify./sender./name./value', $this->config)
  ),
  $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('new./email./createUserNotify./subject', $this->config),
- ConfigurationUtility::getValue('new./email./createUserNotify./subject.', $this->config),
+ (string)ConfigurationUtility::getValue('new./email./createUserNotify./subject', $this->config),
+ (array)ConfigurationUtility::getValue('new./email./createUserNotify./subject.', $this->config),
  ),
  $variables,
  ConfigurationUtility::getValue('new./email./createUserNotify.', $this->config)
@@ -297,8 +297,8 @@ public function finalCreate(
  ),
  StringUtility::makeEmailArray($user->getEmail(), $user->getUsername()),
  $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('new./email./createAdminNotify./subject', $this->config),
- ConfigurationUtility::getValue('new./email./createAdminNotify./subject.', $this->config)
+ (string)ConfigurationUtility::getValue('new./email./createAdminNotify./subject', $this->config),
+ (array)ConfigurationUtility::getValue('new./email./createAdminNotify./subject.', $this->config)
  ),
  $variables,
  ConfigurationUtility::getValue('new./email./createAdminNotify.', $this->config)
@@ -348,14 +348,14 @@ protected function redirectByAction($action = 'new', $category = 'redirect')
  $target = null;
  // redirect from TypoScript cObject
  if ($this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue($action . './' . $category, $this->config),
- ConfigurationUtility::getValue($action . './' . $category . '.', $this->config),
+ (string)ConfigurationUtility::getValue($action . './' . $category, $this->config),
+ (array)ConfigurationUtility::getValue($action . './' . $category . '.', $this->config),
  )
  ) {
  $target = $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue($action . './' . $category, $this->config),
+ (string)ConfigurationUtility::getValue($action . './' . $category, $this->config),
  array_merge_recursive(
- ConfigurationUtility::getValue($action . './' . $category . '.', $this->config),
+ (array)ConfigurationUtility::getValue($action . './' . $category . '.', $this->config),
  [
  'linkAccessRestrictedPages' => 1,
  ]
@@ -551,8 +551,8 @@ public function sendCreateUserConfirmationMail(User $user)
  ConfigurationUtility::getValue('new./email./createUserConfirmation./sender./name./value', $this->config),
  ],
  $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('new./email./createUserConfirmation./subject', $this->config),
- ConfigurationUtility::getValue('new./email./createUserConfirmation./subject.', $this->config)
+ (string)ConfigurationUtility::getValue('new./email./createUserConfirmation./subject', $this->config),
+ (array)ConfigurationUtility::getValue('new./email./createUserConfirmation./subject.', $this->config)
  ),
  [
  'user' => $user,

Classes/Domain/Service/SendMailService.php

@@ -175,12 +175,12 @@ protected function prepareMailObject(
  protected function overwriteEmailReceiver(array $typoScript, MailMessage $email): void
  {
  $emailAddress = $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('receiver./email', $typoScript),
- ConfigurationUtility::getValue('receiver./email.', $typoScript)
+ (string)ConfigurationUtility::getValue('receiver./email', $typoScript),
+ (array)ConfigurationUtility::getValue('receiver./email.', $typoScript)
  );
  $name = $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('receiver./name', $typoScript),
- ConfigurationUtility::getValue('receiver./name.', $typoScript)
+ (string)ConfigurationUtility::getValue('receiver./name', $typoScript),
+ (array)ConfigurationUtility::getValue('receiver./name.', $typoScript)
  );
  if ($emailAddress && $name) {
  $email->setTo([$emailAddress => $name]);
@@ -194,12 +194,12 @@ protected function overwriteEmailReceiver(array $typoScript, MailMessage $email)
  protected function overwriteEmailSender(array $typoScript, MailMessage $email): void
  {
  $emailAddress = $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('sender./email', $typoScript),
- ConfigurationUtility::getValue('sender./email.', $typoScript)
+ (string)ConfigurationUtility::getValue('sender./email', $typoScript),
+ (array)ConfigurationUtility::getValue('sender./email.', $typoScript)
  );
  $name = $this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('sender./name', $typoScript),
- ConfigurationUtility::getValue('sender./name.', $typoScript)
+ (string)ConfigurationUtility::getValue('sender./name', $typoScript),
+ (array)ConfigurationUtility::getValue('sender./name.', $typoScript)
  );
 
  if ($emailAddress && $name) {
@@ -213,8 +213,8 @@ protected function overwriteEmailSender(array $typoScript, MailMessage $email):
  */
  protected function setSubject(array $typoScript, MailMessage $email): void
  {
- if ($this->contentObject->cObjGetSingle($typoScript['subject'], $typoScript['subject.'])) {
- $email->setSubject($this->contentObject->cObjGetSingle($typoScript['subject'], $typoScript['subject.']));
+ if ($this->contentObject->cObjGetSingle((string)$typoScript['subject'], (array)$typoScript['subject.'])) {
+ $email->setSubject($this->contentObject->cObjGetSingle((string)$typoScript['subject'], (array)$typoScript['subject.']));
  }
  }
 
@@ -224,8 +224,8 @@ protected function setSubject(array $typoScript, MailMessage $email): void
  */
  protected function setCc(array $typoScript, MailMessage $email): void
  {
- if ($this->contentObject->cObjGetSingle($typoScript['cc'], $typoScript['cc.'])) {
- $email->setCc($this->contentObject->cObjGetSingle($typoScript['cc'], $typoScript['cc.']));
+ if ($this->contentObject->cObjGetSingle((string)$typoScript['cc'], (array)$typoScript['cc.'])) {
+ $email->setCc($this->contentObject->cObjGetSingle((string)$typoScript['cc'], (array)$typoScript['cc.']));
  }
  }
 
@@ -236,8 +236,8 @@ protected function setCc(array $typoScript, MailMessage $email): void
  protected function setPriority(array $typoScript, MailMessage $email): void
  {
  $priority = (int)$this->contentObject->cObjGetSingle(
- ConfigurationUtility::getValue('priority', $typoScript),
- ConfigurationUtility::getValue('priority.', $typoScript)
+ (string)ConfigurationUtility::getValue('priority', $typoScript),
+ (array)ConfigurationUtility::getValue('priority.', $typoScript)
  );
  if ($priority) {
  $email->priority($priority);
@@ -250,12 +250,12 @@ protected function setPriority(array $typoScript, MailMessage $email): void
  */
  protected function setAttachments(array $typoScript, MailMessage $email): void
  {
- if ($this->contentObject->cObjGetSingle($typoScript['attachments'] ?? '', $typoScript['attachments.'] ?? '')) {
+ if ($this->contentObject->cObjGetSingle($typoScript['attachments'] ?? '', $typoScript['attachments.'] ?? [])) {
  $files = GeneralUtility::trimExplode(
  ',',
  $this->contentObject->cObjGetSingle(
  $typoScript['attachments'] ?? '',
- $typoScript['attachments.'] ?? ''
+ $typoScript['attachments.'] ?? []
  ),
  true
  );
@@ -283,8 +283,8 @@ protected function getRelativeEmailPathAndFilename(string $fileName): string
  */
  protected function isMailEnabled(array $typoScript, array $receiver): bool
  {
- $cObjectName = ConfigurationUtility::getValue('_enable', $typoScript);
- $cObjectConf = ConfigurationUtility::getValue('_enable.', $typoScript);
+ $cObjectName = (string)ConfigurationUtility::getValue('_enable', $typoScript);
+ $cObjectConf = (array)ConfigurationUtility::getValue('_enable.', $typoScript);
 
  return $this->contentObject->cObjGetSingle($cObjectName, $cObjectConf) && count($receiver) > 0;
  }

Classes/Domain/Service/SendParametersService.php

@@ -94,7 +94,7 @@ protected function getUri()
  */
  protected function getData()
  {
- return $this->contentObject->cObjGetSingle($this->configuration['data'], $this->configuration['data.']);
+ return $this->contentObject->cObjGetSingle((string)$this->configuration['data'], (array)$this->configuration['data.']);
  }
 
  /**
@@ -118,7 +118,7 @@ protected function log()
  */
  protected function isTurnedOn()
  {
- return $this->contentObject->cObjGetSingle($this->configuration['_enable'], $this->configuration['_enable.'])
+ return $this->contentObject->cObjGetSingle((string)$this->configuration['_enable'], (array)$this->configuration['_enable.'])
  === '1';
  }
 

Classes/Finisher/SaveToAnyTableFinisher.php

@@ -127,8 +127,8 @@ protected function setPropertiesForTable($table, StoreInDatabaseService $storeIn
  foreach ($this->configuration[$table] as $field => $value) {
  if (!$this->isSkippedKey($field)) {
  $value = $this->contentObject->cObjGetSingle(
- $this->configuration[$table][$field],
- $this->configuration[$table][$field . '.']
+ (string)$this->configuration[$table][$field],
+ (array)$this->configuration[$table][$field . '.']
  );
  $storeInDatabase->addProperty($field, $value);
  }
@@ -144,8 +144,8 @@ protected function setPropertiesForTable($table, StoreInDatabaseService $storeIn
  protected function isTableEnabled($table)
  {
  return $this->contentObject->cObjGetSingle(
- $this->configuration[$table]['_enable'],
- $this->configuration[$table]['_enable.']
+ (string)$this->configuration[$table]['_enable'],
+ (array)$this->configuration[$table]['_enable.']
  ) === '1';
  }
 

Classes/Finisher/SendParametersFinisher.php

@@ -98,7 +98,7 @@ protected function getCurlSettings()
  */
  protected function getData()
  {
- return $this->contentObject->cObjGetSingle($this->configuration['data'], $this->configuration['data.']);
+ return $this->contentObject->cObjGetSingle((string)$this->configuration['data'], (array)$this->configuration['data.']);
  }
 
  protected function getTargetUrl()

Classes/Utility/UserUtility.php

@@ -17,6 +17,8 @@
 use TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
 
 /**
  * Class UserUtility

Documentation/Changelog/Index.rst

@@ -7,6 +7,16 @@ Changelog
 .. t3-field-list-table::
  :header-rows: 1
 
+-
+ :Version: 7.2.1
+ :Date: 2023-08-08
+ :Changes:
+
+ * [TASK] Adds documentation for extended - thx to Daniel Hofmann (in2code)
+ * [TASK] Update Image used for Github Actions
+ * [BUGFIX] Fixes reaction when no typoscript configuration is set for redirect - thx to Daniel Hofmann (in2code)
+ * [BUGFIX] Fixed Object Support for getDirtyPropertiesFromUser() - thx to Daniel Hofmann (in2code)
+
 -
  :Version: 7.2.0
  :Date: 2023-07-17
@@ -21,7 +31,6 @@ Changelog
  * [TASK] Corrects Documenation Rendering Configuration - thx to Daniel Hoffmann
  * [TASK] [TASK] Replace jQuery scrollTop with vanilla scrollIntoView - thx to Felix Ranesberger
 
-
 -
  :Version: 7.1.1
  :Date: 2023-03-16