diff --git a/.github/workflows/tasks.yml b/.github/workflows/tasks.yml index 31512fb..7e05f7d 100644 --- a/.github/workflows/tasks.yml +++ b/.github/workflows/tasks.yml @@ -11,10 +11,6 @@ jobs: matrix: php: [ '8.3', '8.4', '8.5', '8.6' ] typo3: [ '13' ] - include: - # phpro/grumphp does not allow PHP 8.6 yet - - php: '8.6' - ignorePlatformReqs: '--ignore-platform-req=php+' steps: - name: Setup PHP with PECL extension uses: shivammathur/setup-php@v2 @@ -27,11 +23,8 @@ jobs: key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | ${{ runner.os }}-${{ matrix.php }}-composer- - - run: composer require typo3/cms-frontend="^${{ matrix.typo3 }}" --dev ${{ matrix.ignorePlatformReqs }} - - run: composer install --no-interaction --no-progress ${{ matrix.ignorePlatformReqs }} - # --ignore-platform-req=php+ may only skip the PHP check of dev dependencies (e.g. phpro/grumphp) - - if: matrix.php == '8.6' - run: composer check-platform-reqs --no-dev + - run: composer require typo3/cms-frontend="^${{ matrix.typo3 }}" --dev + - run: composer install --no-interaction --no-progress - run: ./vendor/bin/grumphp run --ansi - run: composer test diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf index 4371f39..0a6e040 100644 --- a/Resources/Private/Language/de.locallang_db.xlf +++ b/Resources/Private/Language/de.locallang_db.xlf @@ -1,228 +1,223 @@ - + - -
- - - - Mail Logger - - - Mail Logger by anders und sehr GmbH - - - Mail Logger - - - E-Mail Templates - - - - - Mail Logger - - - Ausgehende E-Mails - - - Ausgehende E-mail - - - Sender/Empfänger - - - Info - - - Nachricht - - - Header - - - Debug - - - Details - - - Vorlage - - - Betreff - - - An - - - Akzeptierte Empfänger - - - Ergebnis - - - Status - - - Von - - - CC - - - BCC - - - Sprache - - - Datum - - - Result - - - E-Mail-Protokoll filtern - - - Status - - - Alle Status - - - Unbekannt - - - Erfolgreich versendet - - - Nicht versendet / Fehler - - - In Warteschlange - - - Filter anwenden - - - Zurücksetzen - - - Keine E-Mail-Protokolle entsprechen den gewählten Filtern. - - - - - Task - - - Configuration - - - Last State - - - Task State - - - Parameters - - - Logs - - - Is Running - - - Is Readonly - - - Task - - - - - E-Mail Template - - - Mailing Options - - - Vorlage - - - DKIM signature - - - Title - - - Subject - - - Message - - - Warnung: Verwenden Sie nicht den ViewHelper f:format.html. Verwenden Sie stattdessen f:transform.html. - - - Nicht unterstützter ViewHelper - - - Mail From (name) - - - Mail From (mail address) - - - Mail To (names, comma separated) - - - Mail To (mail addresses, comma separated) - - - Mail Copies (cc mail addresses, comma separated) - - - Mail Blind Copies (bcc mail addresses, comma separated) - - - - - E-Mail Log - - - Template - - - Rendering template - - - Subject - - - Message - - - Mail From - - - Mail To - - - Mail Copies - - - Mail Blind Copies - - - Result - - - Headers - - - - + +
+ + + + Mail Logger + + + Mail Logger by anders und sehr GmbH + + + Mail Logger + + + E-Mail Templates + + + + Mail Logger + + + Ausgehende E-Mails + + + Ausgehende E-mail + + + Sender/Empfänger + + + Info + + + Nachricht + + + Header + + + Debug + + + Details + + + Vorlage + + + Betreff + + + An + + + Akzeptierte Empfänger + + + Ergebnis + + + Status + + + Von + + + CC + + + BCC + + + Sprache + + + Datum + + + Result + + + E-Mail-Protokoll filtern + + + Status + + + Alle Status + + + Unbekannt + + + Erfolgreich versendet + + + Nicht versendet / Fehler + + + In Warteschlange + + + Filter anwenden + + + Zurücksetzen + + + Keine E-Mail-Protokolle entsprechen den gewählten Filtern. + + + + Task + + + Configuration + + + Last State + + + Task State + + + Parameters + + + Logs + + + Is Running + + + Is Readonly + + + Task + + + + E-Mail Template + + + Mailing Options + + + Vorlage + + + DKIM signature + + + Title + + + Subject + + + Message + + + Warnung: Verwenden Sie nicht den ViewHelper f:format.html. Verwenden Sie stattdessen f:transform.html. + + + Nicht unterstützter ViewHelper + + + Mail From (name) + + + Mail From (mail address) + + + Mail To (names, comma separated) + + + Mail To (mail addresses, comma separated) + + + Mail Copies (cc mail addresses, comma separated) + + + Mail Blind Copies (bcc mail addresses, comma separated) + + + + E-Mail Log + + + Template + + + Rendering template + + + Subject + + + Message + + + Mail From + + + Mail To + + + Mail Copies + + + Mail Blind Copies + + + Result + + + Headers + + + diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf index 9a1a294..8d2309e 100644 --- a/Resources/Private/Language/locallang_db.xlf +++ b/Resources/Private/Language/locallang_db.xlf @@ -1,199 +1,195 @@ - + - -
- - - - Mail Log - - - Mail Logger by anders und sehr GmbH - - - Mail Log - - - Mail templates - - - - - Mail Logger - - - Outgoing E-mails - - - Outgoing E-mail - - - Sender/Receiver - - - Info - - - Message - - - Headers - - - Debug - - - Details - - - Template - - - Subject - - - To - - - Accepted recipients - - - From - - - CC - - - BCC - - - Language - - - Date - - - Result - - - Filter mail log - - - Status - - - All statuses - - - Unknown - - - Sent successfully - - - Not sent / error - - - Queued - - - Apply filters - - - Reset - - - No mail logs match the selected filters. - - - - - E-Mail Template - - - Mailing Options - - - Vorlage - - - Rendering Template Vorlage - - - DKIM Signaturdomain - - - Title - - - Subject - - - Message - - - Warning: Do not use the f:format.html view helper. Use f:transform.html instead. - - - Unsupported view helper - - - Mail From (name) - - - Mail From (mail address) - - - Mail To (names, comma separated) - - - Mail To (mail addresses, comma separated) - - - Mail Copies (cc mail addresses, comma separated) - - - Mail Blind Copies (bcc mail addresses, comma separated) - - - - - E-Mail Log - - - Vorlage - - - Subject - - - Message - - - Mail From - - - Mail To - - - Mail Copies - - - Mail Blind Copies - - - Result - - - Result - - - Status - - - Headers - - - - + +
+ + + + Mail Log + + + Mail Logger by anders und sehr GmbH + + + Mail Log + + + Mail templates + + + + Mail Logger + + + Outgoing E-mails + + + Outgoing E-mail + + + Sender/Receiver + + + Info + + + Message + + + Headers + + + Debug + + + Details + + + Template + + + Subject + + + To + + + Accepted recipients + + + From + + + CC + + + BCC + + + Language + + + Date + + + Result + + + Filter mail log + + + Status + + + All statuses + + + Unknown + + + Sent successfully + + + Not sent / error + + + Queued + + + Apply filters + + + Reset + + + No mail logs match the selected filters. + + + + E-Mail Template + + + Mailing Options + + + Vorlage + + + Rendering Template Vorlage + + + DKIM Signaturdomain + + + Title + + + Subject + + + Message + + + Warning: Do not use the f:format.html view helper. Use f:transform.html instead. + + + Unsupported view helper + + + Mail From (name) + + + Mail From (mail address) + + + Mail To (names, comma separated) + + + Mail To (mail addresses, comma separated) + + + Mail Copies (cc mail addresses, comma separated) + + + Mail Blind Copies (bcc mail addresses, comma separated) + + + + E-Mail Log + + + Vorlage + + + Subject + + + Message + + + Mail From + + + Mail To + + + Mail Copies + + + Mail Blind Copies + + + Result + + + Result + + + Status + + + Headers + + + diff --git a/composer.json b/composer.json index 268b90c..2d6a6e0 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "ext-json": "*", "andersundsehr/no-ci": "^1.1", "helhum/typo3-console": "^8.3.1", - "pluswerk/grumphp-config": "^10.2.9", + "pluswerk/grumphp-config": "^11.4.0", "saschaegerer/phpstan-typo3": "^2.2.0", "spatie/phpunit-snapshot-assertions": "^5.4.0", "ssch/typo3-rector": "^3.14.4", @@ -41,6 +41,7 @@ }, "config": { "allow-plugins": { + "a9f/fractor-extension-installer": true, "andersundsehr/no-ci": true, "cweagans/composer-patches": true, "ergebnis/composer-normalize": true, diff --git a/phpunit.xml b/phpunit.xml index ed3b8bf..f57549d 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,48 +1,35 @@ - - - - - - - - - Classes - - - - - - - - - - - - - Tests/Unit/ - - - Tests/Functional/ - Tests/Functional/MailLogRepository/AbstractMailLogRepositoryTest.php - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="true" bootstrap="Tests/FunctionalTestsBootstrap.php" cacheResult="false" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" failOnWarning="true" executionOrder="random" processIsolation="true"> + + + + + + + + + Classes + + + + + + + + + + + + + Tests/Unit/ + + + Tests/Functional/ + Tests/Functional/MailLogRepository/AbstractMailLogRepositoryTest.php + + + + +