IBX-11939: Added the missing ON UPDATE CASCADE to ezcontentclass_attribute_ml's SQLite foreign key

composer.json

@@ -28,6 +28,7 @@
         "friendsofphp/proxy-manager-lts": "^1.0",
         "friendsofsymfony/http-cache-bundle": "^3.3",
         "friendsofsymfony/jsrouting-bundle": "^3.6",
+        "ibexa/doctrine-migrations": "~6.0.x-dev",
         "ibexa/doctrine-schema": "~6.0.x-dev",
         "ibexa/jms-translation-bundle": "^3.0",
         "league/flysystem-memory": "^2.0.6",

phpstan-baseline.neon

@@ -2994,12 +2994,6 @@ parameters:
 			count: 1
 			path: src/bundle/RepositoryInstaller/Command/InstallPlatformCommand.php
 
-		-
-			message: '#^Method Ibexa\\Bundle\\RepositoryInstaller\\Command\\InstallPlatformCommand\:\:__construct\(\) has parameter \$installers with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/bundle/RepositoryInstaller/Command/InstallPlatformCommand.php
-
 		-
 			message: '#^Method Ibexa\\Bundle\\RepositoryInstaller\\Command\\InstallPlatformCommand\:\:cacheClear\(\) has no return type specified\.$#'
 			identifier: missingType.return

src/bundle/Core/DependencyInjection/Configuration.php

@@ -58,6 +58,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addUrlWildcardsSection($rootNode);
         $this->addOrmSection($rootNode);
         $this->addUITranslationsSection($rootNode);
+        $this->addInstallerSection($rootNode);
 
         // Delegate SiteAccess config to configuration parsers
         $this->mainSiteAccessConfigParser->addSemanticConfig($this->generateScopeBaseNode($rootNode));
@@ -566,4 +567,42 @@ private function addUITranslationsSection(ArrayNodeDefinition $rootNode): void
                 ->end()
             ->end();
     }
+
+    /**
+     * Defines configuration for the "ibexa:install" installer.
+     *
+     * The configuration is available at:
+     * <code>
+     * ibexa:
+     *     installer:
+     *         schema_builder_event:
+     *             enabled: true
+     * </code>
+     *
+     * @param \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition $rootNode
+     */
+    private function addInstallerSection(ArrayNodeDefinition $rootNode): ArrayNodeDefinition
+    {
+        return $rootNode
+            ->children()
+                ->arrayNode('installer')
+                    ->children()
+                        ->arrayNode('schema_builder_event')
+                            ->info('Configuration of the legacy, event-driven database schema building mechanism used by the "ibexa:install" command')
+                            ->children()
+                                ->booleanNode('enabled')
+                                    ->defaultTrue()
+                                    ->info(
+                                        'Whether "ibexa:install" dispatches Ibexa\Contracts\DoctrineSchema\Event\SchemaBuilderEvent ' .
+                                        'to let packages contribute their database schema via an event subscriber, as opposed to ' .
+                                        'the schema being installed from static SQL migrations. ' .
+                                        'Disable once all installed packages have migrated away from the event-driven mechanism.'
+                                    )
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end();
+    }
 }

src/bundle/Core/DependencyInjection/IbexaCoreExtension.php

@@ -126,6 +126,8 @@ public function load(array $configs, ContainerBuilder $container): void
 
         // Base services and services overrides
         $loader->load('services.yml');
+        // Doctrine Migrations for core's own schema, alongside the legacy SchemaBuilderEvent path
+        $loader->load('doctrine_migrations.yml');
         // Security services
         $loader->load('security.yml');
         // HTTP Kernel
@@ -141,6 +143,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->registerUrlWildcardsConfiguration($config, $container);
         $this->registerOrmConfiguration($config, $container);
         $this->registerUITranslationsConfiguration($config, $container);
+        $this->registerInstallerConfiguration($config, $container);
 
         // Routing
         $this->handleRouting($config, $container, $loader);
