CI: Add TYPO3 v13 to test matrix

.Docker/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
   db:
     image: mariadb:10.3
-    restart: unless-stopped
+    restart: never
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: crawler
@@ -14,7 +14,7 @@ services:
 
   db_postgres:
     image: postgres:13.5-alpine3.15
-    restart: unless-stopped
+    restart: never
     environment:
       POSTGRES_DB: crawler
       POSTGRES_USER: root

.devbox/composer.json

@@ -15,16 +15,17 @@
         "issues": "https://github.com/tomasnorre/crawler/issues"
     },
     "require": {
-        "georgringer/news": "^11.4",
-        "tnm/crawler-devbox-sitepackage": "^0.0.2",
+        "tnm/crawler-devbox-sitepackage": "^0.0.3",
         "tomasnorre/crawler": "*@dev",
-        "typo3/cms-belog": "^12.4 || dev-main" ,
-        "typo3/cms-beuser": "^12.4 || dev-main",
-        "typo3/cms-felogin": "^12.4 || dev-main",
-        "typo3/cms-indexed-search": "^12.4 || dev-main",
-        "typo3/cms-info": "^12.4 || dev-main",
-        "typo3/cms-tstemplate": "^12.4 || dev-main",
-        "typo3/minimal": "^12.4 || dev-main"
+        "typo3/cms-belog": "^12.4 || ^13.4" ,
+        "typo3/cms-beuser": "^12.4 || ^13.4",
+        "typo3/cms-felogin": "^12.4 || ^13.4",
+        "typo3/cms-indexed-search": "^12.4 || ^13.4",
+        "typo3/cms-info": "^12.4 || ^13.4",
+        "typo3/cms-tstemplate": "^12.4 || ^13.4",
+        "typo3/minimal": "^12.4 || ^13.4",
+        "typo3/cms-install": "^12.4 || ^13.4",
+        "georgringer/news": "^12"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest"

.github/workflows/Acceptance.yml

@@ -9,7 +9,7 @@ on:
       - "main"
 
 jobs:
-  Acceptance:
+  Acceptance-CodeCeption:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -96,56 +96,66 @@ jobs:
           source_dir: 'Tests/Acceptance/_output/'
           destination_dir: '${{ matrix.typo3 }}-${{ matrix.php }}'
 
+  Acceptance-Playwright:
+    strategy:
+      fail-fast: false
+      matrix:
+        typo3:
+          - ^13.4
+        php:
+          - '8.2'
+          - '8.3'
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get branch name (merge)
+        if: github.event_name != 'pull_request'
+        shell: bash
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
 
-# Non Composer is commented out for now, till I find a better way to run them, the are failing more than not, so they
-# don't bring much value atm as they are often ignored. I know not good, but none the less the case.
-#  NonComposer:
-#    runs-on: self-hosted
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        typo3:
-#          - 'v11'
-#          - 'v11p80'
-#
-#    steps:
-#      - uses: shivammathur/setup-php@v2
-#        with:
-#          php-version: '8.1'
-#          tools: composer:v2
-#          coverage: none
-#
-#      - name: Version information
-#        run: |
-#          php -v
-#          composer --version
-#
-#      - uses: actions/checkout@v4
-#      - run: |
-#          cd .devbox/.ddev
-#          docker-compose -f docker-compose.selenium.yaml up -d
-#          cd ../.. # Going back to "root" directory
-#          rm -rf .Build composer.lock
-#          composer require nimut/typo3-complete:^11.5
-#          wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh
-#          chmod +x wait-for-it.sh
-#          docker ps
-#          ./wait-for-it.sh -t 60 localhost:4444
-#          php .Build/bin/codecept run --env=${{ matrix.typo3 }}-non-composer
-#
-#      - name: Upload Codeception output
-#        if: ${{ failure() }}
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: codeception-results
-#          path: Tests/Acceptance/_output/
-#
-#      - uses: shallwefootball/s3-upload-action@master
-#        if: ${{ failure() }}
-#        with:
-#          aws_key_id: ${{ secrets.AWS_KEY_ID }}
-#          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-#          aws_bucket: ${{ secrets.AWS_BUCKET }}
-#          source_dir: 'Tests/Acceptance/_output/'
-#          destination_dir: '${{ matrix.typo3 }}-non-composer'
-#
+      - name: Get branch name (pull request)
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF})" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v4
+      - uses: ddev/github-action-setup-ddev@v1
+        with:
+          ddevDir: ".devbox"
+      - name: CodeCeption
+        run: |
+          export FROM_PATH='../../'
+          export TO_PATH=$(echo $GITHUB_WORKSPACE)
+          cd .devbox
+          sed -i 's/php_version: "8.1"/php_version: "${{ matrix.php }}"/g' .ddev/config.yaml
+          sed -i "s|$FROM_PATH|$TO_PATH|g" .ddev/docker-compose.volume.yaml
+          ddev restart
+          rm -rf vendor composer.lock
+          ddev composer require typo3/cms-core=${{ matrix.typo3 }} tomasnorre/crawler=dev-$BRANCH_NAME
+          ddev exec bin/typo3 backend:lock
+          ddev exec bin/typo3 extension:setup
+          ddev exec bin/typo3 cache:flush
+          ddev exec bin/typo3 cache:warmup
+          ddev exec bin/typo3 upgrade:run
+          ddev exec bin/typo3 backend:unlock
+          cd .. # Going back to "root" directory
+          wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh
+          chmod +x wait-for-it.sh
+          docker ps
+          ./wait-for-it.sh -t 60 127.0.0.1:80
+          ./wait-for-it.sh -t 60 127.0.0.1:443
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Install dependencies
+        run: cd Tests/Acceptance-Playwright && npm ci
+      - name: Install Playwright Browsers
+        run: cd Tests/Acceptance-Playwright && npx playwright install --with-deps
+      - name: Run Playwright tests
+        run: cd Tests/Acceptance-Playwright && npx playwright test
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30

