Merge pull request #85 from pagemachine/typo3v12

Add support for TYPO3v12

.github/workflows/ci.yml

@@ -20,11 +20,15 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.4'
-          - '8.0'
           - '8.1'
         typo3:
           - ^11.5
+          - ^12.4
+        include:
+          - php: '7.4'
+            typo3: ^11.5
+          - php: '8.0'
+            typo3: ^11.5
 
     steps:
       - uses: actions/checkout@v4

Classes/Page/PageCollection.php

@@ -12,7 +12,7 @@
 final class PageCollection implements \IteratorAggregate, \Countable
 {
     /**
-     * @var \Doctrine\DBAL\Driver\Statement
+     * @var \Doctrine\DBAL\Result
      */
     private $pages;
 
@@ -32,7 +32,7 @@ public function __construct()
         $this->pages = $queryBuilder
             ->select('uid')
             ->from('pages')
-            ->execute();
+            ->executeQuery();
         $this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
     }
 
@@ -41,7 +41,7 @@ public function __construct()
      */
     public function getIterator(): \Generator
     {
-        foreach ($this->pages as $page) {
+        foreach ($this->pages->iterateAssociative() as $page) {
             yield new Page($page['uid']);
         }
     }

Classes/Page/Redirect/Conflict/RedirectConflictDetector.php

@@ -40,7 +40,7 @@ public function detect(Page $page): \Generator
             ]
         );
 
-        foreach ($redirects as $redirect) {
+        foreach ($redirects->iterateAssociative() as $redirect) {
             yield new ConflictRedirect($redirect['uid']);
         }
 
@@ -53,7 +53,7 @@ public function detect(Page $page): \Generator
             ]
         );
 
-        foreach ($redirects as $redirect) {
+        foreach ($redirects->iterateAssociative() as $redirect) {
             yield new ConflictRedirect($redirect['uid']);
         }
     }
@@ -81,8 +81,8 @@ private function getLanguageOfPage(Page $page): int
                 'uid',
                 $queryBuilder->createNamedParameter($page->getUid())
             ))
-            ->execute()
-            ->fetchColumn();
+            ->executeQuery()
+            ->fetchOne();
 
         return $pageLanguage;
     }

Classes/Page/Redirect/Typo3Uri.php

@@ -11,10 +11,12 @@
  */
 final class Typo3Uri extends Uri
 {
-    /**
-     * @var int[] Associative array containing schemes and their default ports.
-     */
-    protected $supportedSchemes = [
-        't3'  => 0,
-    ];
+    public function __construct(string $uri = '')
+    {
+        $this->supportedSchemes = [
+            't3' => 0,
+        ];
+
+        parent::__construct($uri);
+    }
 }

Tests/Functional/Fixtures/be_users.csv

@@ -0,0 +1,4 @@
+"be_users"
+,"uid","pid","username","password","admin","disable","deleted"
+# The password is "password"
+,1,0,"admin","$1$tCrlLajZ$C0sikFQQ3SWaFAZ1Me0Z/1",1,0,0

Tests/Functional/Hook/DataHandler/AddRedirectTest.php

@@ -5,6 +5,7 @@
 namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
 
 use TYPO3\CMS\Core\Configuration\SiteConfiguration;
