Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for TYPO3 10 + Powermail 8 compatibility #38

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support for TYPO3 10 + Powermail 8 compatibility #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13c28e2
[TASK] change constraints for TYPO3 10
akoenig-clickstorm Jul 6, 2020
9084298
[TASK] migrate registration for pagetsconfig to Overrides/pages.php
akoenig-clickstorm Jul 6, 2020
7312466
[TASK] migrations for powermail 8
akoenig-clickstorm Jul 8, 2020
0aa79b9
[TASK] rebase TsConfig path
akoenig-clickstorm Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Classes/Powermail/Finisher/CleverReach.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,23 @@ class CleverReach extends AbstractFinisher
*/
protected $mailRepository;



/**
* typoScriptService
* Because of T3 7 compatibility use this class
* @var \TYPO3\CMS\Extbase\Service\TypoScriptService
* @TYPO3\CMS\Extbase\Annotation\Inject
*
* @var \TYPO3\CMS\Core\TypoScript\TypoScriptService
*/
protected $typoScriptService;
protected $typoScriptService = null;

/**
* Inject a typoScriptService
*
* @param \TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService
*/
public function injectTypoScriptService(\TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService)
{
$this->typoScriptService = $typoScriptService;
}


/**
Expand Down Expand Up @@ -121,7 +130,7 @@ public function cleverreachFinisher()
/**
* Initialize
*/
public function initializeFinisher()
public function initializeFinisher(): void
{
$configuration = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings);
if (!empty($configuration['dbEntry.'])) {
Expand Down
9 changes: 9 additions & 0 deletions Configuration/TCA/Overrides/pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php
defined('TYPO3_MODE') or die();

/* Register PageTSconfig */
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
'cleverreach',
'Configuration/TsConfig/powermail.tsconfig',
'EXT:cleverreach - Page TSconfig'
);
0 ...poScript/TsConfig/Page/powermail.tsconfig → Configuration/TsConfig/powermail.tsconfig
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"homepage": "http://wappler.systems",
"license": "GPL-2.0-or-later",
"require": {
"typo3/cms-core": "^7.6 || ^8.7 || ^9.5"
"typo3/cms-core": "^7.6 || ^8.7 || ^9.5 || ^10.4"
},
"replace": {
"svewap/cleverreach": "self.version"
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'author' => 'Sven Wappler',
'author_email' => 'typo3YYYY@wappler.systems',
'author_company' => 'WapplerSystems',
'version' => '0.1.7',
'version' => '0.1.8',
'constraints' => [
'depends' => [
'typo3' => '7.6.0-9.5.99',
'typo3' => '7.6.0-10.4.99',
'php' => '7.0.0-7.4.99',
],
'conflicts' => [],
Expand Down