diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
index 9b35a84bef192bb64fee7bb7d3c4dbfc53fd70d5..0f42aafc6030e6ee7e839be9583d3f0ed23df687 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageInterface.php
@@ -5,7 +5,7 @@
/**
* A storage that supports content entity types.
*/
-interface ContentEntityStorageInterface extends EntityStorageInterface, TranslatableRevisionableStorageInterface {
+interface ContentEntityStorageInterface extends TranslatableRevisionableStorageInterface {
/**
* Creates an entity with sample field values.
diff --git a/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php b/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php
index d8a27386e3e9f6794d04e1b0b242b78ea57d99fe..3d34f9e56198a7b28f169f21cc12bf6fa7495917 100644
--- a/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/TranslatableRevisionableStorageInterface.php
@@ -5,7 +5,7 @@
/**
* A storage that supports translatable and revisionable entity types.
*/
-interface TranslatableRevisionableStorageInterface extends TranslatableStorageInterface, RevisionableStorageInterface {
+interface TranslatableRevisionableStorageInterface extends RevisionableStorageInterface, TranslatableStorageInterface {
/**
* Creates a new revision starting off from the specified entity object.
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 64e5e8a1279c694bc82a3397e8bef09caa08a3b6..65371e0904ced629479a4b7af7152976ea37783d 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1193,7 +1193,7 @@ parameters:
in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
\\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
"""
- count: 3
+ count: 2
path: modules/content_moderation/src/ModerationInformation.php
-
@@ -1215,15 +1215,6 @@ parameters:
count: 1
path: modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 2
- path: modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
-
-
message: """
#^Call to deprecated method deleteRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
@@ -1266,15 +1257,6 @@ parameters:
count: 1
path: modules/content_translation/content_translation.module
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 1
- path: modules/content_translation/src/Access/ContentTranslationDeleteAccess.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 5
@@ -1285,15 +1267,6 @@ parameters:
count: 1
path: modules/content_translation/src/Controller/ContentTranslationController.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 2
- path: modules/content_translation/src/Controller/ContentTranslationController.php
-
-
message: "#^Variable \\$source_name might not be defined\\.$#"
count: 1
@@ -1317,29 +1290,11 @@ parameters:
count: 1
path: modules/content_translation/src/Plugin/Validation/Constraint/ContentTranslationSynchronizedFieldsConstraintValidator.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 1
- path: modules/content_translation/tests/src/Functional/ContentTranslationPendingRevisionTestBase.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 1
path: modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 2
- path: modules/content_translation/tests/src/Kernel/ContentTranslationFieldSyncRevisionTest.php
-
-
message: "#^Variable \\$unrestricted_tab_count might not be defined\\.$#"
count: 1
@@ -3434,29 +3389,11 @@ parameters:
count: 9
path: tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 4
- path: tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php
-
-
message: "#^Variable \\$previous_untranslatable_field_value in isset\\(\\) always exists and is not nullable\\.$#"
count: 2
path: tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 1
- path: tests/Drupal/KernelTests/Core/Entity/EntityDuplicateTest.php
-
-
message: """
#^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
@@ -3475,15 +3412,6 @@ parameters:
count: 3
path: tests/Drupal/KernelTests/Core/Entity/EntityRevisionTranslationTest.php
- -
- message: """
- #^Call to deprecated method loadRevision\\(\\) of class Drupal\\\\Core\\\\Entity\\\\EntityStorageInterface\\:
- in drupal\\:10\\.1\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use
- \\\\Drupal\\\\Core\\\\Entity\\\\RevisionableStorageInterface\\:\\:loadRevision instead\\.$#
- """
- count: 1
- path: tests/Drupal/KernelTests/Core/Entity/EntityRevisionsTest.php
-
-
message: "#^Variable \\$field might not be defined\\.$#"
count: 9