Merge branch 'in2code-de:master' into master

in2code-de · Oct 16, 2024 · bf09eca · bf09eca
2 parents 7e7aaac + 95c948b
commit bf09eca
Show file tree

Hide file tree

Showing 79 changed files with 5,382 additions and 918 deletions.
diff --git a/.ddev/docker-compose.browser.yaml b/.ddev/docker-compose.browser.yaml
@@ -1,4 +1,3 @@
-version: '3.6'
 services:
   chrome:
     container_name: ddev-${DDEV_SITENAME}-chromedriver

diff --git a/.ddev/docker-compose.typo3.yaml b/.ddev/docker-compose.typo3.yaml
@@ -1,4 +1,3 @@
-version: '3.6'
 services:
   web:
     environment:

diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/.project export-ignore
 /Tests export-ignore
 /Resources/Private/Sass/
 /Resources/Private/gulpfile.js

diff --git a/.github/workflows/ter-release.yml b/.github/workflows/ter-release.yml
@@ -21,18 +21,44 @@ jobs:
       TYPO3_API_PASSWORD: ${{ secrets.TYPO3_API_PASSWORD }}
 
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Check tag
+        run: |
+          if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
+            exit 1
+          fi
+
       - name: Get the version
         id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+
+      - name: Get comment
+        id: get-comment
+        run: |
+          readonly local comment=$(git tag -n10 -l ${{ env.version }} | sed "s/^[0-9.]*[ ]*//g")
+
+          if [[ -z "${comment// }" ]]; then
+            echo "comment=Released version ${{ env.version }} of ${{ env.TYPO3_EXTENSION_KEY }}" >> $GITHUB_ENV
+          else
+            {
+              echo 'comment<<EOF'
+              echo "$comment"
+              echo EOF
+            } >> "$GITHUB_ENV"
+          fi
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
           extensions: intl, mbstring, xml, soap, zip, curl
+          tools: composer:v2
 
       - 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 }}"
+      - name: Publish to TER
+        run: php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ env.comment }}" ${{ env.version }}
+
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -55,6 +55,21 @@ jobs:
         run: "composer install"
       - name: "Run PHP CS Fixer"
         run: "composer test:php:cs"
+  phpstan:
+    name: "PHPstan"
+    runs-on: ubuntu-20.04
+    needs: php-lint
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+      - name: "Install PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+      - name: "Composer Install"
+        run: "composer install"
+      - name: "Run PHPstan"
+        run: "composer test:php:phpstan"
   unit-tests:
     name: "PHP Unit Tests"
     runs-on: ubuntu-20.04

diff --git a/.project/data/db.sql.gz b/.project/data/db.sql.gz
diff --git a/.project/tests/phpstan-baseline.neon b/.project/tests/phpstan-baseline.neon
diff --git a/.project/tests/phpstan.neon b/.project/tests/phpstan.neon
@@ -0,0 +1,8 @@
+includes:
+    - phpstan-baseline.neon
+parameters:
+    level: 8
+    paths:
+        - ../../Classes
+
+# ToDo: fix ../../Tests for inclusion in phpstan
diff --git a/.project/typo3/settings.php b/.project/typo3/settings.php
@@ -58,6 +58,9 @@
         'scheduler' => [
             'maxLifetime' => '1440',
         ],
