diff --git a/1356276-688_0.patch b/3266057-95-9-5-x.patch index 08e87a2..b379b7b 100644 --- a/1356276-688_0.patch +++ b/3266057-95-9-5-x.patch @@ -1,8 +1,14 @@ +commit 10f4e7c45caf6aad42db880488a541f7beb45eff +Author: Rajab Natshah +Date: Thu Jan 26 15:18:31 2023 +0300 + + Issue #3266057: Allow profiles to define a base/parent profile [continue of #1356276] + diff --git a/core/core.services.yml b/core/core.services.yml -index 053c40b764..34c2d6bbd0 100644 +index e3c1e094a2..18c9d919c0 100644 --- a/core/core.services.yml +++ b/core/core.services.yml -@@ -319,7 +319,7 @@ services: +@@ -326,7 +326,7 @@ services: - { name: event_subscriber } config.installer: class: Drupal\Core\Config\ConfigInstaller @@ -12,7 +18,7 @@ index 053c40b764..34c2d6bbd0 100644 config.storage: class: Drupal\Core\Config\CachedStorage diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc -index 4375abdebd..3eea1b90d6 100644 +index 1b420856e4..c123ee2e06 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -465,6 +465,12 @@ function install_begin_request($class_loader, &$install_state) { @@ -68,7 +74,7 @@ index 4375abdebd..3eea1b90d6 100644 // @see _drupal_maintenance_theme() \Drupal::theme()->resetActiveTheme(); diff --git a/core/includes/install.inc b/core/includes/install.inc -index adc4a787e3..bdf8cdfe3d 100644 +index 4053d3c5a9..4d3df561f5 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -533,7 +533,6 @@ function _drupal_rewrite_settings_dump_one(\stdClass $variable, $prefix = '', $s @@ -1149,10 +1155,10 @@ index 0000000000..3fa12d476a + +} diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php -index 63d2169754..ffb6a6e776 100644 +index 34839e53b6..0921143bf9 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php -@@ -735,9 +735,9 @@ public function testInstallProfileMisMatch() { +@@ -738,9 +738,9 @@ public function testInstallProfileMisMatch() { $error_log = $config_importer->getErrors(); // Install profiles can not be changed. Note that KernelTestBase currently // does not use an install profile. This situation should be impossible @@ -1316,10 +1322,10 @@ index 0000000000..b437e156e2 + +} diff --git a/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php b/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php -index 1eb469399f..d0ede41475 100644 +index bf61c2467c..17b061c148 100644 --- a/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php +++ b/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php -@@ -41,16 +41,11 @@ protected function setUp(): void { +@@ -40,16 +40,11 @@ protected function setUp(): void { // Mock the container so we don't need to mock drupal_valid_test_ua(). // @see \Drupal\Core\Extension\ExtensionDiscovery::scan() $this->root = dirname(__DIR__, 6); @@ -1342,18 +1348,18 @@ index 1eb469399f..d0ede41475 100644 /** diff --git a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php -index fb1c9dde8d..992f7c405a 100644 +index 2e836da87c..d8bd6f1d81 100644 --- a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php +++ b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php -@@ -5,6 +5,7 @@ +@@ -4,6 +4,7 @@ + use Drupal\Core\Database\Database; - use Drupal\Core\Site\Settings; use Drupal\Tests\UnitTestCase; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Tests for database URL to/from database connection array conversions. -@@ -29,16 +30,11 @@ protected function setUp(): void { +@@ -28,16 +29,11 @@ protected function setUp(): void { $this->root = dirname(__FILE__, 7); // Mock the container so we don't need to mock drupal_valid_test_ua(). // @see \Drupal\Core\Extension\ExtensionDiscovery::scan() @@ -1372,6 +1378,6 @@ index fb1c9dde8d..992f7c405a 100644 + $container->has('extension.list.profile')->willReturn(FALSE); + $container->getParameter('site.path')->willReturn(''); + \Drupal::setContainer($container->reveal()); - - new Settings(['extension_discovery_scan_tests' => TRUE]); } + + /**