feat: TYPO3 13.4 compatibility

netlogix · Nov 9, 2024 · e86a5cc · e86a5cc
1 parent 2c2a2eb
commit e86a5cc
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 176 deletions.
diff --git a/.github/workflows/apply-coding-standard.yml b/.github/workflows/apply-coding-standard.yml
@@ -16,7 +16,7 @@ jobs:
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.3'
           tools: composer
 
       - name: 'Get Composer Cache Directory'
@@ -26,7 +26,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: 'Cache Composer Dependencies'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: composer
@@ -35,9 +35,9 @@ jobs:
         shell: bash
         run: composer install --no-interaction
 
-      - name: 'Rector PHP Code'
-        shell: bash
-        run: composer rector-fix
+#      - name: 'Rector PHP Code'
+#        shell: bash
+#        run: composer rector-fix
 
       - name: 'Lint PHP Code'
         shell: bash
@@ -52,8 +52,7 @@ jobs:
         run: composer test-functional
 
       - name: 'Create pull-request'
-        id: cpr
-        uses: peter-evans/[email protected]
+        uses: peter-evans/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "[automated] Apply Coding Standard"
@@ -62,9 +61,3 @@ jobs:
           title: '[automated] Apply Coding Standard'
           labels: 'automated'
           delete-branch: true
-
-      - name: 'Enable Pull Request Merge when ready'
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,12 +20,12 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: TYPO3 v12.4 tests on PHP ${{ matrix.php }}
+    name: TYPO3 v13.4 tests on PHP ${{ matrix.php }}
 
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3 ]
+        php: [ 8.3 ]
 
     steps:
       - name: 'Checkout code'
@@ -46,7 +46,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: 'Cache Composer Dependencies'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: composer-php${{ matrix.php }}
@@ -72,7 +72,7 @@ jobs:
         run: .Build/bin/phpcov merge --html .Build/artifacts/coverage/merged --clover .Build/artifacts/coverage/clover.xml .Build/artifacts/coverage/
 
       - name: 'Generate code coverage summary report'
-        uses: saschanowak/CloverCodeCoverageSummary@0.4.0
+        uses: saschanowak/CloverCodeCoverageSummary@1.1.0
         with:
           filename: .Build/artifacts/coverage/clover.xml
 

diff --git a/Classes/Command/GenerateCommand.php b/Classes/Command/GenerateCommand.php
@@ -35,11 +35,11 @@ protected function configure(): void
             ->addArgument('package', InputArgument::OPTIONAL, 'Name of the package', '');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $packages = array_filter(
             $this->packageManager->getAvailablePackages(),
-            fn (PackageInterface $package) => !$package->getPackageMetaData()
+            fn (PackageInterface $package): bool => !$package->getPackageMetaData()
                 ->isFrameworkType()
         );
         ksort($packages);
@@ -84,13 +84,13 @@ public function execute(InputInterface $input, OutputInterface $output): int
             ucfirst($this->doctrineService->getDatabasePlatformName()),
             basename($migrationClassPathAndFilename)
         );
-        GeneralUtility::mkdir_deep(dirname((string) $targetPathAndFilename));
+        GeneralUtility::mkdir_deep(dirname($targetPathAndFilename));
         rename($migrationClassPathAndFilename, $targetPathAndFilename);
 
         $output->writeln(
             sprintf('The migration was moved to: <comment>%s</comment>', substr(
                 realpath($targetPathAndFilename),
-                strlen((string) Environment::getProjectPath())
+                strlen(Environment::getProjectPath())
             ))
         );
         $output->writeln('- Review and adjust the generated migration.');