.github/workflows/Tests.yml

@@ -23,6 +23,10 @@ jobs:
           - '8.3'
         mysql:
           - '8.0'
+        include:
+          - typo3: '^13.4'
+            php: '8.3'
+            mysql: '8.0'
 
     steps:
       - name: Set up MySQL ${{ matrix.mysql }}
@@ -49,7 +53,7 @@ jobs:
         run: composer validate
 
       - name: Install dependencies with typo3/cms-core:${{ matrix.typo3 }}
-        if: matrix.typo3 != 'dev-main'
+        if: matrix.typo3 != '^13.4'
         run: |
           composer require typo3/cms-core:${{ matrix.typo3 }} --no-progress
           git checkout composer.json
@@ -59,7 +63,7 @@ jobs:
         run: find . -name \*.php ! -path "./.Build/*" ! -path "./scripts/*" ! -path "./typo3_src/*" ! -path "./Resources/*" | parallel --gnu php -d display_errors=stderr -l {} > /dev/null \;
 
       - name: Unit Tests
-        if: matrix.typo3 != 'dev-main'
+        if: matrix.typo3 != '^13.4'
         run: |
           export "UNIT_XML"=Tests/UnitTests.xml
           .Build/bin/phpunit --coverage-filter Classes --coverage-clover=unittest-coverage.clover --colors -c $UNIT_XML Tests/Unit
@@ -68,24 +72,24 @@ jobs:
         run: |
           export "FUNCTIONAL_XML"=Tests/FunctionalTests.xml
           .Build/bin/phpunit --coverage-filter Classes --coverage-clover=functional-coverage.clover --colors -c $FUNCTIONAL_XML Tests/Functional --process-isolation
-        if: matrix.typo3 != 'dev-main'
+        if: matrix.typo3 != '^13.4'
         env:
           typo3DatabaseHost: 127.0.0.1
           typo3DatabaseName: typo3
           typo3DatabasePassword: root
           typo3DatabaseUsername: root
 
-      - name: Tests for dev-main
+      - name: Tests for ^13.4
         run: |
           export "FUNCTIONAL_XML"=Tests/FunctionalTests.xml
           export "UNIT_XML"=Tests/UnitTests.xml
-          composer remove --dev ssch/typo3-rector
+          composer remove --dev ssch/typo3-rector infection/infection
           rm -rf composer.lock .Build
-          composer require typo3/cms-core:dev-main
+          composer require typo3/cms-backend:^13.4 typo3/cms-core:^13.4 typo3/cms-frontend:^13.4 typo3/cms-info:^13.4 typo3/cms-seo:^13.4
           ln -nfs .Build/vendor/typo3/cms/typo3 typo3
           .Build/bin/phpunit --colors -c $UNIT_XML Tests/Unit
           .Build/bin/phpunit --colors -c $FUNCTIONAL_XML Tests/Functional --process-isolation
-        if: matrix.typo3 == 'dev-main' && matrix.php == '8.1'
+        if: matrix.typo3 == '^13.4' && matrix.php == '8.3'
         env:
           typo3DatabaseHost: 127.0.0.1
           typo3DatabaseName: typo3

.run/Xdebug.run.xml

@@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Xdebug" type="PhpRemoteDebugRunConfigurationType" factoryName="PHP Remote Debug" filter_connections="NOT_FILTER">
+    <method v="2" />
+  </configuration>
+</component>

Classes/Domain/Repository/ProcessRepository.php