+use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -29,7 +30,10 @@ final class AddRedirectTest extends FunctionalTestCase
      */
     public function addsRedirectsOnSlugChange(array $pages, array $changes, array $expected): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -148,7 +152,10 @@ public function redirectPages(): \Generator
      */
     public function skipsPagesWithoutSite(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -181,7 +188,10 @@ public function skipsPagesWithoutSite(): void
      */
     public function skipsInactivePages(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');

Tests/Functional/Hook/DataHandler/AmendSlugTest.php

@@ -4,6 +4,7 @@
 
 namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
 
+use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -29,7 +30,10 @@ final class AmendSlugTest extends FunctionalTestCase
      */
     public function ensuresFlatUrls(array $changes, int $pageUid, string $expected): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');

Tests/Functional/Hook/DataHandler/RefreshSlugTest.php

@@ -4,6 +4,7 @@
 
 namespace Pagemachine\FlatUrls\Tests\Functional\Hook\DataHandler;
 
+use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -28,7 +29,10 @@ final class RefreshSlugTest extends FunctionalTestCase
      */
     public function ensuresFlatUrls(array $pages, array $changes, int $pageUid, string $expected): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');

Tests/Functional/Hook/DataHandler/ResolveRedirectConflictTest.php

@@ -6,6 +6,7 @@
 
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Configuration\SiteConfiguration;
+use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -29,7 +30,10 @@ final class ResolveRedirectConflictTest extends FunctionalTestCase
      */
     public function resolvesPagePathRedirectConflicts(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -107,7 +111,10 @@ public function resolvesPagePathRedirectConflicts(): void
      */
     public function normalizesPagePath(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -187,7 +194,10 @@ public function normalizesPagePath(): void
      */
     public function resolvesUidRedirectConflicts(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -226,7 +236,10 @@ public function resolvesUidRedirectConflicts(): void
      */
     public function skipsPagesWithoutSite(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');
@@ -258,7 +271,10 @@ public function skipsPagesWithoutSite(): void
      */
     public function skipsInactivePages(): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $pageConnection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');

Tests/Functional/Page/Slug/PageSlugProcessorTest.php

@@ -6,6 +6,7 @@
 
 use Pagemachine\FlatUrls\Page\Page;
 use Pagemachine\FlatUrls\Page\Slug\PageSlugProcessor;
+use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -29,7 +30,10 @@ final class PageSlugProcessorTest extends FunctionalTestCase
      */
     public function updatesPageSlugs(array $pages, int $pageUid, string $expected): void
     {
-        $this->setUpBackendUserFromFixture(1);
+        $this->importCSVDataSet(__DIR__ . '/../../Fixtures/be_users.csv');
+        $this->setUpBackendUser(1);
+
+        Bootstrap::initializeLanguageObject();
 
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getConnectionForTable('pages');

composer.json

@@ -17,15 +17,14 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "typo3/cms-backend": "^11.5",
-        "typo3/cms-core": "^11.5",
-        "typo3/cms-extbase": "^11.5",
-        "typo3/cms-frontend": "^11.5",
-        "typo3/cms-redirects": "^11.5.7"
+        "typo3/cms-backend": "^11.5 || ^12.4",
+        "typo3/cms-core": "^11.5 || ^12.4",
+        "typo3/cms-extbase": "^11.5 || ^12.4",
+        "typo3/cms-frontend": "^11.5 || ^12.4",
+        "typo3/cms-redirects": "^11.5.7 || ^12.4"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^5.0",
-        "codedungeon/phpunit-result-printer": "^0.32.0",
         "ergebnis/composer-normalize": "^2.8",
         "jangregor/phpstan-prophecy": "^1.0.0",
         "php-parallel-lint/php-console-highlighter": "^1.0.0",

docker-compose.yml

@@ -2,9 +2,10 @@ version: '3'
 
 services:
   app:
-    image: thecodingmachine/php:${PHP_VERSION:-7.4}-v4-cli
+    image: thecodingmachine/php:${PHP_VERSION:-8.1}-v4-cli
     environment:
-      TYPO3_VERSION: ${TYPO3_VERSION:-^11.5}
+      PHP_EXTENSION_INTL: 1
+      TYPO3_VERSION: ${TYPO3_VERSION:-^12.4}
       TYPO3_API_PASSWORD:
       TYPO3_API_USERNAME:
       TAG:

ext_emconf.php

@@ -11,7 +11,7 @@
     'version' => '3.0.2',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.0-11.5.99',
+            'typo3' => '11.5.0-12.4.99',
         ],
     ],
 ];

phpunit-functional.xml

@@ -14,7 +14,6 @@
   stopOnIncomplete="false"
   stopOnSkipped="false"
   verbose="false"
-  printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
   xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
   <coverage>

phpunit.xml

@@ -14,7 +14,6 @@
   stopOnIncomplete="false"
   stopOnSkipped="false"
   verbose="false"
-  printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
   xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
   <coverage>