@@ -315,6 +318,17 @@ private function registerUITranslationsConfiguration(array $config, ContainerBui
         $container->setParameter('ibexa.ui.translations.enabled', $config['ui']['translations']['enabled'] ?? false);
     }
 
+    /**
+     * @param array<string, mixed> $config
+     */
+    private function registerInstallerConfiguration(array $config, ContainerBuilder $container): void
+    {
+        $container->setParameter(
+            'ibexa.installer.schema_builder_event.enabled',
+            $config['installer']['schema_builder_event']['enabled'] ?? true
+        );
+    }
+
     /**
      * Handle routing parameters.
      *

src/bundle/Core/Resources/config/doctrine_migrations.yml

@@ -0,0 +1,48 @@
+services:
+    Ibexa\Bundle\RepositoryInstaller\Migration\InstallSchemaMigration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }
+
+    Ibexa\Bundle\RepositoryInstaller\Migration\AddUrlAliasMlLinkIndexMigration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }
+
+    Ibexa\Bundle\RepositoryInstaller\Migration\RenameSchemaTo5_0Migration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }
+
+    Ibexa\Bundle\RepositoryInstaller\Migration\ImportDataMigration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }
+
+    Ibexa\Bundle\RepositoryInstaller\Migration\FixLegacyIdentifiersMigration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }
+
+    Ibexa\Bundle\RepositoryInstaller\Migration\AddContentVersionUniqueIndexMigration:
+        autowire: true
+        public: false
+        arguments:
+            $connection: '@ibexa.persistence.connection'
+        tags:
+            - { name: !php/const Ibexa\Contracts\DoctrineMigrations\Migrations\IbexaMigrationTag::TAG }

src/bundle/RepositoryInstaller/Bootstrapper/DoctrineMigrationsSchemaHook.php

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Bundle\RepositoryInstaller\Bootstrapper;
+
+use Ibexa\Bundle\RepositoryInstaller\Migration\TaggedMigrationsRunner;
+use Ibexa\Contracts\Test\Core\Bootstrapper\DatabaseSchemaHook;
+use Ibexa\Contracts\Test\Core\Bootstrapper\FixtureHook;
+use Ibexa\Contracts\Test\Core\Bootstrapper\HookInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * @internal for internal use by Ibexa packages' integration test setup
+ *
+ * Installs the database schema the way a real `ibexa:install` does when the SchemaBuilderEvent path
+ * is turned off: by running every Ibexa-tagged Doctrine migration via {@see TaggedMigrationsRunner}
+ * — the very same service {@see \Ibexa\Bundle\RepositoryInstaller\Installer\CoreInstaller} uses, so
+ * a test database built this way is built by the production code path, not by a re-implementation
+ * of it.
+ *
+ * This is the counterpart of {@see DatabaseSchemaHook}, and the two are mutually exclusive: each
+ * creates the same tables, so enabling both makes the second one fail on tables that already exist.
+ * Running an integration suite once with each is what proves the two install paths converge.
+ *
+ * Unlike every other built-in hook, this one is **disabled by default**. Enabling it by default
+ * would add a second schema install on top of {@see DatabaseSchemaHook}'s in every existing suite,
+ * breaking all of them the moment this package is upgraded. Opt in per bootstrap run, turning the
+ * legacy path off in the same breath:
+ *
+ * ```php
+ * (new Bootstrapper())->bootstrap(null, [
+ *     DatabaseSchemaHook::class => [DatabaseSchemaHook::OPTION_LOAD_SCHEMA => false],
+ *     DoctrineMigrationsSchemaHook::class => [DoctrineMigrationsSchemaHook::OPTION_INSTALL_SCHEMA => true],
+ * ]);
+ * ```
+ *
+ * Registered only in the "test" environment, and removed from the container along with
+ * {@see TaggedMigrationsRunner} itself when "ibexa/doctrine-migrations" isn't installed/enabled, by
+ * {@see \Ibexa\Bundle\RepositoryInstaller\DependencyInjection\Compiler\RemoveTaggedMigrationsRunnerPass}.
+ */
+final class DoctrineMigrationsSchemaHook implements HookInterface
+{
+    /**
+     * Fixed tag priority this hook is registered at — after ibexa/test-core's
+     * {@see DatabaseSchemaHook} (1000), before its {@see FixtureHook} (900).
+     *
+     * Ordering against DatabaseSchemaHook only matters when both are enabled, which is a
+     * misconfiguration; running second makes that misconfiguration fail at a predictable point
+     * ("table already exists" out of the migrations) rather than in whichever order the tag
+     * collection happened to produce.
+     */
+    public const PRIORITY = 990;
+
+    public const OPTION_INSTALL_SCHEMA = 'install_schema';
+
+    private TaggedMigrationsRunner $taggedMigrationsRunner;
+
+    public function __construct(TaggedMigrationsRunner $taggedMigrationsRunner)
+    {
+        $this->taggedMigrationsRunner = $taggedMigrationsRunner;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->define(self::OPTION_INSTALL_SCHEMA)
+            ->default(false)
+            ->allowedTypes('bool');
+    }
+
+    public function __invoke(array $options): void
+    {
+        if (!$options[self::OPTION_INSTALL_SCHEMA]) {
+            return;
+        }
+
+        // Executions stay recorded in the Doctrine Migrations versioning table on purpose - that
+        // is what a real install leaves behind, and it is what makes a second run (a test calling
+        // the installer itself, say) correctly skip instead of re-applying. Contrast with
+        // ibexa/migrations' MigrationHook, which resets its own bookkeeping because its migrations
+        // are test fixtures rather than part of the installed state.
+        $this->taggedMigrationsRunner->run();
+    }
+}