+        'static_info_tables' => [
+            'enableManager' => '0',
+        ],
     ],
     'FE' => [
         'debug' => true,

diff --git a/Classes/Controller/FormController.php b/Classes/Controller/FormController.php
@@ -95,26 +95,16 @@ public function formAction(): ResponseInterface
     }
 
     /**
-     * Workaround for TYPO3 v12
-     * It turned out that it does not cover all use cases
-     * Will be removed for TYPO3 v13 without any replacement. Functionality is already in `initializeConfirmationAction`
-     *
      * @param Mail $mail
      * @return ResponseInterface
      * @throws DeprecatedException
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws InvalidQueryException
      * @throws NoSuchArgumentException
-     * @deprecated since version 12.3.2, will be removed in version 13.0.0
      */
     public function checkConfirmationAction(Mail $mail): ResponseInterface
     {
-        trigger_error(
-            'EXT:powermail -- Method "checkConfirmationAction" is deprecated since version 12.3.2, will be removed in version 13.0.0',
-            E_USER_DEPRECATED
-        );
-
         $response = $this->forwardIfFormParamsDoNotMatch();
 
         if ($response !== null) {
@@ -188,6 +178,10 @@ public function initializeConfirmationAction(): void
      */
     public function confirmationAction(Mail $mail): ResponseInterface
     {
+        if ($mail->getUid() !== null) {
+            return (new ForwardResponse('form'))->withoutArguments();
+        }
+
         $event = GeneralUtility::makeInstance(FormControllerConfirmationActionEvent::class, $mail, $this);
         $this->eventDispatcher->dispatch($event);
         $mail = $event->getMail();
@@ -205,36 +199,6 @@ public function confirmationAction(Mail $mail): ResponseInterface
     }
 
     /**
-     *   Workaround for TYPO3 v12
-     *   It turned out that it does not cover all use cases
-     *   Will be removed for TYPO3 v13 without any replacement. Functionality is already in `initializeCreateAction`
-     *
-     * @return void
-     * @throws DeprecatedException
-     * @throws ExtensionConfigurationExtensionNotConfiguredException
-     * @throws ExtensionConfigurationPathDoesNotExistException
-     * @throws InvalidQueryException
-     * @throws NoSuchArgumentException
-     */
-    public function initializeCheckCreateAction(): void
-    {
-        // ToDo -- v13: move exceptions to methods
-        $response = $this->forwardIfMailParamEmpty();
-        if ($response !== null) {
-            throw new PropagateResponseException($response);
-        }
-
-        $response = $this->forwardIfFormParamsDoNotMatch();
-        if ($response !== null) {
-            throw new PropagateResponseException($response);
-        }
-    }
-
-    /**
-     *  Workaround for TYPO3 v12
-     *  It turned out that it does not cover all use cases
-     *  Will be removed for TYPO3 v13 without any replacement. Functionality is already in `initializeConformationAction`
-     *
      * @param Mail $mail
      * @return ResponseInterface
      * @throws DeprecatedException
@@ -310,6 +274,9 @@ public function initializeCreateAction(): void
      */
     public function createAction(Mail $mail, string $hash = ''): ResponseInterface
     {
+        if ($mail->getUid() !== null && !HashUtility::isHashValid($hash, $mail)) {
+            return (new ForwardResponse('form'))->withoutArguments();
+        }
         $event = GeneralUtility::makeInstance(FormControllerCreateActionBeforeRenderViewEvent::class, $mail, $hash, $this);
         $this->eventDispatcher->dispatch($event);
         $mail = $event->getMail();

diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php
@@ -71,7 +71,7 @@ public function initializeAction(): void
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @noinspection PhpUnused
      */
     public function dispatchAction(string $forwardToAction = 'list'): ResponseInterface
@@ -93,15 +93,10 @@ public function listAction(): ResponseInterface
         $formUids = $this->mailRepository->findGroupedFormUidsToGivenPageUid((int)$this->id);
         $mails = $this->mailRepository->findAllInPid((int)$this->id, $this->settings, $this->piVars);
 
-        $currentPage = 1;
-        if ($this->request->hasArgument('tx_powermail_web_powermailm1')) {
-            $moduleArguments = $this->request->getArgument('tx_powermail_web_powermailm1');
-            if (array_key_exists('currentPage', $moduleArguments)) {
-                $currentPage =  (int)$moduleArguments['currentPage'];
-            }
-        }
+        $currentPage = (int)($this->request->getQueryParams()['currentPage'] ?? 1);
+        $currentPage = $currentPage > 0 ? $currentPage : 1;
 
-        $itemsPerPage = $this->settings['perPage'] ?? 10;
+        $itemsPerPage = (int)($this->settings['perPage'] ?? 10);
         $paginator = GeneralUtility::makeInstance(QueryResultPaginator::class, $mails, $currentPage, $itemsPerPage);
         $pagination = GeneralUtility::makeInstance(SlidingWindowPagination::class, $paginator, 15);
 
@@ -130,11 +125,11 @@ public function listAction(): ResponseInterface
     }
 
     /**
-     * @return void
+     * @return ResponseInterface|null
      * @throws InvalidQueryException
      * @noinspection PhpUnused
      */
-    public function exportXlsAction(): ResponseInterface
+    public function exportXlsAction(): ?ResponseInterface
     {
         if ($this->isPhpSpreadsheetInstalled) {
             $this->view->assignMultiple(
@@ -164,10 +159,11 @@ public function exportXlsAction(): ResponseInterface
                 ->withAddedHeader('Pragma', 'no-cache')
                 ->withBody($this->streamFactory->createStreamFromFile($tmpFilename));
         }
+        return null;
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidQueryException
      * @noinspection PhpUnused
      */
@@ -193,7 +189,7 @@ public function exportCsvAction(): ResponseInterface
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidQueryException
      * @throws RouteNotFoundException
      * @noinspection PhpUnused
@@ -219,7 +215,7 @@ public function reportingFormBeAction(): ResponseInterface
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidQueryException
      * @throws RouteNotFoundException
      * @throws PropertyNotAccessibleException
@@ -246,7 +242,7 @@ public function reportingMarketingBeAction(): ResponseInterface
     }
 
     /**
-     * @return void
+     * @return ResponseInterface
      * @throws InvalidQueryException
      * @throws ExceptionExtbaseObject
      * @noinspection PhpUnused
@@ -289,7 +285,7 @@ protected function sendTestEmail($email = null): void
             $body = 'New Test Email from User ' . BackendUtility::getPropertyFromBackendUser('username');
             $body .= ' (' . GeneralUtility::getIndpEnv('HTTP_HOST') . ')';
             $senderEmail = ConfigurationUtility::getDefaultMailFromAddress('powermail@domain.net');
-            $this->view->assignMultiple(
+            $this->moduleTemplate->assignMultiple(
                 [
                     'issent' => MailUtility::sendPlainMail($email, $senderEmail, 'New Powermail Test Email', $body),
                     'email' => $email,