@@ -32,16 +32,18 @@
 use AOE\Crawler\Domain\Model\Process;
 use AOE\Crawler\Domain\Model\ProcessCollection;
 use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Exception;
 use Symfony\Contracts\Service\Attribute\Required;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
 /**
  * @internal since v9.2.5
  */
-class ProcessRepository extends Repository
+class ProcessRepository
 {
     final public const TABLE_NAME = 'tx_crawler_process';
 
@@ -66,12 +68,16 @@ public function setQueryBuilder(): void
 
     /**
      * This method is used to find all cli processes within a limit.
+     * @throws Exception
      */
     public function findAll(): ProcessCollection
     {
         /** @var ProcessCollection $collection */
         $collection = GeneralUtility::makeInstance(ProcessCollection::class);
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
+        $queryBuilder->getRestrictions()
+            ->removeByType(HiddenRestriction::class)
+            ->removeByType(DeletedRestriction::class);
 
         $statement = $queryBuilder
             ->select('*')
@@ -143,6 +149,10 @@ public function removeByProcessId($processId): void
     public function getActiveProcessesOlderThanOneHour()
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
+        $queryBuilder->getRestrictions()
+            ->removeByType(HiddenRestriction::class)
+            ->removeByType(DeletedRestriction::class);
+
         $activeProcesses = [];
         $statement = $queryBuilder
             ->select('process_id', 'system_process_id')
@@ -172,6 +182,9 @@ public function getActiveProcessesOlderThanOneHour()
     public function getActiveOrphanProcesses()
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
+        $queryBuilder->getRestrictions()
+            ->removeByType(HiddenRestriction::class)
+            ->removeByType(DeletedRestriction::class);
 
         return $queryBuilder
             ->select('process_id', 'system_process_id')
@@ -212,7 +225,7 @@ public function deleteProcessesMarkedAsDeleted(): void
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
         $queryBuilder
             ->delete(self::TABLE_NAME)
-            ->where($queryBuilder->expr()->eq('deleted', 1))
+            ->where($queryBuilder->expr()->eq('deleted', $queryBuilder->createNamedParameter(1)))
             ->executeStatement();
     }
 

Classes/Domain/Repository/QueueRepository.php

@@ -23,19 +23,18 @@
 use AOE\Crawler\Domain\Model\Process;
 use AOE\Crawler\Value\QueueFilter;
 use Doctrine\DBAL\ArrayParameterType;
-use PDO;
+use Doctrine\DBAL\Exception;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Symfony\Contracts\Service\Attribute\Required;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
 /**
  * @internal since v9.2.5
  */
-class QueueRepository extends Repository implements LoggerAwareInterface
+class QueueRepository implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
@@ -129,7 +128,7 @@ public function getQueueEntriesByQid(int $queueId, bool $force): array|false
             ->select('*')
             ->from(self::TABLE_NAME)
             ->where(
-                $queryBuilder->expr()->eq('qid', $queryBuilder->createNamedParameter($queueId, PDO::PARAM_INT))
+                $queryBuilder->expr()->eq('qid', $queryBuilder->createNamedParameter($queueId, Connection::PARAM_INT))
             );
         if (!$force) {
             $queryBuilder
@@ -431,7 +430,7 @@ public function getDuplicateQueueItemsIfExists(
                 $timeBegin = $currentTime - 100;
                 $timeEnd = $currentTime + 100;
                 $queryBuilder
-                    ->where('scheduled BETWEEN ' . $timeBegin . ' AND ' . $timeEnd . '')
+                    ->where('scheduled BETWEEN ' . $timeBegin . ' AND ' . $timeEnd . ' ')
                     ->orWhere($queryBuilder->expr()->lte('scheduled', $currentTime));
             } else {
                 $queryBuilder
@@ -506,6 +505,33 @@ public function getQueueEntriesForPageId(int $id, int $itemsPerPage, QueueFilter
         return $queryBuilder->executeQuery()->fetchAllAssociative();
     }
 
+    /**
+     * @throws Exception
+     */
+    public function findAll(): array
+    {
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
+        $queryBuilder
+            ->select('*')
+            ->from(self::TABLE_NAME);
+        return $queryBuilder->executeQuery()->fetchAllAssociative();
+    }
+
+    public function findByProcessId(string $processId): array
+    {
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable(self::TABLE_NAME);
+        return $queryBuilder
+            ->select('*')
+            ->from(self::TABLE_NAME)
+            ->where(
+                $queryBuilder->expr()->eq('process_id', $queryBuilder->createNamedParameter(
+                    $processId,
+                    Connection::PARAM_INT
+                ))
+            )
+            ->executeQuery()->fetchAllAssociative();
+    }
+
     /**
      * This internal helper method is used to create an instance of an entry object
      *