diff --git a/Classes/Command/MigrateCommand.php b/Classes/Command/MigrateCommand.php
@@ -29,7 +29,7 @@ protected function configure(): void
             ->addOption('dryRun', null, InputOption::VALUE_NONE, 'Whether to do a dry run or not');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $result = $this->doctrineService->executeMigrations(
             version: $this->normalizeVersion($input->getArgument('version')),

diff --git a/Classes/Command/MigrationExecuteCommand.php b/Classes/Command/MigrationExecuteCommand.php
@@ -37,7 +37,7 @@ protected function configure(): void
             ->addOption('dryRun', null, InputOption::VALUE_NONE, 'Whether to do a dry run or not');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $result = $this->doctrineService->executeMigration(
             version: $this->normalizeVersion($input->getArgument('version')),

diff --git a/Classes/Command/MigrationVersionCommand.php b/Classes/Command/MigrationVersionCommand.php
@@ -33,7 +33,7 @@ protected function configure(): void
             ->addOption('delete', null, InputOption::VALUE_NONE, 'The migration to mark as not migrated');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('add') === false && $input->getOption('delete') === false) {
             throw new InvalidArgumentException(

diff --git a/Classes/Command/StatusCommand.php b/Classes/Command/StatusCommand.php
@@ -31,7 +31,7 @@ protected function configure(): void
             );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output): int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln($this->doctrineService->getFormattedMigrationStatus($input->getOption('showMigrations')));
 

diff --git a/Classes/Service/DependencyFactory.php b/Classes/Service/DependencyFactory.php
@@ -4,6 +4,9 @@
 
 namespace Netlogix\Migrations\Service;
 
+use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\Migrations\Configuration\Connection\ExistingConnection;
 use Doctrine\Migrations\Configuration\Migration\ConfigurationArray;
 use Doctrine\Migrations\DependencyFactory as DoctrineDependencyFactory;
@@ -40,13 +43,16 @@ public function createFromConnection(Connection $connection, BufferedOutput $log
         $connectionLoader = new ExistingConnection($connection);
         $logger = new ConsoleLogger($logMessages);
 
-        $databasePlatformName = ucfirst((string) $connection->getDatabasePlatform()->getName());
         $dependencyFactory = DoctrineDependencyFactory::fromConnection($configurationLoader, $connectionLoader);
         $dependencyFactory->setService(
             MigrationFinderInterface::class,
             new MigrationFinder(
                 packageManager: GeneralUtility::makeInstance(PackageManager::class),
-                databasePlatformName: $databasePlatformName,
+                databasePlatformName: match (true) {
+                    $connection->getDatabasePlatform() instanceof AbstractMySQLPlatform => 'Mysql',
+                    $connection->getDatabasePlatform() instanceof PostgreSQLPlatform => 'Postgresql',
+                    $connection->getDatabasePlatform() instanceof SQLitePlatform => 'Sqlite',
+                }
             )
         );
         $dependencyFactory->setService(LoggerInterface::class, $logger);

diff --git a/Classes/Service/DoctrineService.php b/Classes/Service/DoctrineService.php
@@ -4,6 +4,9 @@
 
 namespace Netlogix\Migrations\Service;
 
+use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\Migrations\DependencyFactory as DoctrineDependencyFactory;
 use Doctrine\Migrations\Exception\MigrationClassNotFound;
 use Doctrine\Migrations\Exception\NoMigrationsFoundWithCriteria;
@@ -83,7 +86,7 @@ public function executeMigrations(
         string $outputPathAndFilename = null,
         mixed $dryRun = false,
         bool $quiet = false
-    ) {
+    ): string {
         $migrationRepository = $this->dependencyFactory->getMigrationRepository();
         if (count($migrationRepository->getMigrations()) === 0) {
             return sprintf('The version "%s" can\'t be reached, there are no registered migrations.', $version);
@@ -230,9 +233,12 @@ public function generateMigration(): string
 
     public function getDatabasePlatformName(): string
     {
-        return $this->dependencyFactory->getConnection()
-            ->getDatabasePlatform()
-            ->getName();
+        $platform = $this->connection->getDatabasePlatform();
+        return match (true) {
+            $platform instanceof AbstractMySQLPlatform => 'Mysql',
+            $platform instanceof PostgreSQLPlatform => 'Postgresql',
+            $platform instanceof SQLitePlatform => 'Sqlite',
+        };
     }
 
     private function getSortedVersions(
@@ -323,7 +329,7 @@ private function mark(
             $marked = true;
         }
 
-        if ($marked === true) {
+        if ($marked) {
             return;
         }
 

diff --git a/Classes/Service/Files.php b/Classes/Service/Files.php
@@ -13,11 +13,7 @@ public static function concatenatePaths(string ...$paths): string
         $resultingPath = '';
         foreach ($paths as $index => $path) {
             $path = GeneralUtility::fixWindowsFilePath($path);
-            if ($index === 0) {
-                $path = rtrim($path, '/');
-            } else {
-                $path = trim($path, '/');
-            }
+            $path = $index === 0 ? rtrim($path, '/') : trim($path, '/');
             if ($path !== '') {
                 $resultingPath .= $path . '/';
             }

diff --git a/Configuration/Services.php b/Configuration/Services.php
@@ -9,7 +9,7 @@
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 
-return function (ContainerConfigurator $containerConfigurator) {
+return function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services()
         ->defaults()
         ->autowire()

diff --git a/composer.json b/composer.json
@@ -4,15 +4,14 @@
   "type": "typo3-cms-extension",
   "license": "MIT",
   "require": {
-    "php": "^8.1",
-    "typo3/cms-core": "^12.4",
-    "doctrine/migrations": "^3.7"
+    "php": "^8.3",
+    "typo3/cms-core": "^12.4 | ^13.4",
+    "doctrine/migrations": "^3.8"
   },
   "require-dev": {
     "ext-sqlite3": "*",
-    "ssch/typo3-rector": "^1.5",
-    "typo3/testing-framework": "^8.0",
-    "phpunit/phpcov": "^9.0",
+    "typo3/testing-framework": "^8.0 | ^9.0",
+    "phpunit/phpcov": "^9.0 | ^10.0",
     "netlogix/coding-guidelines-php": "^1.0"
   },
   "autoload": {

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `sys_doctrine_migrationstatus` (
+    version varchar(255) NOT NULL,
+    executed_at datetime,
+    execution_time integer,
+
+    PRIMARY KEY (version)
+) ENGINE=InnoDB;