Issue #3321634 by Spokje, andypost: Remove legacy experimental:true and its...

Issue #3321634 by Spokje, andypost: Remove legacy experimental:true and its deprecation and test-files

(cherry picked from commit 5c254c67)

core/lib/Drupal/Core/Extension/Extension.php

@@ -223,15 +223,6 @@ public function __wakeup() {
    *   TRUE if an extension is marked as experimental, FALSE otherwise.
    */
   public function isExperimental(): bool {
-    // Currently, this function checks for both the key/value pairs
-    // 'experimental: true' and 'lifecycle: experimental' to determine if an
-    // extension is marked as experimental.
-    // @todo Remove the deprecation check for 'experimental: true' as part of
-    // https://www.drupal.org/node/3321634
-    if (isset($this->info['experimental']) && $this->info['experimental']) {
-      @trigger_error('The key-value pair "experimental: true" is deprecated in drupal:10.1.0 and will be removed before drupal:11.0.0. Use the key-value pair "lifecycle: experimental" instead. See https://www.drupal.org/node/3263585', E_USER_DEPRECATED);
-      return TRUE;
-    }
     return (isset($this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER])
         && $this->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::EXPERIMENTAL);
   }

core/modules/system/system.install

@@ -158,14 +158,6 @@ function system_requirements($phase) {
           $obsolete_extensions[$theme] = ['name' => $info['name'], 'lifecycle_link' => $info['lifecycle_link']];
         }
       }
-      // Currently, we check for both the key/value pairs 'experimental: true'
-      // and 'lifecycle: experimental' to determine if an extension is marked as
-      // experimental.
-      // @todo Remove the check for 'experimental: true' as part of
-      // https://www.drupal.org/node/3250342
-      if (isset($data->info['experimental']) && $data->info['experimental']) {
-        $experimental_themes[$theme] = $data->info['name'];
-      }
     }
 
     // Warn if any experimental themes are installed.

core/modules/system/tests/modules/theme_page_test/theme_page_test.module

@@ -11,11 +11,8 @@
  * Implements hook_system_info_alter().
  */
 function theme_page_test_system_info_alter(&$info, Extension $file, $type) {
-  // Make sure that all themes are visible on the Appearance form, except for
-  // the legacy_experimental_theme_test theme.
-  // @todo Remove the exception for this theme in
-  //   https://www.drupal.org/node/3321634
-  if ($type === 'theme' && $info['name'] !== 'Legacy experimental test') {
+  // Make sure that all themes are visible on the Appearance form.
+  if ($type === 'theme') {
     unset($info['hidden']);
   }
 }

core/modules/system/tests/themes/legacy_experimental_theme_dependency_test/legacy_experimental_theme_dependency_test.info.yml

-name: 'Legacy experimental dependency test'
-type: theme
-description: 'Legacy experimental dependency test theme.'
-version: VERSION
-base theme: legacy_experimental_theme_test

core/modules/system/tests/themes/legacy_experimental_theme_test/legacy_experimental_theme_test.info.yml

-name: 'Legacy experimental test'
-type: theme
-description: 'Legacy experimental test theme.'
-version: VERSION
-base theme: false
-experimental: true
-hidden: true

core/tests/Drupal/KernelTests/Core/Extension/ExperimentalDeprecationTest.php

-<?php
-
-namespace Drupal\KernelTests\Core\Extension;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests deprecated update.inc functions.
- *
- * @group legacy
- * @group extension
- *
- * @todo Remove this and all its test themes in
- *   https://www.drupal.org/node/3321634
- */
-class ExperimentalDeprecationTest extends KernelTestBase {
-
-  /**
-   * Tests \Drupal\Core\Extension\Extension::isExperimental deprecation.
-   */
-  public function testLegacyIsExperimental(): void {
-    /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
-    $theme_installer = \Drupal::service('theme_installer');
-    $theme_installer->install(['legacy_experimental_theme_test']);
-
-    /** @var \Drupal\Core\Extension\ThemeHandler $theme_handler */
-    $theme_handler = $this->container->get('theme_handler');
-    $theme = $theme_handler->getTheme('legacy_experimental_theme_test');
-    $this->expectDeprecation('The key-value pair "experimental: true" is deprecated in drupal:10.1.0 and will be removed before drupal:11.0.0. Use the key-value pair "lifecycle: experimental" instead. See https://www.drupal.org/node/3263585');
-    $this->assertTrue($theme->isExperimental());
-  }
-
-}