src/bundle/RepositoryInstaller/Command/InstallPlatformCommand.php

@@ -22,6 +22,7 @@
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
@@ -45,16 +46,19 @@ final class InstallPlatformCommand extends Command
     /** @var string */
     private $environment;
 
-    /** @var \Ibexa\Bundle\RepositoryInstaller\Installer\Installer[] */
-    private $installers = [];
+    /** @var \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\Bundle\RepositoryInstaller\Installer\Installer> */
+    private ServiceLocator $installers;
 
     private RepositoryConfigurationProviderInterface $repositoryConfigurationProvider;
 
     private SchemaAssetsFilterBypassInterface $schemaAssetsFilterBypass;
 
+    /**
+     * @param \Symfony\Component\DependencyInjection\ServiceLocator<\Ibexa\Bundle\RepositoryInstaller\Installer\Installer> $installers
+     */
     public function __construct(
         Connection $connection,
-        array $installers,
+        ServiceLocator $installers,
         CacheItemPoolInterface $cachePool,
         string $environment,
         RepositoryConfigurationProviderInterface $repositoryConfigurationProvider,
@@ -74,7 +78,7 @@ protected function configure(): void
         $this->addArgument(
             'type',
             InputArgument::OPTIONAL,
-            'The type of install. Available options: ' . implode(', ', array_keys($this->installers)),
+            'The type of install. Available options: ' . implode(', ', array_keys($this->installers->getProvidedServices())),
             'ibexa-oss'
         );
         $this->addOption(
@@ -104,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ($installer === false) {
             $output->writeln(
                 "Unknown install type '$type', available options in currently installed Ibexa package: " .
-                implode(', ', array_keys($this->installers))
+                implode(', ', array_keys($this->installers->getProvidedServices()))
             );
             exit(self::EXIT_UNKNOWN_INSTALL_TYPE);
         }
@@ -235,11 +239,11 @@ private function indexData(OutputInterface $output, $siteaccess = null)
      */
     private function getInstaller($type)
     {
-        if (!isset($this->installers[$type])) {
+        if (!$this->installers->has($type)) {
             return false;
         }
 
-        return $this->installers[$type];
+        return $this->installers->get($type);
     }
 
     /**