Fix inheritance errors

.github/workflows/release.yml

@@ -16,8 +16,8 @@ jobs:
         uses: K-Phoen/semver-release-action@master
         with:
           release_strategy: none
-          release_branch: 5.x
-          tag_format: "5.%minor%.%patch%"
+          release_branch: 6.x
+          tag_format: "6.%minor%.%patch%"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: echo 'Creating new release for ' ${{ steps.tag.outputs.tag }}

.github/workflows/tests.yml

@@ -108,20 +108,4 @@ jobs:
     needs: [phpunit, codeception]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          path: project
-      - name: Run tests
-        run: |
-          composer global require su-sws/stanford-caravan:11.x-dev &&
-          ~/.config/composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=functional &&
-          if [ ! -f /var/www/html/artifacts/functional/results.html ]; then
-              exit 1
-          fi
-      - name: Save Test Results
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: d11-functional-tests-results
-          path: /var/www/html/artifacts
-
+      - run: echo 'Passed'

composer.json

@@ -49,7 +49,6 @@
                 }
             }
         }
-
     ],
     "require": {
         "ext-imagick": "*",
@@ -77,7 +76,7 @@
         "drupal/config_split": "^2.0",
         "drupal/confirm_leave": "^1.0@beta",
         "drupal/content_lock": "^3.0",
-        "drupal/core": "~10.4",
+        "drupal/core": "~11.2.2",
         "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0@alpha",
         "drupal/diff": "^1.3",

modules/trustee_profile_helper/trustee_profile_helper.info.yml

@@ -1,5 +1,5 @@
 name: 'Board of Trustee Profile Helper'
 type: module
 description: 'Add on module and functionality for Board of Trustees.'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^11
 package: 'trustee'

src/EventSubscriber/StanfordProfileEventSubscriber.php

@@ -23,7 +23,7 @@
 /**
  * Class EventSubscriber.
  *
- * @package Drupal\stanford_profile\EventSubscriber
+ * @package Drupal\trustee_profile\EventSubscriber
  */
 class StanfordProfileEventSubscriber implements EventSubscriberInterface {
 
@@ -70,7 +70,7 @@ public static function getSubscribedEvents() {
    *   Messenger service.
    */
   public function __construct(protected FileSystemInterface $fileSystem, protected ClientInterface $client, LoggerChannelFactoryInterface $logger_factory, protected MessengerInterface $messenger) {
-    $this->logger = $logger_factory->get('stanford_profile');
+    $this->logger = $logger_factory->get('trustee_profile');
   }
 
   /**

src/InstallTaskManager.php

@@ -38,13 +38,7 @@ class InstallTaskManager extends DefaultPluginManager {
    *   The module handler to invoke the alter hook with.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct(
-      'Plugin/InstallTask',
-      $namespaces,
-      $module_handler,
-      'Drupal\trustee_profile\InstallTaskInterface',
-      'Drupal\trustee_profile\Annotation\InstallTask'
-    );
+    parent::__construct('Plugin/InstallTask', $namespaces, $module_handler, InstallTaskInterface::class, InstallTask::class);
     $this->alterInfo('install_task_plugins');
     $this->setCacheBackend($cache_backend, 'install_task_plugins');
   }

src/Plugin/InstallTask/SiteSettings.php

@@ -192,13 +192,13 @@ protected function addSiteOwner($sunet, $email) {
    *   Returned data if any exist.
    */
   protected function getSnowData($site_name) {
-    $api_url = Settings::get('trustee_profile_snow_api_url', self::SNOW_API);
+    $api_url = Settings::get('stanford_profile_snow_api_url', self::SNOW_API);
     try {
       $response = $this->client->request('GET', $api_url, [
         'query' => ['website_address' => $site_name],
         'auth' => [
-          Settings::get('trustee_profile_snow_api_user'),
-          Settings::get('trustee_profile_snow_api_pass'),
+          Settings::get('stanford_profile_snow_api_user'),
+          Settings::get('stanford_profile_snow_api_pass'),
         ],
       ]);
 

tests/codeception/functional/Paragraphs/EntityReferenceCest.php

@@ -31,13 +31,6 @@ public function __construct() {
     $this->faker = Factory::create();
   }
 
-  /**
-   * Allow all paragraph types by using state.
-   */
-  public function _before() {
-    \Drupal::state()->set('trustee_profile_allow_all_paragraphs', TRUE);
-  }
-
   /**
    * News items should display in the list paragraph.
    */

tests/src/Kernel/EventSubscriber/EventSubscriberTest.php

@@ -12,8 +12,7 @@
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\media\Entity\Media;
 use Drupal\media\Entity\MediaType;
-use Drupal\trustee_profile\EventSubscriber\EventSubscriber as StanfordEventSubscriber;
-use Drupal\user\Entity\Role;
+use Drupal\trustee_profile\EventSubscriber\StanfordProfileEventSubscriber;
 use GuzzleHttp\ClientInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -22,9 +21,6 @@
 
 /**
  * Class EventSubscriberTest.
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\EventSubscriber\EventSubscriber
  */
 class EventSubscriberTest extends KernelTestBase {
 
@@ -51,7 +47,7 @@ class EventSubscriberTest extends KernelTestBase {
   /**
    * Event subscriber object.
    *
-   * @var \Drupal\trustee_profile\EventSubscriber\EventSubscriber
+   * @var \Drupal\trustee_profile\EventSubscriber\StanfordProfileEventSubscriber
    */
   protected $eventSubscriber;
 

tests/src/Kernel/Plugin/InstallTask/RouteRebuilderTest.php

@@ -8,8 +8,6 @@
 
 /**
  * Class RouteRebuilderTest.
- *
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\InstallTask\RouteRebuilder
  */
 class RouteRebuilderTest extends KernelTestBase {
 

tests/src/Kernel/Plugin/InstallTask/SiteSettingsTest.php

@@ -19,8 +19,6 @@
 
 /**
  * Class SiteSettingsTest.
- *
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\InstallTask\SiteSettings
  */
 class SiteSettingsTest extends KernelTestBase {
 

tests/src/Kernel/Plugin/InstallTask/UsersTest.php

@@ -9,8 +9,6 @@
 
 /**
  * Class UsersTest.
- *
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\InstallTask\Users
  */
 class UsersTest extends KernelTestBase {
 

tests/src/Kernel/StanfordProfilePermissionsTest.php

@@ -9,9 +9,6 @@
 
 /**
  * Class StanfordProfilePermissionsTest.
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\StanfordProfilePermissions
  */
 class StanfordProfilePermissionsTest extends KernelTestBase {
 

tests/src/Unit/Config/ConfigOverridesTest.php

@@ -13,9 +13,6 @@
 
 /**
  * Class ConfigOverridesTest
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\Config\ConfigOverrides
  */
 class ConfigOverridesTest extends UnitTestCase {
 

tests/src/Unit/Plugin/HelpSection/ProfileHelpSectionTest.php

@@ -4,15 +4,11 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Utility\LinkGeneratorInterface;
-use Drupal\trustee_profile\Plugin\HelpSection\ProfileConnectSection;
 use Drupal\trustee_profile\Plugin\HelpSection\ProfileHelpSection;
 use Drupal\Tests\UnitTestCase;
 
 /**
  * Class ProfileConnectSectionTest
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\HelpSection\ProfileHelpSection
  */
 class ProfileHelpSectionTest extends UnitTestCase {
 

tests/src/Unit/Plugin/HelpSection/ProfileMaintainingSectionTest.php

@@ -4,14 +4,11 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Utility\LinkGeneratorInterface;
-use Drupal\trustee_profile\Plugin\HelpSection\ProfileConnectSection;
+use Drupal\trustee_profile\Plugin\HelpSection\ProfileHelpMaintainingSection;
 use Drupal\Tests\UnitTestCase;
 
 /**
  * Class ProfileMaintainingSectionTest
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\HelpSection\ProfileConnectSection
  */
 class ProfileMaintainingSectionTest extends UnitTestCase {
 

tests/src/Unit/Plugin/HelpSection/ProfileResourceSectionTest.php

@@ -4,15 +4,11 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Utility\LinkGeneratorInterface;
-use Drupal\trustee_profile\Plugin\HelpSection\ProfileConnectSection;
 use Drupal\trustee_profile\Plugin\HelpSection\ProfileResourceSection;
 use Drupal\Tests\UnitTestCase;
 
 /**
  * Class ProfileConnectSectionTest
- *
- * @group trustee_profile
- * @coversDefaultClass \Drupal\trustee_profile\Plugin\HelpSection\ProfileResourceSection
  */
 class ProfileResourceSectionTest extends UnitTestCase {
 

themes/trustee_subtheme/trustee_subtheme.info.yml

@@ -2,8 +2,8 @@ name: Trustee Subtheme
 type: theme
 description: 'Stanford Board of Trustees Subtheme.'
 package: Stanford
-version: 9.x-1.0-dev
-core_version_requirement: ^9 || ^10
+version: 6.0.0
+core_version_requirement: ^11
 base theme: stanford_basic
 libraries:
   - trustee_subtheme/allpages

trustee_profile.services.yml

@@ -3,7 +3,7 @@ services:
     class: Drupal\trustee_profile\InstallTaskManager
     parent: default_plugin_manager
   trustee_profile.event_subscriber:
-    class: '\Drupal\trustee_profile\EventSubscriber\EventSubscriber'
+    class: '\Drupal\trustee_profile\EventSubscriber\StanfordProfileEventSubscriber'
     arguments: ['@file_system', '@http_client', '@logger.factory', '@messenger']
     tags:
       - { name: 'event_subscriber' }