From 8d004798184f80b3c3b484852ceca230a6f1b574 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Thu, 9 Jul 2020 14:41:50 -0400
Subject: [PATCH] Updating drupal/core-recommended (8.9.1 => 8.9.2)
---
composer.json | 2 +-
composer.lock | 24 ++--
vendor/composer/installed.json | 26 ++---
web/core/CHANGELOG.txt | 2 +-
web/core/INSTALL.sqlite.txt | 4 +-
web/core/INSTALL.txt | 2 +-
web/core/includes/file.inc | 4 +-
web/core/includes/install.core.inc | 2 +-
web/core/includes/install.inc | 2 +
web/core/lib/Drupal.php | 2 +-
.../Drupal/Component/Annotation/Plugin.php | 2 +-
.../Component/FileSecurity/FileSecurity.php | 11 +-
.../MTimeProtectedFastFileStorage.php | 1 +
.../PhpStorage/PhpStorageInterface.php | 2 +-
.../Plugin/Derivative/DeriverInterface.php | 1 +
.../lib/Drupal/Component/Utility/Random.php | 1 +
web/core/lib/Drupal/Component/Utility/Xss.php | 8 +-
.../lib/Drupal/Core/Asset/AssetResolver.php | 1 +
.../lib/Drupal/Core/Batch/BatchBuilder.php | 6 +
.../lib/Drupal/Core/Command/DbCommandBase.php | 1 +
.../lib/Drupal/Core/Command/DbDumpCommand.php | 2 +
.../Drupal/Core/Config/TypedConfigManager.php | 1 +
.../lib/Drupal/Core/Database/Connection.php | 1 +
.../Core/Database/Driver/mysql/Schema.php | 1 +
.../Core/Database/Driver/pgsql/Connection.php | 1 +
.../Core/Database/Driver/pgsql/Schema.php | 3 +
.../Core/Database/Driver/sqlite/Schema.php | 1 +
web/core/lib/Drupal/Core/Database/Log.php | 1 +
.../Core/Database/Query/SelectInterface.php | 14 +++
.../Core/Database/StatementPrefetch.php | 1 +
.../Drupal/Core/Entity/EntityDisplayBase.php | 1 +
.../Query/ConditionAggregateInterface.php | 2 +
.../Core/Entity/Query/QueryInterface.php | 2 +
.../Core/Entity/Query/Sql/QueryAggregate.php | 1 +
.../Drupal/Core/Entity/Query/Sql/Tables.php | 2 +
.../Drupal/Core/Extension/ModuleInstaller.php | 13 +--
.../lib/Drupal/Core/Field/FieldConfigBase.php | 7 +-
web/core/lib/Drupal/Core/File/file.api.php | 1 +
.../lib/Drupal/Core/Menu/MenuTreeStorage.php | 1 +
web/core/lib/Drupal/Core/Menu/menu.api.php | 2 +-
web/core/lib/Drupal/Core/Render/theme.api.php | 6 +-
.../Core/Security/DoTrustedCallbackTrait.php | 2 +-
.../StreamWrapper/StreamWrapperInterface.php | 8 +-
web/core/lib/Drupal/Core/Theme/Registry.php | 1 +
.../Core/Theme/ThemeManagerInterface.php | 1 +
web/core/lib/Drupal/Core/Updater/Updater.php | 2 +-
.../Core/Utility/UnroutedUrlAssembler.php | 2 +-
.../Core/Validation/TranslatorInterface.php | 1 +
web/core/misc/tableheader.es6.js | 6 +-
web/core/misc/tableheader.js | 2 +-
.../src/Controller/AggregatorController.php | 2 +-
.../src/Functional/AggregatorTestBase.php | 7 +-
.../tests/src/Functional/FeedLanguageTest.php | 8 +-
.../tests/src/Functional/ImportOpmlTest.php | 7 +-
.../src/Authentication/Provider/BasicAuth.php | 2 +-
.../tests/src/Functional/BasicAuthTest.php | 2 +-
.../tests/src/Functional/BigPipeTest.php | 4 +-
.../src/Functional/BlockAdminThemeTest.php | 5 +-
.../tests/src/Functional/BlockCacheTest.php | 5 +-
.../tests/src/Functional/BlockDemoTest.php | 5 +-
.../src/Functional/BlockLanguageTest.php | 5 +-
.../tests/src/Functional/BlockUiTest.php | 8 +-
.../tests/src/Functional/BlockXssTest.php | 15 ++-
.../Functional/NonDefaultBlockAdminTest.php | 5 +-
.../src/Functional/Views/DisplayBlockTest.php | 11 +-
.../src/Entity/BlockContentType.php | 3 +-
.../src/Functional/BlockContentListTest.php | 7 +-
.../Functional/BlockContentListViewsTest.php | 9 +-
.../src/Functional/BookBreadcrumbTest.php | 20 +++-
.../Functional/BookContentModerationTest.php | 11 +-
.../book/tests/src/Functional/BookTest.php | 42 +++++--
.../Functional/Views/BookRelationshipTest.php | 2 +-
.../ckeditor/src/CKEditorPluginInterface.php | 3 +
.../ckeditor/src/CKEditorPluginManager.php | 1 +
.../src/Plugin/CKEditorPlugin/StylesCombo.php | 1 +
.../ckeditor/src/Plugin/Editor/CKEditor.php | 2 +
.../src/Functional/CKEditorLoadingTest.php | 12 +-
.../CKEditorStylesComboTranslationTest.php | 5 +-
.../comment/src/CommentStorageInterface.php | 1 +
.../src/Functional/CommentAnonymousTest.php | 6 +-
.../tests/src/Functional/CommentBookTest.php | 6 +-
.../src/Functional/CommentFieldsTest.php | 12 +-
.../src/Functional/CommentLanguageTest.php | 12 +-
.../src/Functional/CommentLinksAlterTest.php | 2 +-
.../tests/src/Functional/CommentLinksTest.php | 12 +-
.../Functional/CommentNewIndicatorTest.php | 4 +-
.../src/Functional/CommentNonNodeTest.php | 6 +-
.../src/Functional/CommentPreviewTest.php | 7 +-
.../Functional/ConfigDependencyWebTest.php | 4 +-
.../ConfigEntityFormOverrideTest.php | 4 +-
.../ConfigEntityListMultilingualTest.php | 5 +-
.../src/Functional/ConfigEntityListTest.php | 11 +-
.../Functional/ConfigEntityStatusUITest.php | 4 +-
.../tests/src/Functional/ConfigEntityTest.php | 4 +-
.../src/Functional/ConfigFormOverrideTest.php | 5 +-
.../src/Functional/ConfigInstallWebTest.php | 6 +-
.../ConfigLanguageOverrideWebTest.php | 5 +-
.../FunctionalJavascript/ConfigEntityTest.php | 4 +-
.../ConfigTranslationInstallTest.php | 1 +
.../ConfigTranslationOverviewTest.php | 2 +-
.../Functional/ConfigTranslationUiTest.php | 12 +-
.../src/Functional/ContactPersonalTest.php | 12 +-
.../src/Functional/ContactSitewideTest.php | 4 +-
.../content_moderation/src/EntityTypeInfo.php | 43 ++++---
.../Field/ModerationStateFieldItemList.php | 1 +
.../Functional/ModeratedContentViewTest.php | 7 +-
.../ModerationStateNodeTypeTest.php | 9 ++
.../Functional/ModerationStateTestBase.php | 4 -
.../ViewsModerationStateFilterTest.php | 5 +-
.../ModerationStateFieldItemListTest.php | 29 +++++
.../ContentTranslationController.php | 1 +
.../ContentTranslationEntityBundleUITest.php | 7 +-
.../ContentTranslationOperationsTest.php | 7 +-
.../ContentTranslationSettingsTest.php | 14 ++-
.../ContentTranslationWorkflowsTest.php | 10 +-
.../ContextualDynamicContextTest.php | 11 +-
.../src/Functional/DateTimeFieldTest.php | 12 +-
.../dblog/tests/src/Functional/DbLogTest.php | 11 +-
.../src/Functional/EditorLoadingTest.php | 20 +++-
.../Functional/EditorUploadImageScaleTest.php | 5 +-
web/core/modules/field/field.api.php | 4 +-
.../field/src/Entity/FieldStorageConfig.php | 8 +-
.../modules/field/src/Tests/FieldTestBase.php | 1 +
.../modules/field_test/field_test.module | 1 +
.../Boolean/BooleanFormatterSettingsTest.php | 9 +-
.../EntityReferenceAdminTest.php | 2 +-
.../EntityReferenceAutoCreateTest.php | 5 +-
.../EntityReferenceFieldDefaultValueTest.php | 8 +-
...erenceFieldTranslatedReferenceViewTest.php | 4 +-
.../EntityReferenceFileUploadTest.php | 5 +-
.../EntityReferenceIntegrationTest.php | 6 +-
.../tests/src/Functional/FieldHelpTest.php | 11 +-
.../tests/src/Functional/FieldTestBase.php | 1 +
.../field/tests/src/Functional/FormTest.php | 5 +-
.../tests/src/Functional/NestedFormTest.php | 5 +-
.../src/Functional/String/StringFieldTest.php | 6 +-
.../src/Functional/TranslationWebTest.php | 5 +-
.../Functional/reEnableModuleFieldTest.php | 5 +-
.../tests/src/Kernel/FieldKernelTestBase.php | 1 +
.../src/Functional/EntityDisplayModeTest.php | 4 +-
.../src/Functional/FieldUIDeleteTest.php | 12 +-
.../src/Functional/FieldUIIndentationTest.php | 6 +-
.../tests/src/Functional/FieldUIRouteTest.php | 12 +-
.../src/Functional/ManageDisplayTest.php | 24 +++-
.../Functional/ManageFieldsFunctionalTest.php | 21 +++-
.../ManageDisplayTest.php | 12 +-
.../tests/src/Traits/FieldUiTestTrait.php | 4 +-
web/core/modules/file/file.api.php | 1 +
.../file/src/Tests/FileManagedTestBase.php | 1 +
.../Functional/FileFieldRSSContentTest.php | 7 +-
.../src/Functional/FileFieldTestBase.php | 13 ++-
.../tests/src/Functional/FileListingTest.php | 10 +-
.../src/Functional/FileManagedTestBase.php | 1 +
.../FileFieldWidgetTest.php | 13 ++-
.../FileManagedFileElementTest.php | 13 ++-
.../src/Kernel/FileManagedUnitTestBase.php | 1 +
.../tests/src/Functional/FilterAdminTest.php | 7 +-
.../Functional/FilterDefaultFormatTest.php | 5 +-
.../tests/src/Functional/FilterHooksTest.php | 6 +-
.../src/Functional/FilterSecurityTest.php | 6 +-
.../tests/src/Functional/ForumBlockTest.php | 12 +-
.../tests/src/Functional/ForumIndexTest.php | 8 +-
.../src/Functional/ForumNodeAccessTest.php | 7 +-
.../forum/tests/src/Functional/ForumTest.php | 20 ++--
.../src/Functional/ForumUninstallTest.php | 10 +-
.../help/tests/src/Functional/HelpTest.php | 18 +--
.../tests/src/Functional/HistoryTest.php | 5 +-
web/core/modules/image/image.module | 1 +
.../FieldFormatter/DummyImageFormatter.php | 33 ++++++
.../src/Functional/ImageFieldTestBase.php | 14 ++-
.../src/Functional/JsonApiRegressionTest.php | 5 +-
.../LanguageBlockSettingsVisibilityTest.php | 6 +-
.../LanguageBrowserDetectionTest.php | 5 +-
.../LanguageConfigurationElementTest.php | 6 +-
.../Functional/LanguageConfigurationTest.php | 10 +-
...anguageCustomLanguageConfigurationTest.php | 5 +-
.../LanguageListModuleInstallTest.php | 5 +-
.../tests/src/Functional/LanguageListTest.php | 5 +-
.../src/Functional/LanguageLocaleListTest.php | 5 +-
.../LanguageNegotiationInfoTest.php | 7 +-
.../LanguagePathMonolingualTest.php | 6 +-
.../src/Functional/LanguageSwitchingTest.php | 6 +-
.../tests/src/Functional/LanguageTourTest.php | 5 +-
.../LanguageUILanguageNegotiationTest.php | 7 +-
.../Functional/LanguageUrlRewritingTest.php | 5 +-
.../Functional/LayoutBuilderAccessTest.php | 7 +-
.../tests/src/Functional/LinkFieldUITest.php | 10 +-
.../locale/src/LocaleConfigManager.php | 1 +
.../LocaleConfigTranslationImportTest.php | 35 +++++-
.../LocaleConfigTranslationTest.php | 10 +-
.../src/Functional/LocaleContentTest.php | 30 ++++-
.../tests/src/Functional/LocaleExportTest.php | 6 +-
.../Functional/LocaleImportFunctionalTest.php | 13 ++-
.../LocaleJavascriptTranslationTest.php | 6 +-
.../tests/src/Functional/LocalePathTest.php | 9 +-
.../src/Functional/LocalePluralFormatTest.php | 6 +-
.../LocaleTranslateStringTourTest.php | 6 +-
.../Functional/LocaleTranslationUiTest.php | 43 +++++--
.../src/Functional/LocaleUpdateCronTest.php | 8 +-
.../LocaleUpdateDevelopmentReleaseTest.php | 7 +-
.../Functional/LocaleUpdateInterfaceTest.php | 8 +-
.../tests/src/Functional/LocaleUpdateTest.php | 8 +-
.../menu_link_content.module | 5 +
.../MenuLinkContentDeleteFormTest.php | 2 +-
.../Functional/MenuLinkContentFormTest.php | 5 +-
.../MenuLinkContentTranslationUITest.php | 4 +-
.../tests/src/Kernel/MenuLinksTest.php | 15 ++-
.../src/Functional/MenuLinkReorderTest.php | 6 +-
.../src/Functional/MenuUiLanguageTest.php | 5 +-
.../tests/src/Functional/MenuUiNodeTest.php | 16 +--
.../tests/src/Functional/MenuUiTest.php | 19 ++-
.../Plugin/migrate/source/DrupalSqlBase.php | 1 +
.../node/src/NodeGrantDatabaseStorage.php | 1 +
.../MultiStepNodeFormBasicOptionsTest.php | 5 +-
.../Functional/NodeAccessBaseTableTest.php | 12 +-
.../src/Functional/NodeAccessFieldTest.php | 11 +-
.../NodeAccessGrantsCacheContextTest.php | 16 ++-
.../src/Functional/NodeAccessMenuLinkTest.php | 6 +-
.../src/Functional/NodeAccessPagerTest.php | 6 +-
.../NodeAccessRebuildNodeGrantsTest.php | 6 +-
.../tests/src/Functional/NodeAdminTest.php | 17 ++-
.../Functional/NodeBlockFunctionalTest.php | 12 +-
.../tests/src/Functional/NodeCreationTest.php | 25 +++-
.../NodeDisplayConfigurableTest.php | 5 +-
.../tests/src/Functional/NodeEditFormTest.php | 15 ++-
.../NodeEntityViewModeAlterTest.php | 5 +-
.../Functional/NodeFieldMultilingualTest.php | 8 +-
.../NodeFormSaveChangedTimeTest.php | 6 +-
.../tests/src/Functional/NodeLinksTest.php | 4 +-
.../src/Functional/NodeLoadMultipleTest.php | 5 +-
.../src/Functional/NodePostSettingsTest.php | 6 +-
.../src/Functional/NodeQueryAlterTest.php | 16 ++-
.../src/Functional/NodeRSSContentTest.php | 6 +-
.../NodeRevisionPermissionsTest.php | 5 +-
.../NodeRevisionsUiBypassAccessTest.php | 8 +-
.../tests/src/Functional/NodeTitleTest.php | 7 +-
.../tests/src/Functional/NodeTitleXSSTest.php | 5 +-
.../NodeTypeInitialLanguageTest.php | 9 +-
.../tests/src/Functional/NodeTypeTest.php | 27 ++++-
.../tests/src/Functional/PagePreviewTest.php | 26 +++--
.../Functional/Views/BulkFormAccessTest.php | 7 +-
.../src/Functional/Views/BulkFormTest.php | 6 +-
.../Functional/Views/FilterNodeAccessTest.php | 15 ++-
.../src/Functional/Views/NodeLanguageTest.php | 5 +-
.../src/Functional/Views/RevisionLinkTest.php | 18 ++-
.../src/Kernel/NodeAccessLanguageTest.php | 5 +-
.../src/Functional/OptionsFieldUITest.php | 12 +-
.../OptionsFloatFieldImportTest.php | 12 +-
.../OptionsSelectDynamicValuesTest.php | 5 +-
.../src/Functional/OptionsWidgetsTest.php | 5 +-
.../tests/src/Functional/PathAdminTest.php | 7 +-
.../tests/src/Functional/PathAliasTest.php | 8 +-
.../src/Functional/PathLanguageUiTest.php | 9 +-
.../tests/src/Functional/PathNodeFormTest.php | 5 +-
.../src/Functional/PathTaxonomyTermTest.php | 6 +-
.../src/MetadataGeneratorInterface.php | 2 +
.../src/Functional/CommentAttributesTest.php | 2 +-
.../EntityReferenceFieldAttributesTest.php | 5 +-
.../rest/src/Routing/ResourceRoutes.php | 1 +
.../Functional/Views/StyleSerializerTest.php | 7 +-
.../SearchAdvancedSearchFormTest.php | 7 +-
.../tests/src/Functional/SearchBlockTest.php | 2 +-
.../SearchCommentCountToggleTest.php | 8 +-
.../src/Functional/SearchCommentTest.php | 2 +-
.../SearchConfigSettingsFormTest.php | 17 ++-
.../src/Functional/SearchDateIntervalTest.php | 14 ++-
.../src/Functional/SearchEmbedFormTest.php | 6 +-
.../SearchKeywordsConditionsTest.php | 7 +-
.../src/Functional/SearchLanguageTest.php | 20 +++-
.../SearchMultilingualEntityTest.php | 9 +-
.../Functional/SearchNodeDiacriticsTest.php | 7 +-
.../Functional/SearchNodePunctuationTest.php | 9 +-
.../SearchNodeUpdateAndDeletionTest.php | 5 +-
.../Functional/SearchNumberMatchingTest.php | 7 +-
.../src/Functional/SearchNumbersTest.php | 7 +-
.../Functional/SearchPageCacheTagsTest.php | 5 +-
.../src/Functional/SearchPageOverrideTest.php | 5 +-
.../src/Functional/SearchPageTextTest.php | 6 +-
.../src/Functional/SearchQueryAlterTest.php | 5 +-
.../src/Functional/SearchRankingTest.php | 7 +-
.../TimeStampItemNormalizerTrait.php | 1 +
web/core/modules/shortcut/shortcut.api.php | 1 +
.../src/Functional/ShortcutCacheTagsTest.php | 26 ++---
.../src/Functional/ShortcutLinksTest.php | 36 +++---
.../tests/src/Functional/ShortcutSetsTest.php | 2 +-
.../tests/src/Functional/ShortcutTestBase.php | 19 ++-
web/core/modules/simpletest/simpletest.module | 1 +
.../modules/simpletest/src/KernelTestBase.php | 2 +-
.../src/Functional/StatisticsAdminTest.php | 6 +-
.../src/Functional/Views/IntegrationTest.php | 5 +-
.../system/src/Form/FileSystemForm.php | 2 +-
.../system/src/Form/ThemeSettingsForm.php | 1 +
.../system/src/PathBasedBreadcrumbBuilder.php | 2 -
.../system/src/Tests/Cache/CacheTestBase.php | 1 +
.../Tests/Entity/EntityCacheTagsTestBase.php | 1 +
.../src/Tests/Routing/MockAliasManager.php | 1 +
web/core/modules/system/system.module | 4 +
.../src/Entity/EntityTestExternal.php | 36 ++++++
.../FormTestMachineNameValidationForm.php | 1 +
.../module_autoload_test.module | 10 ++
.../module_autoload_test/src/SomeClass.php | 2 +
.../EventSubscriber/ThemeTestSubscriber.php | 4 +-
.../modules/token_test/token_test.routing.yml | 2 +-
.../src/Functional/Batch/ProcessingTest.php | 19 +--
.../src/Functional/Cache/CacheTestBase.php | 1 +
.../src/Functional/Common/FormatDateTest.php | 4 +-
.../tests/src/Functional/Common/UrlTest.php | 5 +
.../src/Functional/Entity/EntityAddUITest.php | 24 ++--
.../Entity/EntityCacheTagsTestBase.php | 1 +
.../src/Functional/Entity/EntityFormTest.php | 5 +-
.../Entity/EntityOperationsTest.php | 2 +-
.../Entity/EntityTranslationFormTest.php | 6 +-
.../tests/src/Functional/File/ConfigTest.php | 4 +-
.../Form/ElementsVerticalTabsTest.php | 4 +-
.../Form/ModulesListFormWebTest.php | 5 +-
.../src/Functional/Menu/BreadcrumbTest.php | 7 +-
.../src/Functional/Menu/LocalTasksTest.php | 8 +-
.../src/Functional/Menu/MenuAccessTest.php | 4 +-
.../src/Functional/Menu/MenuRouterTest.php | 8 +-
.../src/Functional/Module/ClassLoaderTest.php | 16 +++
.../Module/ExperimentalModuleTest.php | 5 +-
.../Module/InstallUninstallTest.php | 2 +-
.../src/Functional/Module/ModuleTestBase.php | 5 +-
.../Functional/System/AccessDeniedTest.php | 7 +-
.../tests/src/Functional/System/AdminTest.php | 2 +-
.../src/Functional/System/DateTimeTest.php | 7 +-
.../Functional/System/PageNotFoundTest.php | 5 +-
.../src/Functional/System/PageTitleTest.php | 8 +-
.../Functional/System/SiteMaintenanceTest.php | 5 +-
.../Functional/System/SystemAuthorizeTest.php | 4 +-
.../tests/src/Functional/System/ThemeTest.php | 16 ++-
.../Functional/System/TokenReplaceWebTest.php | 2 +-
.../Functional/System/TrustedHostsTest.php | 2 +-
.../Theme/EntityFilteringThemeTest.php | 5 +-
.../Theme/ExperimentalThemeTest.php | 5 +-
.../src/Functional/Theme/ThemeTokenTest.php | 5 +-
.../UpdateSystem/InvalidUpdateHookTest.php | 4 +-
.../UpdatePathLastRemovedTest.php | 4 +-
.../UpdatePathTestBaseFilledTest.php | 42 +++----
.../UpdateRemovedPostUpdateTest.php | 4 +-
.../UpdateSystem/UpdateSchemaTest.php | 5 +-
.../UpdateSystem/UpdateScriptTest.php | 46 +++++---
.../UpdateSystem/UpdatesWith7xTest.php | 4 +-
.../System/DateFormatTest.php | 4 +-
.../tests/src/Functional/EarlyDateTest.php | 6 +-
.../taxonomy/tests/src/Functional/RssTest.php | 7 +-
.../src/Functional/TaxonomyImageTest.php | 6 +-
.../TaxonomyTermIndentationTest.php | 5 +-
.../src/Functional/TaxonomyTermPagerTest.php | 5 +-
.../tests/src/Functional/TermIndexTest.php | 5 +-
.../tests/src/Functional/TermTest.php | 11 +-
.../tests/src/Functional/ThemeTest.php | 5 +-
.../tests/src/Functional/TokenReplaceTest.php | 5 +-
.../Views/TaxonomyIndexTidUiTest.php | 5 +-
.../Functional/Views/TaxonomyTermViewTest.php | 5 +-
.../src/Functional/TelephoneFieldTest.php | 5 +-
.../TextareaWithSummaryTest.php | 5 +-
.../src/Functional/ToolbarAdminMenuTest.php | 5 +-
.../Functional/ToolbarMenuTranslationTest.php | 7 +-
.../tests/src/Functional/TourHelpPageTest.php | 16 ++-
.../src/Functional/TrackerNodeAccessTest.php | 5 +-
.../TrackerRecentContentLinkTest.php | 47 ++++++++
.../tests/src/Functional/TrackerTest.php | 12 +-
.../FileTransferAuthorizeFormTest.php | 6 +-
.../src/Functional/UpdateContribTest.php | 5 +-
.../tests/src/Functional/UpdateCoreTest.php | 13 ++-
.../tests/src/Functional/UpdateUploadTest.php | 12 +-
.../modules/user/src/UserAuthInterface.php | 1 +
.../src/Functional/UserAccountLinksTest.php | 7 +-
.../src/Functional/UserAdminLanguageTest.php | 5 +-
.../tests/src/Functional/UserAdminTest.php | 5 +-
.../tests/src/Functional/UserCancelTest.php | 6 +-
.../Functional/UserLanguageCreationTest.php | 6 +-
.../tests/src/Functional/UserLanguageTest.php | 5 +-
.../src/Functional/UserPasswordResetTest.php | 8 +-
.../src/Functional/UserPermissionsTest.php | 8 +-
.../tests/src/Functional/UserPictureTest.php | 18 +++
.../src/Functional/UserRoleAdminTest.php | 5 +-
.../Functional/UserRolesAssignmentTest.php | 5 +-
.../tests/src/Functional/UserSearchTest.php | 17 ++-
.../src/Functional/Views/AccessTestBase.php | 4 +-
.../src/Functional/Views/BulkFormTest.php | 6 +-
.../Views/FilterPermissionUiTest.php | 9 +-
.../Views/HandlerFilterUserNameTest.php | 5 +-
.../src/Kernel/TempStoreDatabaseTest.php | 14 +--
.../src/Kernel/UserAccountFormFieldsTest.php | 3 -
.../user/tests/src/Kernel/UserInstallTest.php | 21 ++--
web/core/modules/user/user.module | 10 +-
.../views/src/Plugin/views/field/BulkForm.php | 1 +
.../Plugin/views/style/StylePluginBase.php | 1 +
web/core/modules/views/src/Views.php | 5 +-
.../modules/views/src/ViewsConfigUpdater.php | 3 +-
.../views_config_entity_test.schema.yml | 9 ++
.../src/Entity/ViewsConfigEntityTest.php | 26 +++++
.../src/ViewsConfigEntityTestViewsData.php | 27 +++++
.../views_config_entity_test.info.yml | 5 +
.../tests/src/Functional/BulkFormTest.php | 6 +-
.../tests/src/Functional/Handler/AreaTest.php | 10 +-
.../Handler/FieldDropButtonTest.php | 6 +-
.../Handler/FieldEntityOperationsTest.php | 6 +-
.../src/Functional/Handler/FieldWebTest.php | 2 +
.../src/Functional/Handler/FilterDateTest.php | 5 +-
.../src/Functional/Plugin/AccessTest.php | 4 +-
.../Functional/Plugin/ArgumentDefaultTest.php | 5 +-
.../ContextualFiltersBlockContextTest.php | 5 +-
.../Functional/Plugin/DisabledDisplayTest.php | 4 +-
.../src/Functional/Plugin/DisplayTest.php | 2 +-
.../src/Functional/Plugin/MenuLinkTest.php | 5 +-
.../Plugin/NumericFormatPluralTest.php | 5 +-
.../tests/src/Functional/Plugin/PagerTest.php | 12 +-
.../src/Functional/Plugin/StyleTableTest.php | 2 +
.../src/Functional/SearchIntegrationTest.php | 24 ++--
.../src/Functional/SearchMultilingualTest.php | 13 ++-
.../tests/src/Functional/Wizard/MenuTest.php | 2 +-
.../src/Functional/Wizard/WizardTestBase.php | 8 +-
.../views/tests/src/Kernel/ModuleTest.php | 110 +++++++-----------
.../src/Kernel/ViewsConfigUpdaterTest.php | 5 +
.../views/tests/src/Unit/ViewsTest.php | 16 +++
web/core/modules/views/views.module | 2 +
web/core/modules/views/views.theme.inc | 28 ++---
.../tests/src/Functional/AnalyzeTest.php | 2 +-
.../tests/src/Functional/DefaultViewsTest.php | 4 +-
.../tests/src/Functional/DisplayCRUDTest.php | 4 +-
.../src/Functional/DisplayExtenderUITest.php | 2 +-
.../tests/src/Functional/DisplayPathTest.php | 6 +-
.../tests/src/Functional/DisplayTest.php | 2 +-
.../tests/src/Functional/FilterUITest.php | 17 ++-
.../tests/src/Functional/GroupByTest.php | 2 +-
.../tests/src/Functional/RowUITest.php | 2 +-
.../tests/src/Functional/SettingsTest.php | 2 +-
.../tests/src/Functional/StyleUITest.php | 2 +-
.../tests/src/Functional/ViewEditTest.php | 14 +--
.../tests/src/Functional/ViewsListTest.php | 2 +-
.../tests/src/Functional/ViewsUITourTest.php | 5 +-
.../views_ui/tests/src/Functional/XssTest.php | 8 +-
.../FunctionalJavascript/ViewsListingTest.php | 1 +
.../workspaces/src/ViewsQueryAlter.php | 1 +
web/core/phpcs.xml.dist | 1 -
.../UmamiMultilingualInstallTest.php | 1 +
.../tests/src/Functional/MinimalTest.php | 7 +-
.../tests/src/Functional/StandardTest.php | 2 +-
.../Entity/DeleteMultipleFormTest.php | 4 +-
...istributionProfileTranslationQueryTest.php | 1 +
.../DistributionProfileTranslationTest.php | 1 +
...stallerTranslationMultipleLanguageTest.php | 1 +
.../InstallerTranslationQueryTest.php | 1 +
.../Installer/InstallerTranslationTest.php | 1 +
.../Routing/CaseInsensitivePathTest.php | 6 +-
...eCachingNonPathLanguageNegotiationTest.php | 6 +-
.../Cache/EndOfTransactionQueriesTest.php | 6 +-
.../KernelTests/Core/File/DirectoryTest.php | 4 +-
.../KernelTests/Core/File/FileTestBase.php | 2 +
.../KernelTests/Core/File/NameMungingTest.php | 12 +-
.../DatabaseStorageExpirableTest.php | 18 +--
.../Core/KeyValueStore/StorageTestBase.php | 18 +--
.../Core/Routing/ExceptionHandlingTest.php | 1 +
.../Core/TempStore/TempStoreDatabaseTest.php | 14 +--
...SystemModuleDiscoveryDataProviderTrait.php | 7 +-
.../Tests/Component/Annotation/PluginTest.php | 2 +
.../Functional/ScaffoldUpgradeTest.php | 1 +
.../Drupal/Tests/ComposerIntegrationTest.php | 13 +++
.../Tests/Core/Batch/BatchBuilderTest.php | 15 ++-
.../Compiler/BackendCompilerPassTest.php | 2 +
.../Core/Entity/EntityAccessCheckTest.php | 1 +
.../RssResponseRelativeUrlFilterTest.php | 6 +-
.../TestDerivativeDiscoveryWithObject.php | 2 +
.../Tests/Core/Routing/RouteMatchTestBase.php | 1 +
.../Core/Utility/UnroutedUrlAssemblerTest.php | 1 +
.../tests/Drupal/Tests/EntityViewTrait.php | 1 +
web/core/tests/bootstrap.php | 1 +
web/core/themes/claro/css/components/form.css | 13 +++
.../themes/claro/css/components/form.pcss.css | 12 ++
472 files changed, 2692 insertions(+), 895 deletions(-)
create mode 100644 web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyImageFormatter.php
create mode 100644 web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestExternal.php
create mode 100644 web/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module
create mode 100644 web/core/modules/tracker/tests/src/Functional/TrackerRecentContentLinkTest.php
create mode 100644 web/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
create mode 100644 web/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
create mode 100644 web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
create mode 100644 web/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
diff --git a/composer.json b/composer.json
index b5126d0e57..9eb93908d9 100644
--- a/composer.json
+++ b/composer.json
@@ -105,7 +105,7 @@
"drupal/config_update": "1.5",
"drupal/console": "1.8",
"drupal/content_access": "1.0-alpha1",
- "drupal/core-recommended": "8.9.1",
+ "drupal/core-recommended": "8.9.2",
"drupal/crop": "2.1",
"drupal/ctools": "3.4",
"drupal/devel": "2.0",
diff --git a/composer.lock b/composer.lock
index f236c21012..bb1795ffaf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "b2b8534ed98ce807918cdc6dee798bb7",
+ "content-hash": "f874d24e642a536123508670c7dba794",
"packages": [
{
"name": "alchemy/zippy",
@@ -3382,16 +3382,16 @@
},
{
"name": "drupal/core",
- "version": "8.9.1",
+ "version": "8.9.2",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "e8ee964c562870381876e85d3f5eaaf8c8ecc9ee"
+ "reference": "8f0e24555c093669ce41edbb30637fe19df16802"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/e8ee964c562870381876e85d3f5eaaf8c8ecc9ee",
- "reference": "e8ee964c562870381876e85d3f5eaaf8c8ecc9ee",
+ "url": "https://api.github.com/repos/drupal/core/zipball/8f0e24555c093669ce41edbb30637fe19df16802",
+ "reference": "8f0e24555c093669ce41edbb30637fe19df16802",
"shasum": ""
},
"require": {
@@ -3614,20 +3614,20 @@
"GPL-2.0-or-later"
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
- "time": "2020-06-17T17:57:48+00:00"
+ "time": "2020-07-08T18:53:45+00:00"
},
{
"name": "drupal/core-recommended",
- "version": "8.9.1",
+ "version": "8.9.2",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "41042f9eaa35b027e6b2c42fa03edcb85da54a06"
+ "reference": "8301ff766f17ce8a9eb36d3ffd183cbfff01dad6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/41042f9eaa35b027e6b2c42fa03edcb85da54a06",
- "reference": "41042f9eaa35b027e6b2c42fa03edcb85da54a06",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/8301ff766f17ce8a9eb36d3ffd183cbfff01dad6",
+ "reference": "8301ff766f17ce8a9eb36d3ffd183cbfff01dad6",
"shasum": ""
},
"require": {
@@ -3639,7 +3639,7 @@
"doctrine/common": "v2.7.3",
"doctrine/inflector": "v1.2.0",
"doctrine/lexer": "1.0.2",
- "drupal/core": "8.9.1",
+ "drupal/core": "8.9.2",
"easyrdf/easyrdf": "0.9.1",
"egulias/email-validator": "2.1.17",
"guzzlehttp/guzzle": "6.5.4",
@@ -3696,7 +3696,7 @@
"GPL-2.0-or-later"
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
- "time": "2020-06-17T17:57:48+00:00"
+ "time": "2020-07-08T18:53:45+00:00"
},
{
"name": "drupal/crop",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b7ea18a483..382bb89cf6 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3491,17 +3491,17 @@
},
{
"name": "drupal/core",
- "version": "8.9.1",
- "version_normalized": "8.9.1.0",
+ "version": "8.9.2",
+ "version_normalized": "8.9.2.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "e8ee964c562870381876e85d3f5eaaf8c8ecc9ee"
+ "reference": "8f0e24555c093669ce41edbb30637fe19df16802"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/e8ee964c562870381876e85d3f5eaaf8c8ecc9ee",
- "reference": "e8ee964c562870381876e85d3f5eaaf8c8ecc9ee",
+ "url": "https://api.github.com/repos/drupal/core/zipball/8f0e24555c093669ce41edbb30637fe19df16802",
+ "reference": "8f0e24555c093669ce41edbb30637fe19df16802",
"shasum": ""
},
"require": {
@@ -3668,7 +3668,7 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
- "time": "2020-06-17T17:57:48+00:00",
+ "time": "2020-07-08T18:53:45+00:00",
"type": "drupal-core",
"extra": {
"drupal-scaffold": {
@@ -3729,17 +3729,17 @@
},
{
"name": "drupal/core-recommended",
- "version": "8.9.1",
- "version_normalized": "8.9.1.0",
+ "version": "8.9.2",
+ "version_normalized": "8.9.2.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "41042f9eaa35b027e6b2c42fa03edcb85da54a06"
+ "reference": "8301ff766f17ce8a9eb36d3ffd183cbfff01dad6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/41042f9eaa35b027e6b2c42fa03edcb85da54a06",
- "reference": "41042f9eaa35b027e6b2c42fa03edcb85da54a06",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/8301ff766f17ce8a9eb36d3ffd183cbfff01dad6",
+ "reference": "8301ff766f17ce8a9eb36d3ffd183cbfff01dad6",
"shasum": ""
},
"require": {
@@ -3751,7 +3751,7 @@
"doctrine/common": "v2.7.3",
"doctrine/inflector": "v1.2.0",
"doctrine/lexer": "1.0.2",
- "drupal/core": "8.9.1",
+ "drupal/core": "8.9.2",
"easyrdf/easyrdf": "0.9.1",
"egulias/email-validator": "2.1.17",
"guzzlehttp/guzzle": "6.5.4",
@@ -3802,7 +3802,7 @@
"conflict": {
"webflo/drupal-core-strict": "*"
},
- "time": "2020-06-17T17:57:48+00:00",
+ "time": "2020-07-08T18:53:45+00:00",
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
diff --git a/web/core/CHANGELOG.txt b/web/core/CHANGELOG.txt
index 49587bc7aa..3b99f6bd5d 100644
--- a/web/core/CHANGELOG.txt
+++ b/web/core/CHANGELOG.txt
@@ -3,6 +3,6 @@ patch (bugfix) releases are released every month. More information on the
Drupal release cycle: https://www.drupal.org/core/release-cycle-overview
* For a full list of fixes in the latest release, visit:
- https://www.drupal.org/8/download
+ https://www.drupal.org/latest-release
* API change records for Drupal core:
https://www.drupal.org/list-changes/drupal
diff --git a/web/core/INSTALL.sqlite.txt b/web/core/INSTALL.sqlite.txt
index e22aaa89c3..96092c3760 100644
--- a/web/core/INSTALL.sqlite.txt
+++ b/web/core/INSTALL.sqlite.txt
@@ -20,13 +20,13 @@ SQLITE DATABASE CREATION
The Drupal installer will create the SQLite database for you. The only
requirement is that the installer must have write permissions to the directory
where the database file resides. This directory (not just the database file) also
-has to remain writeable by the web server going forward for SQLite to continue to
+has to remain writable by the web server going forward for SQLite to continue to
be able to operate.
On the "Database configuration" form in the "Database file" field, you must
supply the exact path to where you wish your database file to reside. It is
strongly suggested that you choose a path that is outside of the webroot, yet
-ensure that the directory is writeable by the web server.
+ensure that the directory is writable by the web server.
If you must place your database file in your webroot, you could try using the
following in your "Database file" field:
diff --git a/web/core/INSTALL.txt b/web/core/INSTALL.txt
index 5dbc9e0233..fcfa09d150 100644
--- a/web/core/INSTALL.txt
+++ b/web/core/INSTALL.txt
@@ -190,7 +190,7 @@ INSTALLATION
chmod a+w sites/default/files
Be sure to set the permissions for the default directory back after the
- installation is finished! (Leave the files directory writeable.)
+ installation is finished! (Leave the files directory writable.)
Sample command:
chmod go-w sites/default
diff --git a/web/core/includes/file.inc b/web/core/includes/file.inc
index 859ed8d0f0..c9eec6c9d8 100644
--- a/web/core/includes/file.inc
+++ b/web/core/includes/file.inc
@@ -683,7 +683,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
// http://php.net/manual/security.filesystem.nullbytes.php
$filename = str_replace(chr(0), '', $filename);
- $whitelist = array_unique(explode(' ', strtolower(trim($extensions))));
+ $allowed_extensions = array_unique(explode(' ', strtolower(trim($extensions))));
// Split the filename up by periods. The first part becomes the basename
// the last part the final extension.
@@ -698,7 +698,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
// of allowed extensions.
foreach ($filename_parts as $filename_part) {
$new_filename .= '.' . $filename_part;
- if (!in_array(strtolower($filename_part), $whitelist) && preg_match("/^[a-zA-Z]{2,5}\d?$/", $filename_part)) {
+ if (!in_array(strtolower($filename_part), $allowed_extensions) && preg_match("/^[a-zA-Z]{2,5}\d?$/", $filename_part)) {
$new_filename .= '_';
}
}
diff --git a/web/core/includes/install.core.inc b/web/core/includes/install.core.inc
index b4ec568004..85981876da 100644
--- a/web/core/includes/install.core.inc
+++ b/web/core/includes/install.core.inc
@@ -1023,7 +1023,7 @@ function install_display_output($output, $install_state) {
// Prevent install.php from being indexed when installed in a sub folder.
// robots.txt rules are not read if the site is within domain.com/subfolder
// resulting in /subfolder/install.php being found through search engines.
- // When settings.php is writeable this can be used via an external database
+ // When settings.php is writable this can be used via an external database
// leading a malicious user to gain php access to the server.
$noindex_meta_tag = [
'#tag' => 'meta',
diff --git a/web/core/includes/install.inc b/web/core/includes/install.inc
index ce0f94fc58..987186f561 100644
--- a/web/core/includes/install.inc
+++ b/web/core/includes/install.inc
@@ -478,6 +478,7 @@ function _drupal_rewrite_settings_global(&$ref, $variable) {
* The container for variable values.
* @param string $variable_name
* Name of variable.
+ *
* @return string
* A string containing valid PHP code of the variable suitable for placing
* into settings.php.
@@ -508,6 +509,7 @@ function _drupal_rewrite_settings_dump($variable, $variable_name) {
* A string to prepend to the variable's value.
* @param string $suffix
* A string to append to the variable's value.
+ *
* @return string
* A string containing valid PHP code of the variable suitable for placing
* into settings.php.
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index e1c6c00e34..b51f24019b 100644
--- a/web/core/lib/Drupal.php
+++ b/web/core/lib/Drupal.php
@@ -82,7 +82,7 @@ class Drupal {
/**
* The current system version.
*/
- const VERSION = '8.9.1';
+ const VERSION = '8.9.2';
/**
* Core API compatibility.
diff --git a/web/core/lib/Drupal/Component/Annotation/Plugin.php b/web/core/lib/Drupal/Component/Annotation/Plugin.php
index 790440d112..504ff401d1 100644
--- a/web/core/lib/Drupal/Component/Annotation/Plugin.php
+++ b/web/core/lib/Drupal/Component/Annotation/Plugin.php
@@ -39,7 +39,7 @@ public function __construct($values) {
return $value !== NULL;
});
$parsed_values = $this->parse($values);
- $this->definition = NestedArray::mergeDeep($defaults, $parsed_values);
+ $this->definition = NestedArray::mergeDeepArray([$defaults, $parsed_values], TRUE);
}
/**
diff --git a/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php b/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
index d9996bbbca..1b90afd8dd 100644
--- a/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
+++ b/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
@@ -26,7 +26,7 @@ class FileSecurity {
* TRUE if the file already exists or was created. FALSE otherwise.
*/
public static function writeHtaccess($directory, $deny_public_access = TRUE, $force = FALSE) {
- return self::writeFile($directory, '/.htaccess', self::htaccessLines($deny_public_access), $force);
+ return self::writeFile($directory, '.htaccess', self::htaccessLines($deny_public_access), $force);
}
/**
@@ -110,7 +110,7 @@ protected static function denyPublicAccess() {
* TRUE if the file already exists or was created. FALSE otherwise.
*/
public static function writeWebConfig($directory, $force = FALSE) {
- return self::writeFile($directory, '/web.config', self::webConfigLines(), $force);
+ return self::writeFile($directory, 'web.config', self::webConfigLines(), $force);
}
/**
@@ -152,7 +152,12 @@ protected static function writeFile($directory, $filename, $contents, $force) {
if (file_exists($file_path) && !$force) {
return TRUE;
}
- if (file_exists($directory) && is_writable($directory) && file_put_contents($file_path, $contents)) {
+ // Writing the file can fail if:
+ // - concurrent requests are both trying to write at the same time.
+ // - $directory does not exist or is not writable.
+ // Testing for these conditions introduces windows for concurrency issues to
+ // occur.
+ if (@file_put_contents($file_path, $contents)) {
return @chmod($file_path, 0444);
}
return FALSE;
diff --git a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
index c7e6febe9d..ff1949418f 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
@@ -222,6 +222,7 @@ protected function getUncachedMTime($directory) {
* The directory where the temporary filename will be created.
* @param $prefix
* The prefix of the generated temporary filename.
+ *
* @return string
* Returns the new temporary filename (with path), or FALSE on failure.
*/
diff --git a/web/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/web/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
index fb9194c98a..7a370d252a 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
@@ -52,7 +52,7 @@ public function load($name);
public function save($name, $code);
/**
- * Whether this is a writeable storage.
+ * Whether this is a writable storage.
*
* @return bool
*/
diff --git a/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php b/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
index 1932983e2d..32b59ef748 100644
--- a/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
+++ b/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverInterface.php
@@ -32,6 +32,7 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition)
*
* @param array $base_plugin_definition
* The definition array of the base plugin.
+ *
* @return array
* An array of full derivative definitions keyed on derivative id.
*
diff --git a/web/core/lib/Drupal/Component/Utility/Random.php b/web/core/lib/Drupal/Component/Utility/Random.php
index 57287f9d5f..6c2f9056e5 100644
--- a/web/core/lib/Drupal/Component/Utility/Random.php
+++ b/web/core/lib/Drupal/Component/Utility/Random.php
@@ -249,6 +249,7 @@ public function sentences($min_word_count, $capitalize = FALSE) {
* Generate paragraphs separated by double new line.
*
* @param int $paragraph_count
+ *
* @return string
*/
public function paragraphs($paragraph_count = 12) {
diff --git a/web/core/lib/Drupal/Component/Utility/Xss.php b/web/core/lib/Drupal/Component/Utility/Xss.php
index f5e99fe886..4bb8bbd16f 100644
--- a/web/core/lib/Drupal/Component/Utility/Xss.php
+++ b/web/core/lib/Drupal/Component/Utility/Xss.php
@@ -70,7 +70,7 @@ public static function filter($string, array $html_tags = NULL) {
// Defuse all HTML entities.
$string = str_replace('&', '&', $string);
- // Change back only well-formed entities in our whitelist:
+ // Change back only well-formed entities in our list of allowed html tags:
// Decimal numeric entities.
$string = preg_replace('/&#([0-9]+;)/', '&#\1', $string);
// Hexadecimal numeric entities.
@@ -83,7 +83,7 @@ public static function filter($string, array $html_tags = NULL) {
$splitter = function ($matches) use ($html_tags, $class) {
return $class::split($matches[1], $html_tags, $class);
};
- // Strip any tags that are not in the whitelist.
+ // Strip any tags that are not in the list of allowed html tags.
return preg_replace_callback('%
(
<(?=[^a-zA-Z!/]) # a lone <
@@ -161,7 +161,9 @@ protected static function split($string, $html_tags, $class) {
$elem = '!--';
}
- // When in whitelist mode, an element is disallowed when not listed.
+ // Defer to the ::needsRemoval() method to decide if the element is to be
+ // removed. This allows the list of tags to be treated as either a list of
+ // allowed tags or a list of denied tags.
if ($class::needsRemoval($html_tags, $elem)) {
return '';
}
diff --git a/web/core/lib/Drupal/Core/Asset/AssetResolver.php b/web/core/lib/Drupal/Core/Asset/AssetResolver.php
index c0b0f26fa7..c52ee7ffad 100644
--- a/web/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/web/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -188,6 +188,7 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) {
*
* @param \Drupal\Core\Asset\AttachedAssetsInterface $assets
* The assets attached to the current response.
+ *
* @return array
* A (possibly optimized) collection of JavaScript assets.
*/
diff --git a/web/core/lib/Drupal/Core/Batch/BatchBuilder.php b/web/core/lib/Drupal/Core/Batch/BatchBuilder.php
index dce669874d..91550e716c 100644
--- a/web/core/lib/Drupal/Core/Batch/BatchBuilder.php
+++ b/web/core/lib/Drupal/Core/Batch/BatchBuilder.php
@@ -205,12 +205,18 @@ public function setErrorMessage($message) {
* The path should be relative to base_path(), and thus should be built using
* drupal_get_path(). Defaults to {module_name}.module.
*
+ * The file needs to be set before using ::addOperation(),
+ * ::setFinishCallback(), or any other function that uses callbacks from the
+ * file. This is so that PHP knows about the included functions.
+ *
* @param string $filename
* The path to the file.
*
* @return $this
*/
public function setFile($filename) {
+ include_once $filename;
+
$this->file = $filename;
return $this;
}
diff --git a/web/core/lib/Drupal/Core/Command/DbCommandBase.php b/web/core/lib/Drupal/Core/Command/DbCommandBase.php
index ec3b1889cc..d5a80e08d2 100644
--- a/web/core/lib/Drupal/Core/Command/DbCommandBase.php
+++ b/web/core/lib/Drupal/Core/Command/DbCommandBase.php
@@ -26,6 +26,7 @@ protected function configure() {
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* Input object.
+ *
* @return \Drupal\Core\Database\Connection
*/
protected function getDatabaseConnection(InputInterface $input) {
diff --git a/web/core/lib/Drupal/Core/Command/DbDumpCommand.php b/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
index bd6ca624ce..d112da5ede 100644
--- a/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -70,6 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
* The database connection to use.
* @param array $schema_only
* Table patterns for which to only dump the schema, no data.
+ *
* @return string
* The PHP script.
*/
@@ -105,6 +106,7 @@ protected function generateScript(Connection $connection, array $schema_only = [
*
* @param \Drupal\Core\Database\Connection $connection
* The database connection to use.
+ *
* @return array
* An array of table names.
*/
diff --git a/web/core/lib/Drupal/Core/Config/TypedConfigManager.php b/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
index c6ddfb5e9c..8585f8399e 100644
--- a/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -269,6 +269,7 @@ protected function getFallbackName($name) {
* Configuration name with variables in square brackets.
* @param mixed $data
* Configuration data for the element.
+ *
* @return string
* Configuration name with variables replaced.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Connection.php b/web/core/lib/Drupal/Core/Database/Connection.php
index dc96435f7e..00e6d6c9d0 100644
--- a/web/core/lib/Drupal/Core/Database/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Connection.php
@@ -778,6 +778,7 @@ protected function expandArguments(&$query, &$args) {
*
* @param string $class
* The class for which we want the potentially driver-specific class.
+ *
* @return string
* The name of the class that should be used for this driver.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index ed0f9c8ffc..5ef4d70ea6 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -87,6 +87,7 @@ protected function buildTableNameCondition($table_name, $operator = '=', $add_pr
* The name of the table to create.
* @param $table
* A Schema API table definition array.
+ *
* @return
* An array of SQL statements to create the table.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index 025b25039d..14286c76eb 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -281,6 +281,7 @@ public function escapeTable($table) {
*
* @param $string
* The string to escape.
+ *
* @return string
* The escaped string.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index cf1a3108c2..14d8afe2f6 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -99,6 +99,7 @@ protected function ensureIdentifiersLength($table_identifier_part, $column_ident
*
* @param $table_name
* The non-prefixed name of the table.
+ *
* @return
* An object with two member variables:
* - 'blob_fields' that lists all the blob fields in the table.
@@ -264,6 +265,7 @@ public function queryFieldInformation($table, $field, $constraint_type = 'c') {
* The name of the table to create.
* @param $table
* A Schema API table definition array.
+ *
* @return
* An array of SQL statements to create the table.
*/
@@ -1074,6 +1076,7 @@ public function getComment($table, $column = NULL) {
*
* @param $data
* String to be hashed.
+ *
* @return string
* A base-64 encoded sha-256 hash, with + and / replaced with _ and any =
* padding characters removed.
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 41106995f3..ea3be4a9c6 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -48,6 +48,7 @@ public function fieldExists($table, $column) {
* The name of the table to create.
* @param $table
* A Schema API table definition array.
+ *
* @return
* An array of SQL statements to create the table.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Log.php b/web/core/lib/Drupal/Core/Database/Log.php
index 74e08e7ca3..6cf8d20718 100644
--- a/web/core/lib/Drupal/Core/Database/Log.php
+++ b/web/core/lib/Drupal/Core/Database/Log.php
@@ -69,6 +69,7 @@ public function start($logging_key) {
*
* @param $logging_key
* The logging key to fetch.
+ *
* @return
* An indexed array of all query records for this logging key.
*/
diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 710877239a..b2f2456616 100644
--- a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -169,6 +169,7 @@ public function getArguments(PlaceholderInterface $queryPlaceholder = NULL);
*
* @param $distinct
* TRUE to flag this query DISTINCT, FALSE to disable it.
+ *
* @return $this
* The called object.
*/
@@ -188,6 +189,7 @@ public function distinct($distinct = TRUE);
* automatically based on the $table_alias and $field. The alias will be
* checked for uniqueness, so the requested alias may not be the alias
* that is assigned in all cases.
+ *
* @return
* The unique alias that was assigned for this field.
*/
@@ -211,6 +213,7 @@ public function addField($table_alias, $field, $alias = NULL);
* An indexed array of fields present in the specified table that should be
* included in this query. If not specified, $table_alias.* will be generated
* without any aliases.
+ *
* @return $this
* The called object.
*/
@@ -232,6 +235,7 @@ public function fields($table_alias, array $fields = []);
* in all cases.
* @param $arguments
* Any placeholder arguments needed for this expression.
+ *
* @return
* The unique alias that was assigned for this expression.
*/
@@ -260,6 +264,7 @@ public function addExpression($expression, $alias = NULL, $arguments = []);
* system, for example, when joining the same table more than once.
* @param $arguments
* An array of arguments to replace into the $condition of this join.
+ *
* @return
* The unique alias that was assigned for this table.
*/
@@ -286,6 +291,7 @@ public function join($table, $alias = NULL, $condition = NULL, $arguments = []);
* system, for example, when joining the same table more than once.
* @param $arguments
* An array of arguments to replace into the $condition of this join.
+ *
* @return
* The unique alias that was assigned for this table.
*/
@@ -312,6 +318,7 @@ public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments =
* system, for example, when joining the same table more than once.
* @param $arguments
* An array of arguments to replace into the $condition of this join.
+ *
* @return
* The unique alias that was assigned for this table.
*/
@@ -338,6 +345,7 @@ public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments =
* system, for example, when joining the same table more than once.
* @param $arguments
* An array of arguments to replace into the $condition of this join.
+ *
* @return
* The unique alias that was assigned for this table.
*
@@ -379,6 +387,7 @@ public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments =
* system, for example, when joining the same table more than once.
* @param $arguments
* An array of arguments to replace into the $condition of this join.
+ *
* @return
* The unique alias that was assigned for this table.
*/
@@ -411,6 +420,7 @@ public function addJoin($type, $table, $alias = NULL, $condition = NULL, $argume
* @param $direction
* The direction to sort. Legal values are "ASC" and "DESC". Any other value
* will be converted to "ASC".
+ *
* @return $this
* The called object.
*/
@@ -449,6 +459,7 @@ public function orderRandom();
* range directives that are set.
* @param $length
* The number of records to return from the result set.
+ *
* @return $this
* The called object.
*/
@@ -474,6 +485,7 @@ public function range($start = NULL, $length = NULL);
* @param $type
* The type of UNION to add to the query. Defaults to plain
* UNION.
+ *
* @return $this
* The called object.
*/
@@ -484,6 +496,7 @@ public function union(SelectInterface $query, $type = '');
*
* @param $field
* The field on which to group. This should be the field as aliased.
+ *
* @return $this
* The called object.
*/
@@ -539,6 +552,7 @@ public function execute();
* The comparison operator, such as =, <, or >=. It also accepts more complex
* options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
* = otherwise.
+ *
* @return \Drupal\Core\Database\Query\ConditionInterface
* The called object.
*/
diff --git a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 90beeae143..da0fea5b68 100644
--- a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -216,6 +216,7 @@ protected function throwPDOException() {
* The query.
* @param array|null $args
* An array of arguments. This can be NULL.
+ *
* @return \PDOStatement
* A PDOStatement object.
*/
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index 3df078a06b..48663594ce 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -452,6 +452,7 @@ protected function getFieldDefinitions() {
*
* @param \Drupal\Core\Field\FieldDefinitionInterface $definition
* A field definition.
+ *
* @return array|null
*/
private function fieldHasDisplayOptions(FieldDefinitionInterface $definition) {
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index c7480ed913..1926cf6305 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -35,6 +35,7 @@ public function condition($field, $function = NULL, $value = NULL, $operator = N
*
* @param $field
* @param string $langcode
+ *
* @return ConditionInterface
* @see \Drupal\Core\Entity\Query\QueryInterface::exists()
*/
@@ -44,6 +45,7 @@ public function exists($field, $function, $langcode = NULL);
* Queries for the nonexistence of a field.
*
* @param string $field
+ *
* @return ConditionInterface
* @see \Drupal\Core\Entity\Query\QueryInterface::notExists()
*/
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index 1d5ed5dbe7..48052e4719 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -107,6 +107,7 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N
* Name of a field.
* @param $langcode
* Language code (optional).
+ *
* @return $this
*/
public function exists($field, $langcode = NULL);
@@ -118,6 +119,7 @@ public function exists($field, $langcode = NULL);
* Name of a field.
* @param $langcode
* Language code (optional).
+ *
* @return $this
*/
public function notExists($field, $langcode = NULL);
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index 3e263d8381..0f7ae5b217 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -144,6 +144,7 @@ protected function finish() {
* The field as passed in by the caller.
* @param string $sql_field
* The sql field as returned by getSqlField.
+ *
* @return string
* The SQL alias expected in the return value. The dots in $sql_field are
* replaced with underscores and if a default fallback to .value happened,
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index dd23ab652a..ac6a3795c1 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -373,7 +373,9 @@ protected function ensureEntityTable($index_prefix, $property, $type, $langcode,
*
* @param $field_name
* Name of the field.
+ *
* @return string
+ *
* @throws \Drupal\Core\Entity\Query\QueryException
*/
protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $base_table, $entity_id_field, $field_id_field, $delta) {
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 09f8434370..3540a42ef0 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -193,14 +193,9 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
}
}
- // Update the module handler in order to load the module's code.
- // This allows the module to participate in hooks and its existence to
- // be discovered by other modules.
- // The current ModuleHandler instance is obsolete with the kernel
- // rebuild below.
+ // Update the module handler in order to have the correct module list
+ // for the kernel update.
$this->moduleHandler->setModuleList($module_filenames);
- $this->moduleHandler->load($module);
- module_load_install($module);
// Clear the static cache of the "extension.list.module" service to pick
// up the new module, since it merges the installation status of modules
@@ -210,6 +205,10 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
// Update the kernel to include it.
$this->updateKernel($module_filenames);
+ // Load the module's .module and .install files.
+ $this->moduleHandler->load($module);
+ module_load_install($module);
+
// Replace the route provider service with a version that will rebuild
// if routes used during installation. This ensures that a module's
// routes are available during installation. This has to occur before
diff --git a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 8f041ad025..922eba4f25 100644
--- a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -125,9 +125,10 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
*
* The default value is expressed as a numerically indexed array of items,
* each item being an array of key/value pairs matching the set of 'columns'
- * defined by the "field schema" for the field type, as exposed in
- * hook_field_schema(). If the number of items exceeds the cardinality of the
- * field, extraneous items will be ignored.
+ * defined by the "field schema" for the field type, as exposed in the class
+ * implementing \Drupal\Core\Field\FieldItemInterface::schema() method. If the
+ * number of items exceeds the cardinality of the field, extraneous items will
+ * be ignored.
*
* This property is overlooked if the $default_value_callback is non-empty.
*
diff --git a/web/core/lib/Drupal/Core/File/file.api.php b/web/core/lib/Drupal/Core/File/file.api.php
index 9109778ef0..6c5236fec9 100644
--- a/web/core/lib/Drupal/Core/File/file.api.php
+++ b/web/core/lib/Drupal/Core/File/file.api.php
@@ -22,6 +22,7 @@
*
* @param $uri
* The URI of the file.
+ *
* @return
* If the user does not have permission to access the file, return -1. If the
* user has permission, return an array with the appropriate headers. If the
diff --git a/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index d53ad5ba2a..642542b549 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -1459,6 +1459,7 @@ protected static function schemaDefinition() {
*
* @param array $definitions
* The new menu link definitions.
+ *
* @return array
* A list of menu link IDs that no longer exist.
*/
diff --git a/web/core/lib/Drupal/Core/Menu/menu.api.php b/web/core/lib/Drupal/Core/Menu/menu.api.php
index 758013f494..dfe000971d 100644
--- a/web/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/web/core/lib/Drupal/Core/Menu/menu.api.php
@@ -329,7 +329,7 @@ function hook_menu_local_tasks_alter(&$data, $route_name, \Drupal\Core\Cache\Ref
],
];
// The tab we're adding is dependent on a user's access to add content.
- $cacheability->addCacheTags(['user.permissions']);
+ $cacheability->addCacheContexts(['user.permissions']);
}
/**
diff --git a/web/core/lib/Drupal/Core/Render/theme.api.php b/web/core/lib/Drupal/Core/Render/theme.api.php
index ecb76b7d21..605c91b126 100644
--- a/web/core/lib/Drupal/Core/Render/theme.api.php
+++ b/web/core/lib/Drupal/Core/Render/theme.api.php
@@ -274,9 +274,9 @@
* vectors while allowing a permissive list of HTML tags that are not XSS
* vectors. (For example, <script> and <style> are not allowed.) See
* \Drupal\Component\Utility\Xss::$adminTags for the list of allowed tags. If
- * your markup needs any of the tags not in this whitelist, then you can
- * implement a theme hook and/or an asset library. Alternatively, you can use
- * the key #allowed_tags to alter which tags are filtered.
+ * your markup needs any of the tags not in this list, then you can implement
+ * a theme hook and/or an asset library. Alternatively, you can use the key
+ * #allowed_tags to alter which tags are filtered.
* - #plain_text: Specifies that the array provides text that needs to be
* escaped. This value takes precedence over #markup.
* - #allowed_tags: If #markup is supplied, this can be used to change which
diff --git a/web/core/lib/Drupal/Core/Security/DoTrustedCallbackTrait.php b/web/core/lib/Drupal/Core/Security/DoTrustedCallbackTrait.php
index d3d86b977b..4548a0a52b 100644
--- a/web/core/lib/Drupal/Core/Security/DoTrustedCallbackTrait.php
+++ b/web/core/lib/Drupal/Core/Security/DoTrustedCallbackTrait.php
@@ -32,7 +32,7 @@ trait DoTrustedCallbackTrait {
* @param string $error_type
* (optional) The type of error to trigger. One of:
* - TrustedCallbackInterface::THROW_EXCEPTION
- * - TrustedCallbackInterface::TRIGGER_DEPRECATION
+ * - TrustedCallbackInterface::TRIGGER_WARNING
* - TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION
* Defaults to TrustedCallbackInterface::THROW_EXCEPTION.
* @param string $extra_trusted_interface
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
index a354785aff..38a7758d0a 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -45,7 +45,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
const READ = 0x0004;
/**
- * Wrapper is writeable.
+ * Wrapper is writable.
*/
const WRITE = 0x0008;
@@ -67,12 +67,12 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
const HIDDEN = 0x000C;
/**
- * Hidden, readable and writeable using local files.
+ * Hidden, readable and writable using local files.
*/
const LOCAL_HIDDEN = 0x000D;
/**
- * Visible, readable and writeable.
+ * Visible, readable and writable.
*/
const WRITE_VISIBLE = 0x001C;
@@ -91,7 +91,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
const NORMAL = 0x001C;
/**
- * Visible, readable and writeable using local files.
+ * Visible, readable and writable using local files.
*/
const LOCAL_NORMAL = 0x001D;
diff --git a/web/core/lib/Drupal/Core/Theme/Registry.php b/web/core/lib/Drupal/Core/Theme/Registry.php
index 38e1006561..15c88b0290 100644
--- a/web/core/lib/Drupal/Core/Theme/Registry.php
+++ b/web/core/lib/Drupal/Core/Theme/Registry.php
@@ -802,6 +802,7 @@ public function destruct() {
*
* @param $prefixes
* An array of function prefixes by which the list can be limited.
+ *
* @return array
* Functions grouped by the first prefix.
*/
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php b/web/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
index 3b1e1e49b9..a398697484 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
@@ -58,6 +58,7 @@ public function resetActiveTheme();
*
* @param \Drupal\Core\Theme\ActiveTheme $active_theme
* The new active theme.
+ *
* @return $this
*/
public function setActiveTheme(ActiveTheme $active_theme);
diff --git a/web/core/lib/Drupal/Core/Updater/Updater.php b/web/core/lib/Drupal/Core/Updater/Updater.php
index 1d3fdb59a0..46ea7ea8cd 100644
--- a/web/core/lib/Drupal/Core/Updater/Updater.php
+++ b/web/core/lib/Drupal/Core/Updater/Updater.php
@@ -291,7 +291,7 @@ public function install(&$filetransfer, $overrides = []) {
return $this->postInstallTasks();
}
catch (FileTransferException $e) {
- throw new UpdaterFileTransferException("File Transfer failed, reason: '" . strtr($e->getMessage(), $e->arguments)) . "'";
+ throw new UpdaterFileTransferException("File Transfer failed, reason: '" . strtr($e->getMessage(), $e->arguments) . "'");
}
}
diff --git a/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php b/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
index 5e50f5e2b3..2a2ac99c7a 100644
--- a/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
+++ b/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
@@ -77,7 +77,7 @@ protected function buildExternalUrl($uri, array $options = [], $collect_bubbleab
$parsed += ['query' => []];
$options += ['query' => []];
- $options['query'] = NestedArray::mergeDeep($parsed['query'], $options['query']);
+ $options['query'] = NestedArray::mergeDeepArray([$parsed['query'], $options['query']], TRUE);
if ($parsed['fragment'] && !$options['fragment']) {
$options['fragment'] = '#' . $parsed['fragment'];
diff --git a/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php b/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
index b7722a9e3f..e59e766ffd 100644
--- a/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
+++ b/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
@@ -25,6 +25,7 @@ interface TranslatorInterface {
* The domain for the message or null to use the default.
* @param string|null $locale
* The locale or null to use the default.
+ *
* @return string
* The translated string.
*
diff --git a/web/core/misc/tableheader.es6.js b/web/core/misc/tableheader.es6.js
index 9d3bceecbc..8b39676651 100644
--- a/web/core/misc/tableheader.es6.js
+++ b/web/core/misc/tableheader.es6.js
@@ -139,12 +139,12 @@
// Bind to custom Drupal events.
$(document).on({
/**
- * Recalculate columns width when window is resized and when show/hide
- * weight is triggered.
+ * Recalculate columns width when window is resized, when show/hide weight
+ * is triggered, or when toolbar tray is toggled.
*
* @ignore
*/
- 'columnschange.TableHeader': tableHeaderResizeHandler,
+ 'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
/**
* Recalculate TableHeader.topOffset when viewport is resized.
diff --git a/web/core/misc/tableheader.js b/web/core/misc/tableheader.js
index 6c31845cc0..bc3827d1a7 100644
--- a/web/core/misc/tableheader.js
+++ b/web/core/misc/tableheader.js
@@ -77,7 +77,7 @@
});
$(document).on({
- 'columnschange.TableHeader': tableHeaderResizeHandler,
+ 'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
'drupalViewportOffsetChange.TableHeader': tableHeaderOffsetChangeHandler
});
diff --git a/web/core/modules/aggregator/src/Controller/AggregatorController.php b/web/core/modules/aggregator/src/Controller/AggregatorController.php
index 5beb15441c..0d2a329a9e 100644
--- a/web/core/modules/aggregator/src/Controller/AggregatorController.php
+++ b/web/core/modules/aggregator/src/Controller/AggregatorController.php
@@ -125,7 +125,7 @@ public function adminOverview() {
$next_update = $this->t('imminently');
}
elseif ($last_checked && $refresh_rate) {
- $next_update = $next = $this->t('%time left', ['%time' => $this->dateFormatter->formatInterval($last_checked + $refresh_rate - REQUEST_TIME)]);
+ $next_update = $this->t('%time left', ['%time' => $this->dateFormatter->formatInterval($last_checked + $refresh_rate - REQUEST_TIME)]);
}
else {
$next_update = $this->t('never');
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
index f58ec5fce2..2b74d30046 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
@@ -46,7 +46,12 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer news feeds', 'access news feeds', 'create article content']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer news feeds',
+ 'access news feeds',
+ 'create article content',
+ ]);
$this->drupalLogin($this->adminUser);
$this->drupalPlaceBlock('local_tasks_block');
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
index aeb7b99795..1f729cb1e2 100644
--- a/web/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
@@ -55,7 +55,13 @@ protected function setUp() {
* Tests creation of feeds with a language.
*/
public function testFeedLanguage() {
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer news feeds', 'access news feeds', 'create article content']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'administer news feeds',
+ 'access news feeds',
+ 'create article content',
+ ]);
$this->drupalLogin($admin_user);
// Enable language selection for feeds.
diff --git a/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php b/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
index 89cc07eaca..ba03d6e053 100644
--- a/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
@@ -29,7 +29,12 @@ class ImportOpmlTest extends AggregatorTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer news feeds', 'access news feeds', 'create article content', 'administer blocks']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer news feeds',
+ 'access news feeds',
+ 'create article content',
+ 'administer blocks',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
index b3fe6b38ae..9469aad782 100644
--- a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
+++ b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
@@ -128,7 +128,7 @@ public function authenticate(Request $request) {
}
// Always register an IP-based failed login event.
$this->flood->register('basic_auth.failed_login_ip', $flood_config->get('ip_window'));
- return [];
+ return NULL;
}
/**
diff --git a/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
index 84089e78cf..297176e48e 100644
--- a/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
+++ b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
@@ -76,7 +76,7 @@ public function testBasicAuth() {
// Ensure that a route without basic auth defined doesn't allow login.
$this->basicAuthGet(Url::fromRoute('system.admin'), $account->getAccountName(), $account->pass_raw);
- $this->assertNoLink('Log out', 'User is not logged in');
+ $this->assertSession()->linkNotExists('Log out', 'User is not logged in');
$this->assertSession()->statusCodeEquals(403);
$this->mink->resetSessions();
diff --git a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
index 42a9acb6e8..e059f98399 100644
--- a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
+++ b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
@@ -192,7 +192,9 @@ public function testBigPipe() {
// Verify that the two expected exceptions are logged as errors.
$this->assertEqual($log_count + 2, $connection->query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), 'Two new watchdog entries.');
- $records = $connection->query('SELECT * FROM {watchdog} ORDER BY wid DESC LIMIT 2')->fetchAll();
+ // Using the method queryRange() allows contrib database drivers the ability
+ // to insert their own limit and offset functionality.
+ $records = $connection->queryRange('SELECT * FROM {watchdog} ORDER BY wid DESC', 0, 2)->fetchAll();
$this->assertEqual(RfcLogLevel::ERROR, $records[0]->severity);
$this->assertStringContainsString('Oh noes!', (string) unserialize($records[0]->variables)['@message']);
$this->assertEqual(RfcLogLevel::ERROR, $records[1]->severity);
diff --git a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
index a217396aee..bd7af5e917 100644
--- a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
@@ -28,7 +28,10 @@ class BlockAdminThemeTest extends BrowserTestBase {
*/
public function testAdminTheme() {
// Create administrative user.
- $admin_user = $this->drupalCreateUser(['administer blocks', 'administer themes']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer themes',
+ ]);
$this->drupalLogin($admin_user);
// Ensure that access to block admin page is denied when theme is not
diff --git a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
index 4e8f239728..63bb68d885 100644
--- a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
@@ -56,7 +56,10 @@ protected function setUp() {
parent::setUp();
// Create an admin user, log in and enable test blocks.
- $this->adminUser = $this->drupalCreateUser(['administer blocks', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer blocks',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->adminUser);
// Create additional users to test caching modes.
diff --git a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
index fcc2bd5200..5adcd88ac7 100644
--- a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
@@ -28,7 +28,10 @@ class BlockDemoTest extends BrowserTestBase {
*/
public function testBlockDemo() {
// Create administrative user.
- $admin_user = $this->drupalCreateUser(['administer blocks', 'administer themes']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer themes',
+ ]);
$this->drupalLogin($admin_user);
// Confirm we have access to the block demo page for the default theme.
diff --git a/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
index 74ecba2469..71aa4b9fa4 100644
--- a/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -33,7 +33,10 @@ class BlockLanguageTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer blocks', 'administer languages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer languages',
+ ]);
$this->drupalLogin($this->adminUser);
// Add predefined language.
diff --git a/web/core/modules/block/tests/src/Functional/BlockUiTest.php b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
index 7ec5f3b132..e6a56be830 100644
--- a/web/core/modules/block/tests/src/Functional/BlockUiTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -152,9 +152,9 @@ public function testBlockAdminUiPage() {
\Drupal::service('theme_installer')->install(['stable', 'stark']);
$this->drupalGet('admin/structure/block');
$theme_handler = \Drupal::service('theme_handler');
- $this->assertLink($theme_handler->getName('classy'));
- $this->assertLink($theme_handler->getName('stark'));
- $this->assertNoLink($theme_handler->getName('stable'));
+ $this->assertSession()->linkExists($theme_handler->getName('classy'));
+ $this->assertSession()->linkExists($theme_handler->getName('stark'));
+ $this->assertSession()->linkNotExists($theme_handler->getName('stable'));
// Ensure that a hidden theme cannot use the block demo page.
$this->drupalGet('admin/structure/block/list/stable');
@@ -166,7 +166,7 @@ public function testBlockAdminUiPage() {
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
$this->drupalGet('admin/structure/block');
- $this->assertLink($theme_handler->getName('stable'));
+ $this->assertSession()->linkExists($theme_handler->getName('stable'));
$this->drupalGet('admin/structure/block/list/stable');
$this->assertSession()->statusCodeEquals(200);
}
diff --git a/web/core/modules/block/tests/src/Functional/BlockXssTest.php b/web/core/modules/block/tests/src/Functional/BlockXssTest.php
index 72d38e1ee3..cf90835fb1 100644
--- a/web/core/modules/block/tests/src/Functional/BlockXssTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockXssTest.php
@@ -32,7 +32,10 @@ class BlockXssTest extends BrowserTestBase {
* Tests that nothing is escaped other than the blocks explicitly tested.
*/
public function testNoUnexpectedEscaping() {
- $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'access administration pages']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer blocks',
+ 'access administration pages',
+ ]));
$this->drupalGet(Url::fromRoute('block.admin_display'));
$this->clickLink('Place block');
$this->assertNoEscaped('<');
@@ -49,7 +52,10 @@ public function testXssInTitle() {
$this->drupalGet('');
$this->assertNoRaw('<script>alert("XSS label");</script>', 'The block title was properly sanitized when rendered.');
- $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'access administration pages']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer blocks',
+ 'access administration pages',
+ ]));
$default_theme = $this->config('system.theme')->get('default');
$this->drupalGet('admin/structure/block/list/' . $default_theme);
$this->assertNoRaw("<script>alert('XSS subject');</script>", 'The block title was properly sanitized in Block Plugin UI Admin page.');
@@ -61,7 +67,10 @@ public function testXssInTitle() {
public function testXssInCategory() {
$this->container->get('module_installer')->install(['block_test']);
$this->drupalPlaceBlock('test_xss_title');
- $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'access administration pages']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer blocks',
+ 'access administration pages',
+ ]));
$this->drupalGet(Url::fromRoute('block.admin_display'));
$this->clickLink('Place block');
$this->assertNoRaw("<script>alert('XSS category');</script>");
diff --git a/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php b/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
index 5564a50223..9552809f92 100644
--- a/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
+++ b/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
@@ -36,7 +36,10 @@ protected function setUp() {
* Test non-default theme admin.
*/
public function testNonDefaultBlockAdmin() {
- $admin_user = $this->drupalCreateUser(['administer blocks', 'administer themes']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer themes',
+ ]);
$this->drupalLogin($admin_user);
$new_theme = 'bartik';
\Drupal::service('theme_installer')->install([$new_theme]);
diff --git a/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php b/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
index b9125ffc14..f4add7d754 100644
--- a/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
+++ b/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
@@ -65,7 +65,10 @@ protected function setUp($import_test_views = TRUE) {
* Tests default and custom block categories.
*/
public function testBlockCategory() {
- $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer blocks']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer views',
+ 'administer blocks',
+ ]));
// Create a new view in the UI.
$edit = [];
@@ -368,7 +371,11 @@ public function testBlockEmptyRendering() {
* Tests the contextual links on a Views block.
*/
public function testBlockContextualLinks() {
- $this->drupalLogin($this->drupalCreateUser(['administer views', 'access contextual links', 'administer blocks']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer views',
+ 'access contextual links',
+ 'administer blocks',
+ ]));
$block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
$cached_block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
$this->drupalGet('test-page');
diff --git a/web/core/modules/block_content/src/Entity/BlockContentType.php b/web/core/modules/block_content/src/Entity/BlockContentType.php
index 20f9593b82..acaa64039d 100644
--- a/web/core/modules/block_content/src/Entity/BlockContentType.php
+++ b/web/core/modules/block_content/src/Entity/BlockContentType.php
@@ -11,14 +11,13 @@
* @ConfigEntityType(
* id = "block_content_type",
* label = @Translation("Custom block type"),
- * label_collection = @Translation("Custom block types"),
+ * label_collection = @Translation("Custom block library"),
* label_singular = @Translation("custom block type"),
* label_plural = @Translation("custom block types"),
* label_count = @PluralTranslation(
* singular = "@count custom block type",
* plural = "@count custom block types",
* ),
- * label_collection = @Translation("Custom block library"),
* handlers = {
* "form" = {
* "default" = "Drupal\block_content\BlockContentTypeForm",
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
index c598972663..ed9cb5c1cd 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
@@ -31,7 +31,10 @@ class BlockContentListTest extends BlockContentTestBase {
* Tests the custom block listing page.
*/
public function testListing() {
- $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'translate configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer blocks',
+ 'translate configuration',
+ ]));
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
@@ -55,7 +58,7 @@ public function testListing() {
$new_label = 'Albatross';
// Add a new entity using the operations link.
$link_text = t('Add custom block');
- $this->assertLink($link_text);
+ $this->assertSession()->linkExists($link_text);
$this->clickLink($link_text);
$this->assertSession()->statusCodeEquals(200);
$edit = [];
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
index c7ba748847..01f045eedf 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
@@ -34,7 +34,10 @@ class BlockContentListViewsTest extends BlockContentTestBase {
* Tests the custom block listing page.
*/
public function testListing() {
- $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'translate configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer blocks',
+ 'translate configuration',
+ ]));
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
@@ -67,7 +70,7 @@ public function testListing() {
$new_label = 'Albatross';
// Add a new entity using the operations link.
$link_text = t('Add custom block');
- $this->assertLink($link_text);
+ $this->assertSession()->linkExists($link_text);
$this->clickLink($link_text);
$this->assertSession()->statusCodeEquals(200);
$edit = [];
@@ -123,7 +126,7 @@ public function testListing() {
// Confirm that the empty text is displayed.
$this->assertText('There are no custom blocks available.');
- $this->assertLink('custom block');
+ $this->assertSession()->linkExists('custom block');
$block_content = BlockContent::create([
'info' => 'Non-reusable block',
diff --git a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
index b2355aa25d..4f471fbbf2 100644
--- a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
@@ -53,8 +53,24 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
// Create users.
- $this->bookAuthor = $this->drupalCreateUser(['create new books', 'create book content', 'edit own book content', 'add content to books']);
- $this->adminUser = $this->drupalCreateUser(['create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'administer content types', 'administer site configuration']);
+ $this->bookAuthor = $this->drupalCreateUser([
+ 'create new books',
+ 'create book content',
+ 'edit own book content',
+ 'add content to books',
+ ]);
+ $this->adminUser = $this->drupalCreateUser([
+ 'create new books',
+ 'create book content',
+ 'edit any book content',
+ 'delete any book content',
+ 'add content to books',
+ 'administer blocks',
+ 'administer permissions',
+ 'administer book outlines',
+ 'administer content types',
+ 'administer site configuration',
+ ]);
}
/**
diff --git a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
index 2dde866577..02d489fc52 100644
--- a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
@@ -46,7 +46,16 @@ protected function setUp() {
$workflow->save();
// We need a user with additional content moderation permissions.
- $this->bookAuthor = $this->drupalCreateUser(['create new books', 'create book content', 'edit own book content', 'add content to books', 'access printer-friendly version', 'view any unpublished content', 'use editorial transition create_new_draft', 'use editorial transition publish']);
+ $this->bookAuthor = $this->drupalCreateUser([
+ 'create new books',
+ 'create book content',
+ 'edit own book content',
+ 'add content to books',
+ 'access printer-friendly version',
+ 'view any unpublished content',
+ 'use editorial transition create_new_draft',
+ 'use editorial transition publish',
+ ]);
}
/**
diff --git a/web/core/modules/book/tests/src/Functional/BookTest.php b/web/core/modules/book/tests/src/Functional/BookTest.php
index f4aaa6de12..b57773c805 100644
--- a/web/core/modules/book/tests/src/Functional/BookTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookTest.php
@@ -61,10 +61,32 @@ protected function setUp() {
node_access_rebuild();
// Create users.
- $this->bookAuthor = $this->drupalCreateUser(['create new books', 'create book content', 'edit own book content', 'add content to books']);
- $this->webUser = $this->drupalCreateUser(['access printer-friendly version', 'node test view']);
- $this->webUserWithoutNodeAccess = $this->drupalCreateUser(['access printer-friendly version']);
- $this->adminUser = $this->drupalCreateUser(['create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration']);
+ $this->bookAuthor = $this->drupalCreateUser([
+ 'create new books',
+ 'create book content',
+ 'edit own book content',
+ 'add content to books',
+ ]);
+ $this->webUser = $this->drupalCreateUser([
+ 'access printer-friendly version',
+ 'node test view',
+ ]);
+ $this->webUserWithoutNodeAccess = $this->drupalCreateUser([
+ 'access printer-friendly version',
+ ]);
+ $this->adminUser = $this->drupalCreateUser([
+ 'create new books',
+ 'create book content',
+ 'edit any book content',
+ 'delete any book content',
+ 'add content to books',
+ 'administer blocks',
+ 'administer permissions',
+ 'administer book outlines',
+ 'node test view',
+ 'administer content types',
+ 'administer site configuration',
+ ]);
}
/**
@@ -220,7 +242,7 @@ public function testBookExport() {
// Load the book and verify there is no printer-friendly version link.
$this->drupalGet('node/' . $this->book->id());
- $this->assertNoLink(t('Printer-friendly version'), 'Anonymous user is not shown link to printer-friendly version.');
+ $this->assertSession()->linkNotExists(t('Printer-friendly version'), 'Anonymous user is not shown link to printer-friendly version.');
// Try getting the URL directly, and verify it fails.
$this->drupalGet('book/export/html/' . $this->book->id());
@@ -402,13 +424,13 @@ public function testBookOutline() {
// Create new node not yet a book.
$empty_book = $this->drupalCreateNode(['type' => 'book']);
$this->drupalGet('node/' . $empty_book->id() . '/outline');
- $this->assertNoLink(t('Book outline'), 'Book Author is not allowed to outline');
+ $this->assertSession()->linkNotExists(t('Book outline'), 'Book Author is not allowed to outline');
$this->drupalLogin($this->adminUser);
$this->drupalGet('node/' . $empty_book->id() . '/outline');
$this->assertRaw(t('Book outline'));
$this->assertOptionSelected('edit-book-bid', 0, 'Node does not belong to a book');
- $this->assertNoLink(t('Remove from book outline'));
+ $this->assertSession()->linkNotExists(t('Remove from book outline'));
$edit = [];
$edit['book[bid]'] = '1';
@@ -557,7 +579,11 @@ public function testBookNavigationBlockOnUnpublishedBook() {
$this->createBook();
// Create administrator user.
- $administratorUser = $this->drupalCreateUser(['administer blocks', 'administer nodes', 'bypass node access']);
+ $administratorUser = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($administratorUser);
// Enable the block with "Show block only on book pages" mode.
diff --git a/web/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php b/web/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
index b8e7fa04fe..487abe5030 100644
--- a/web/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
+++ b/web/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
@@ -153,7 +153,7 @@ public function testRelationship() {
$this->drupalGet('test-book/' . $nodes[$i]->id());
for ($j = 0; $j < $i; $j++) {
- $this->assertLink($nodes[$j]->label());
+ $this->assertSession()->linkExists($nodes[$j]->label());
}
}
}
diff --git a/web/core/modules/ckeditor/src/CKEditorPluginInterface.php b/web/core/modules/ckeditor/src/CKEditorPluginInterface.php
index a5052dce61..1f3158b58b 100644
--- a/web/core/modules/ckeditor/src/CKEditorPluginInterface.php
+++ b/web/core/modules/ckeditor/src/CKEditorPluginInterface.php
@@ -45,6 +45,7 @@ public function isInternal();
*
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
+ *
* @return array
* An unindexed array of plugin names this plugin requires. Each plugin is
* is identified by its annotated ID.
@@ -59,6 +60,7 @@ public function getDependencies(Editor $editor);
*
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
+ *
* @return array
* An array of libraries suitable for usage in a render API #attached
* property.
@@ -91,6 +93,7 @@ public function getFile();
*
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
+ *
* @return array
* A keyed array, whose keys will end up as keys under CKEDITOR.config.
*/
diff --git a/web/core/modules/ckeditor/src/CKEditorPluginManager.php b/web/core/modules/ckeditor/src/CKEditorPluginManager.php
index 735cfa6678..47fa80b06c 100644
--- a/web/core/modules/ckeditor/src/CKEditorPluginManager.php
+++ b/web/core/modules/ckeditor/src/CKEditorPluginManager.php
@@ -60,6 +60,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
* @param bool $include_internal_plugins
* Defaults to FALSE. When set to TRUE, plugins whose isInternal() method
* returns TRUE will also be included.
+ *
* @return array
* A list of the enabled CKEditor plugins, with the plugin IDs as keys and
* the Drupal root-relative plugin files as values.
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
index dc7595a67d..c839f7b42b 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
@@ -117,6 +117,7 @@ public function validateStylesValue(array $element, FormStateInterface $form_sta
*
* @param string $styles
* The "styles" setting.
+ *
* @return array|false
* An array containing the "stylesSet" configuration, or FALSE when the
* syntax is invalid.
diff --git a/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index f62825af6f..af5a4a6506 100644
--- a/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -403,6 +403,7 @@ public function getLibraries(Editor $editor) {
*
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
+ *
* @return array
* An array containing the "toolbar" configuration.
*/
@@ -426,6 +427,7 @@ public function buildToolbarJSSetting(Editor $editor) {
*
* @param \Drupal\editor\Entity\Editor $editor
* A configured text editor object.
+ *
* @return array
* An array containing the "contentsCss" configuration.
*/
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
index c43280cbcb..1e8f2ae2fe 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
@@ -72,8 +72,16 @@ protected function setUp() {
'name' => 'Article',
]);
- $this->untrustedUser = $this->drupalCreateUser(['create article content', 'edit any article content']);
- $this->normalUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'use text format filtered_html', 'use text format full_html']);
+ $this->untrustedUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit any article content',
+ ]);
+ $this->normalUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit any article content',
+ 'use text format filtered_html',
+ 'use text format full_html',
+ ]);
}
/**
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
index 27fabffbf7..30207fbf63 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
@@ -57,7 +57,10 @@ protected function setUp() {
]);
$editor->save();
- $this->adminUser = $this->drupalCreateUser(['administer filters', 'translate configuration']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer filters',
+ 'translate configuration',
+ ]);
ConfigurableLanguage::createFromLangcode('de')->save();
}
diff --git a/web/core/modules/comment/src/CommentStorageInterface.php b/web/core/modules/comment/src/CommentStorageInterface.php
index accc9de420..592b1ea921 100644
--- a/web/core/modules/comment/src/CommentStorageInterface.php
+++ b/web/core/modules/comment/src/CommentStorageInterface.php
@@ -75,6 +75,7 @@ public function getDisplayOrdinal(CommentInterface $comment, $comment_mode, $div
*
* @param \Drupal\comment\CommentInterface[] $comments
* An array of comment entities keyed by their ids.
+ *
* @return array
* The entity ids of the passed comment entities' children as an array.
*/
diff --git a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
index ac30efa0f5..5f9bbd0cae 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
@@ -176,7 +176,7 @@ public function testAnonymous() {
// "Login or register to post comments" type link may be shown.
$this->drupalGet('node/' . $this->node->id());
$this->assertSession()->responseNotMatches('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
- $this->assertNoLink('Add new comment', 'Link to add comment was found.');
+ $this->assertSession()->linkNotExists('Add new comment', 'Link to add comment was found.');
// Attempt to view node-comment form while disallowed.
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
@@ -189,8 +189,8 @@ public function testAnonymous() {
]);
$this->drupalGet('node/' . $this->node->id());
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
- $this->assertLink('Log in', 1, 'Link to login was found.');
- $this->assertLink('register', 1, 'Link to register was found.');
+ $this->assertSession()->linkExists('Log in', 1, 'Link to login was found.');
+ $this->assertSession()->linkExists('register', 1, 'Link to register was found.');
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
'access comments' => FALSE,
diff --git a/web/core/modules/comment/tests/src/Functional/CommentBookTest.php b/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
index b461f7098a..76230d1f3c 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
@@ -60,7 +60,11 @@ public function testBookCommentPrint() {
]);
$comment->save();
- $commenting_user = $this->drupalCreateUser(['access printer-friendly version', 'access comments', 'post comments']);
+ $commenting_user = $this->drupalCreateUser([
+ 'access printer-friendly version',
+ 'access comments',
+ 'post comments',
+ ]);
$this->drupalLogin($commenting_user);
$this->drupalGet('node/' . $book_node->id());
diff --git a/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php b/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
index 46fe42d983..7a0298ea42 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
@@ -191,7 +191,10 @@ public function testCommentFieldCreate() {
*/
public function testCommentInstallAfterContentModule() {
// Create a user to do module administration.
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ ]);
$this->drupalLogin($this->adminUser);
// Drop default comment field added in CommentTestBase::setup().
@@ -233,7 +236,12 @@ public function testCommentInstallAfterContentModule() {
// Try to post a comment on each node. A failure will be triggered if the
// comment body is missing on one of these forms, due to postComment()
// asserting that the body is actually posted correctly.
- $this->webUser = $this->drupalCreateUser(['access content', 'access comments', 'post comments', 'skip comment approval']);
+ $this->webUser = $this->drupalCreateUser([
+ 'access content',
+ 'access comments',
+ 'post comments',
+ 'skip comment approval',
+ ]);
$this->drupalLogin($this->webUser);
$this->postComment($book_node, $this->randomMachineName(), $this->randomMachineName());
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
index cb2c796683..7970718d1c 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
@@ -45,7 +45,17 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
// Create and log in user.
- $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'administer content types',
+ 'administer comments',
+ 'create article content',
+ 'access comments',
+ 'post comments',
+ 'skip comment approval',
+ ]);
$this->drupalLogin($admin_user);
// Add language.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php b/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
index 7c4349b1bd..3abc1f87f1 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
@@ -34,7 +34,7 @@ public function testCommentLinksAlter() {
$this->drupalGet('node/' . $this->node->id());
- $this->assertLink(t('Report'));
+ $this->assertSession()->linkExists(t('Report'));
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLinksTest.php b/web/core/modules/comment/tests/src/Functional/CommentLinksTest.php
index 34a815c028..0d501c7bb2 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLinksTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLinksTest.php
@@ -101,9 +101,9 @@ public function testCommentLinks() {
// In teaser view, a link containing the comment count is always
// expected.
if ($path == 'node') {
- $this->assertLink(t('1 comment'));
+ $this->assertSession()->linkExists(t('1 comment'));
}
- $this->assertLink('Add new comment');
+ $this->assertSession()->linkExists('Add new comment');
}
$display_repository = $this->container->get('entity_display.repository');
@@ -133,13 +133,13 @@ public function testCommentLinks() {
->removeComponent('links')
->save();
$this->drupalGet($this->node->toUrl());
- $this->assertNoLink('1 comment');
- $this->assertNoLink('Add new comment');
+ $this->assertSession()->linkNotExists('1 comment');
+ $this->assertSession()->linkNotExists('Add new comment');
// Visit the full node, make sure there are links for the comment.
$this->drupalGet('node/' . $this->node->id());
$this->assertText($comment->getSubject());
- $this->assertLink('Reply');
+ $this->assertSession()->linkExists('Reply');
// Make sure we can hide comment links.
$display_repository->getViewDisplay('comment', 'comment')
@@ -147,7 +147,7 @@ public function testCommentLinks() {
->save();
$this->drupalGet('node/' . $this->node->id());
$this->assertText($comment->getSubject());
- $this->assertNoLink('Reply');
+ $this->assertSession()->linkNotExists('Reply');
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php b/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
index 9f7b74b93d..ba0a16bd5a 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
@@ -60,8 +60,8 @@ public function testCommentNewCommentsIndicator() {
// node.
$this->drupalLogin($this->adminUser);
$this->drupalGet('node');
- $this->assertNoLink(t('@count comments', ['@count' => 0]));
- $this->assertLink(t('Read more'));
+ $this->assertSession()->linkNotExists(t('@count comments', ['@count' => 0]));
+ $this->assertSession()->linkExists(t('Read more'));
// Verify the data-history-node-last-comment-timestamp attribute, which is
// used by the drupal.node-new-comments-link library to determine whether
// a "x new comments" link might be necessary or not. We do this in
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index d7676cdd0e..295fa377b3 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -355,7 +355,7 @@ public function testCommentFunctionality() {
// Attempt to view comments while disallowed.
$this->drupalGet('entity-test/' . $this->entity->id());
$this->assertSession()->responseNotMatches('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
- $this->assertNoLink('Add new comment', 'Link to add comment was found.');
+ $this->assertSession()->linkNotExists('Add new comment', 'Link to add comment was found.');
// Attempt to view test entity comment form while disallowed.
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
@@ -371,8 +371,8 @@ public function testCommentFunctionality() {
]);
$this->drupalGet('entity_test/' . $this->entity->id());
$this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
- $this->assertLink('Log in', 0, 'Link to login was found.');
- $this->assertLink('register', 0, 'Link to register was found.');
+ $this->assertSession()->linkExists('Log in', 0, 'Link to login was found.');
+ $this->assertSession()->linkExists('register', 0, 'Link to register was found.');
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
diff --git a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index 4f029a7f93..06f8a7bd62 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -128,7 +128,12 @@ public function testCommentPreviewDuplicateSubmission() {
* Tests comment edit, preview, and save.
*/
public function testCommentEditPreviewSave() {
- $web_user = $this->drupalCreateUser(['access comments', 'post comments', 'skip comment approval', 'edit own comments']);
+ $web_user = $this->drupalCreateUser([
+ 'access comments',
+ 'post comments',
+ 'skip comment approval',
+ 'edit own comments',
+ ]);
$this->drupalLogin($this->adminUser);
$this->setCommentPreview(DRUPAL_OPTIONAL);
$this->setCommentForm(TRUE);
diff --git a/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
index cce78346b7..f5ddd141e1 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
@@ -35,7 +35,9 @@ class ConfigDependencyWebTest extends BrowserTestBase {
* @see \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait
*/
public function testConfigDependencyDeleteFormTrait() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
/** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
$storage = $this->container->get('entity_type.manager')->getStorage('config_test');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
index 628fb4bf82..ddb839ed21 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
@@ -25,7 +25,9 @@ class ConfigEntityFormOverrideTest extends BrowserTestBase {
* Tests that overrides do not affect forms or listing screens.
*/
public function testFormsWithOverrides() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$original_label = 'Default';
$overridden_label = 'Overridden label';
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
index 882190a9c0..496d67c4f3 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
@@ -41,7 +41,10 @@ protected function setUp() {
*/
public function testListUI() {
// Log in as an administrative user to access the full menu trail.
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer site configuration',
+ ]));
// Get the list page.
$this->drupalGet('admin/structure/config_test');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
index 786c6296a2..cd12fbde7c 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
@@ -156,7 +156,10 @@ public function testList() {
*/
public function testListUI() {
// Log in as an administrative user to access the full menu trail.
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer site configuration',
+ ]));
// Get the list callback page.
$this->drupalGet('admin/structure/config_test');
@@ -190,7 +193,7 @@ public function testListUI() {
$this->assertNotEmpty($elements[2]->find('xpath', '//ul'), 'Operations list found.');
// Add a new entity using the operations link.
- $this->assertLink('Add test configuration');
+ $this->assertSession()->linkExists('Add test configuration');
$this->clickLink('Add test configuration');
$this->assertSession()->statusCodeEquals(200);
$edit = [
@@ -254,7 +257,9 @@ public function testListUI() {
* Test paging.
*/
public function testPager() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$storage = \Drupal::service('entity_type.manager')->getListBuilder('config_test')->getStorage();
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
index 4b062bcd22..ef994d76fb 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
@@ -27,7 +27,9 @@ class ConfigEntityStatusUITest extends BrowserTestBase {
* Tests status operations.
*/
public function testCRUD() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$id = strtolower($this->randomMachineName());
$edit = [
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
index ef6b327539..cff042f7a8 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -236,7 +236,9 @@ public function testCRUD() {
* Tests CRUD operations through the UI.
*/
public function testCRUDUI() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$id = strtolower($this->randomMachineName());
$label1 = $this->randomMachineName();
diff --git a/web/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php b/web/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
index 14edd88386..75ab4a7a8c 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
@@ -21,7 +21,10 @@ class ConfigFormOverrideTest extends BrowserTestBase {
* Tests that overrides do not affect forms.
*/
public function testFormsWithOverrides() {
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer site configuration',
+ ]));
$overridden_name = 'Site name global conf override';
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
index 3cc8fda790..745a3f5482 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
@@ -34,7 +34,11 @@ class ConfigInstallWebTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer modules', 'administer themes', 'administer site configuration']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer themes',
+ 'administer site configuration',
+ ]);
// Ensure the global variable being asserted by this test does not exist;
// a previous test executed in this request/process might have set it.
diff --git a/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
index b35821cb37..4399f58107 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
@@ -40,7 +40,10 @@ protected function setUp() {
* Tests translating the site name.
*/
public function testSiteNameTranslation() {
- $adminUser = $this->drupalCreateUser(['administer site configuration', 'administer languages']);
+ $adminUser = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer languages',
+ ]);
$this->drupalLogin($adminUser);
// Add a custom language.
diff --git a/web/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php b/web/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php
index 7ea62e2e90..5337ab909b 100644
--- a/web/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php
+++ b/web/core/modules/config/tests/src/FunctionalJavascript/ConfigEntityTest.php
@@ -25,7 +25,9 @@ class ConfigEntityTest extends WebDriverTestBase {
* Tests ajax operations through the UI on 'Add' page.
*/
public function testAjaxOnAddPage() {
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$page = $this->getSession()->getPage();
$assert_session = $this->assertSession();
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
index 4594e06e80..a4d174a8c7 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
@@ -39,6 +39,7 @@ protected function setUpLanguage() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
index 3519a5c7b3..99da0efc6f 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
@@ -126,7 +126,7 @@ public function testMapperListPage() {
$this->assertRaw('<th>' . t('Language') . '</th>');
$this->drupalGet($base_url);
- $this->assertLink(t('Translate @title', ['@title' => $entity_type->getSingularLabel()]));
+ $this->assertSession()->linkExists(t('Translate @title', ['@title' => $entity_type->getSingularLabel()]));
}
}
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
index 343b348110..bc540b0067 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
@@ -299,7 +299,7 @@ public function testSourceValueDuplicateSave() {
// While translator can access the translation page, the edit link is not
// present due to lack of permissions.
$this->drupalGet($translation_base_url);
- $this->assertNoLink(t('Edit'));
+ $this->assertSession()->linkNotExists(t('Edit'));
// Check 'Add' link for French.
$this->assertLinkByHref("$translation_base_url/fr/add");
@@ -331,7 +331,7 @@ public function testContactConfigEntityTranslation() {
// Make sure translate tab is present.
$this->drupalGet('admin/structure/contact/manage/feedback');
- $this->assertLink(t('Translate @type', ['@type' => 'contact form']));
+ $this->assertSession()->linkExists(t('Translate @type', ['@type' => 'contact form']));
// Visit the form to confirm the changes.
$this->drupalGet('contact/feedback');
@@ -339,7 +339,7 @@ public function testContactConfigEntityTranslation() {
foreach ($this->langcodes as $langcode) {
$this->drupalGet($translation_base_url);
- $this->assertLink(t('Translate @type', ['@type' => 'contact form']));
+ $this->assertSession()->linkExists(t('Translate @type', ['@type' => 'contact form']));
// 'Add' link should be present for $langcode translation.
$translation_page_url = "$translation_base_url/$langcode/add";
@@ -435,7 +435,7 @@ public function testContactConfigEntityTranslation() {
// While translator can access the translation page, the edit link is not
// present due to lack of permissions.
$this->drupalGet($translation_base_url);
- $this->assertNoLink(t('Edit'));
+ $this->assertSession()->linkNotExists(t('Edit'));
// Check 'Add' link for French.
$this->assertLinkByHref("$translation_base_url/fr/add");
@@ -516,10 +516,10 @@ public function testAccountSettingsConfigurationTranslation() {
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/config/people/accounts');
- $this->assertLink(t('Translate @type', ['@type' => 'account settings']));
+ $this->assertSession()->linkExists(t('Translate @type', ['@type' => 'account settings']));
$this->drupalGet('admin/config/people/accounts/translate');
- $this->assertLink(t('Translate @type', ['@type' => 'account settings']));
+ $this->assertSession()->linkExists(t('Translate @type', ['@type' => 'account settings']));
$this->assertLinkByHref('admin/config/people/accounts/translate/fr/add');
// Update account settings fields for French.
diff --git a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index a6a5e20163..0029b2eb39 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -57,11 +57,19 @@ protected function setUp() {
parent::setUp();
// Create an admin user.
- $this->adminUser = $this->drupalCreateUser(['administer contact forms', 'administer users', 'administer account settings', 'access site reports']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer contact forms',
+ 'administer users',
+ 'administer account settings',
+ 'access site reports',
+ ]);
// Create some normal users with their contact forms enabled by default.
$this->config('contact.settings')->set('user_default_enabled', TRUE)->save();
- $this->webUser = $this->drupalCreateUser(['access user profiles', 'access user contact forms']);
+ $this->webUser = $this->drupalCreateUser([
+ 'access user profiles',
+ 'access user contact forms',
+ ]);
$this->contactUser = $this->drupalCreateUser();
}
diff --git a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index ac8bf0ebfb..20b924c5ac 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -59,7 +59,9 @@ protected function setUp() {
*/
public function testSiteWideContact() {
// Tests name and email fields for authenticated and anonymous users.
- $this->drupalLogin($this->drupalCreateUser(['access site-wide contact form']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access site-wide contact form',
+ ]));
$this->drupalGet('contact');
// Ensure that there is no textfield for name.
diff --git a/web/core/modules/content_moderation/src/EntityTypeInfo.php b/web/core/modules/content_moderation/src/EntityTypeInfo.php
index 363ecaac91..00ddda2dfc 100644
--- a/web/core/modules/content_moderation/src/EntityTypeInfo.php
+++ b/web/core/modules/content_moderation/src/EntityTypeInfo.php
@@ -321,37 +321,36 @@ public function entityPrepareForm(EntityInterface $entity, $operation, FormState
public function formAlter(array &$form, FormStateInterface $form_state, $form_id) {
$form_object = $form_state->getFormObject();
if ($form_object instanceof BundleEntityFormBase) {
- $config_entity_type = $form_object->getEntity()->getEntityType();
- $bundle_of = $config_entity_type->getBundleOf();
+ $config_entity = $form_object->getEntity();
+ $bundle_of = $config_entity->getEntityType()->getBundleOf();
if ($bundle_of
&& ($bundle_of_entity_type = $this->entityTypeManager->getDefinition($bundle_of))
- && $this->moderationInfo->canModerateEntitiesOfEntityType($bundle_of_entity_type)) {
- $this->entityTypeManager->getHandler($config_entity_type->getBundleOf(), 'moderation')->enforceRevisionsBundleFormAlter($form, $form_state, $form_id);
+ && $this->moderationInfo->shouldModerateEntitiesOfBundle($bundle_of_entity_type, $config_entity->id())) {
+ $this->entityTypeManager->getHandler($bundle_of, 'moderation')->enforceRevisionsBundleFormAlter($form, $form_state, $form_id);
}
}
elseif ($this->isModeratedEntityEditForm($form_object)) {
/** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
$entity = $form_object->getEntity();
- if ($this->moderationInfo->isModeratedEntity($entity)) {
- $this->entityTypeManager
- ->getHandler($entity->getEntityTypeId(), 'moderation')
- ->enforceRevisionsEntityFormAlter($form, $form_state, $form_id);
-
- // Submit handler to redirect to the latest version, if available.
- $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect'];
-
- // Move the 'moderation_state' field widget to the footer region, if
- // available.
- if (isset($form['footer']) && in_array($form_object->getOperation(), ['edit', 'default'], TRUE)) {
- $form['moderation_state']['#group'] = 'footer';
- }
- // If the publishing status exists in the meta region, replace it with
- // the current state instead.
- if (isset($form['meta']['published'])) {
- $form['meta']['published']['#markup'] = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($entity->moderation_state->value)->label();
- }
+ $this->entityTypeManager
+ ->getHandler($entity->getEntityTypeId(), 'moderation')
+ ->enforceRevisionsEntityFormAlter($form, $form_state, $form_id);
+
+ // Submit handler to redirect to the latest version, if available.
+ $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect'];
+
+ // Move the 'moderation_state' field widget to the footer region, if
+ // available.
+ if (isset($form['footer']) && in_array($form_object->getOperation(), ['edit', 'default'], TRUE)) {
+ $form['moderation_state']['#group'] = 'footer';
+ }
+
+ // If the publishing status exists in the meta region, replace it with
+ // the current state instead.
+ if (isset($form['meta']['published'])) {
+ $form['meta']['published']['#markup'] = $this->moderationInfo->getWorkflowForEntity($entity)->getTypePlugin()->getState($entity->moderation_state->value)->label();
}
}
}
diff --git a/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php b/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
index 679fca92db..7e717881cf 100644
--- a/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
+++ b/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
@@ -81,6 +81,7 @@ protected function loadContentModerationStateRevision(ContentEntityInterface $en
// being reverted.
->condition('content_entity_revision_id', $entity->isNewRevision() ? $entity->getLoadedRevisionId() : $entity->getRevisionId())
->condition('workflow', $moderation_info->getWorkflowForEntity($entity)->id())
+ ->condition('langcode', $entity->language()->getId())
->allRevisions()
->sort('revision_id', 'DESC')
->execute();
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModeratedContentViewTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModeratedContentViewTest.php
index 0faf532f3c..d5906e0de9 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModeratedContentViewTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModeratedContentViewTest.php
@@ -54,7 +54,12 @@ public function setUp() {
$workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
$workflow->save();
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view any unpublished content', 'administer nodes', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'view any unpublished content',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
}
/**
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index 8999dae122..5c4b70a4e2 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -67,9 +67,18 @@ public function testEnablingOnExistingContent() {
], t('Save'));
$this->assertText('Not moderated Test has been created.');
+ // Check that the 'Create new revision' is not disabled.
+ $this->drupalGet('/admin/structure/types/manage/not_moderated');
+ $this->assertNull($this->assertSession()->fieldExists('options[revision]')->getAttribute('disabled'));
+
// Now enable moderation state.
$this->enableModerationThroughUi('not_moderated');
+ // Check that the 'Create new revision' checkbox is checked and disabled.
+ $this->drupalGet('/admin/structure/types/manage/not_moderated');
+ $this->assertSession()->checkboxChecked('options[revision]');
+ $this->assertSession()->fieldDisabled('options[revision]');
+
// And make sure it works.
$nodes = \Drupal::entityTypeManager()->getStorage('node')
->loadByProperties(['title' => 'Test']);
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
index a2600abd78..530acff338 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
@@ -112,10 +112,6 @@ protected function createContentTypeFromUi($content_type_name, $content_type_id,
$this->drupalGet('admin/structure/types');
$this->clickLink('Add content type');
- // Check that the 'Create new revision' checkbox is checked and disabled.
- $this->assertSession()->checkboxChecked('options[revision]');
- $this->assertSession()->fieldDisabled('options[revision]');
-
$edit = [
'name' => $content_type_name,
'type' => $content_type_id,
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php b/web/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
index 9598e1bd08..7aa509f2fe 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
@@ -66,7 +66,10 @@ protected function setUp($import_test_views = TRUE) {
$new_workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example_c');
$new_workflow->save();
- $this->drupalLogin($this->drupalCreateUser(['administer workflows', 'administer views']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer workflows',
+ 'administer views',
+ ]));
$this->container->get('module_installer')->install(['content_moderation_test_views']);
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
index ee03797de2..6479afd700 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
@@ -401,4 +401,33 @@ public function testWithExistingUnmoderatedContent() {
$this->assertEquals('published', $translation->moderation_state->value);
}
+ /**
+ * Tests field item list translation support with unmoderated content.
+ */
+ public function testTranslationWithExistingUnmoderatedContent() {
+ $node = Node::create([
+ 'title' => 'Published en',
+ 'langcode' => 'en',
+ 'type' => 'unmoderated',
+ ]);
+ $node->setPublished();
+ $node->save();
+
+ $workflow = Workflow::load('editorial');
+ $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'unmoderated');
+ $workflow->save();
+
+ $translation = $node->addTranslation('de');
+ $translation->moderation_state = 'draft';
+ $translation->save();
+
+ $node_storage = $this->container->get('entity_type.manager')->getStorage('node');
+ $node = $node_storage->loadRevision($node_storage->getLatestRevisionId($node->id()));
+
+ $this->assertEquals('published', $node->moderation_state->value);
+ $this->assertEquals('draft', $translation->moderation_state->value);
+ $this->assertTrue($node->isPublished());
+ $this->assertFalse($translation->isPublished());
+ }
+
}
diff --git a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
index 5d48cc0533..254a4057ad 100644
--- a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -99,6 +99,7 @@ public function prepareTranslation(ContentEntityInterface $entity, LanguageInter
* The route match.
* @param string $entity_type_id
* (optional) The entity type ID.
+ *
* @return array
* Array of page elements to render.
*/
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
index d9c0ab2306..76bada776e 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
@@ -26,7 +26,12 @@ class ContentTranslationEntityBundleUITest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content translation', 'administer content types']);
+ $user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer languages',
+ 'administer content translation',
+ 'administer content types',
+ ]);
$this->drupalLogin($user);
}
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
index 347d4c9ec9..60e704ef49 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
@@ -64,7 +64,12 @@ protected function setUp() {
\Drupal::service('router.builder')->rebuild();
$this->baseUser1 = $this->drupalCreateUser(['access content overview']);
- $this->baseUser2 = $this->drupalCreateUser(['access content overview', 'create content translations', 'update content translations', 'delete content translations']);
+ $this->baseUser2 = $this->drupalCreateUser([
+ 'access content overview',
+ 'create content translations',
+ 'update content translations',
+ 'delete content translations',
+ ]);
}
/**
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
index 2f6455a9eb..4c99f1b75a 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
@@ -49,7 +49,17 @@ protected function setUp() {
$this->addDefaultCommentField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
$this->addDefaultCommentField('node', 'page', 'comment_page');
- $admin_user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types', 'administer account settings']);
+ $admin_user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer languages',
+ 'administer content translation',
+ 'administer content types',
+ 'administer node fields',
+ 'administer comment fields',
+ 'administer comments',
+ 'administer comment types',
+ 'administer account settings',
+ ]);
$this->drupalLogin($admin_user);
}
@@ -59,7 +69,7 @@ protected function setUp() {
public function testSettingsUI() {
// Check for the content_translation_menu_links_discovered_alter() changes.
$this->drupalGet('admin/config');
- $this->assertLink('Content language and translation');
+ $this->assertSession()->linkExists('Content language and translation');
$this->assertText('Configure language and translation support for content.');
// Test that the translation settings are ignored if the bundle is marked
// translatable but the entity type is not.
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index 168b6a59e1..05655f04aa 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -125,7 +125,11 @@ public function testWorkflows() {
$ops = ['create' => t('Add'), 'update' => t('Edit'), 'delete' => t('Delete')];
$translations_url = $this->entity->toUrl('drupal:content-translation-overview');
foreach ($ops as $current_op => $item) {
- $user = $this->drupalCreateUser([$this->getTranslatePermission(), "$current_op content translations", 'view test entity']);
+ $user = $this->drupalCreateUser([
+ $this->getTranslatePermission(),
+ "$current_op content translations",
+ 'view test entity',
+ ]);
$this->drupalLogin($user);
$this->drupalGet($translations_url);
@@ -138,10 +142,10 @@ public function testWorkflows() {
foreach ($ops as $op => $label) {
if ($op != $current_op) {
- $this->assertNoLink($label, new FormattableMarkup('No %op link found.', ['%op' => $label]));
+ $this->assertSession()->linkNotExists($label, new FormattableMarkup('No %op link found.', ['%op' => $label]));
}
else {
- $this->assertLink($label, 0, new FormattableMarkup('%op link found.', ['%op' => $label]));
+ $this->assertSession()->linkExists($label, 0, new FormattableMarkup('%op link found.', ['%op' => $label]));
}
}
}
diff --git a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index a9e2af5a4b..10b61e5ca8 100644
--- a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
+++ b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -66,8 +66,15 @@ protected function setUp() {
ConfigurableLanguage::createFromLangcode('it')->save();
$this->rebuildContainer();
- $this->editorUser = $this->drupalCreateUser(['access content', 'access contextual links', 'edit any article content']);
- $this->authenticatedUser = $this->drupalCreateUser(['access content', 'access contextual links']);
+ $this->editorUser = $this->drupalCreateUser([
+ 'access content',
+ 'access contextual links',
+ 'edit any article content',
+ ]);
+ $this->authenticatedUser = $this->drupalCreateUser([
+ 'access content',
+ 'access contextual links',
+ ]);
$this->anonymousUser = $this->drupalCreateUser(['access content']);
}
diff --git a/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index 2c5ed0b3db..b0dc9ee1a2 100644
--- a/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -460,23 +460,23 @@ public function testDatelistWidget() {
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-year\"]", NULL, 'Year element found.');
$this->assertOptionSelected("edit-$field_name-0-value-year", '', 'No year selected.');
- $this->assertOptionByText("edit-$field_name-0-value-year", t('Year'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-year", t('Year'));
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-month\"]", NULL, 'Month element found.');
$this->assertOptionSelected("edit-$field_name-0-value-month", '', 'No month selected.');
- $this->assertOptionByText("edit-$field_name-0-value-month", t('Month'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-month", t('Month'));
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-day\"]", NULL, 'Day element found.');
$this->assertOptionSelected("edit-$field_name-0-value-day", '', 'No day selected.');
- $this->assertOptionByText("edit-$field_name-0-value-day", t('Day'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-day", t('Day'));
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element found.');
$this->assertOptionSelected("edit-$field_name-0-value-hour", '', 'No hour selected.');
- $this->assertOptionByText("edit-$field_name-0-value-hour", t('Hour'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-hour", t('Hour'));
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-minute\"]", NULL, 'Minute element found.');
$this->assertOptionSelected("edit-$field_name-0-value-minute", '', 'No minute selected.');
- $this->assertOptionByText("edit-$field_name-0-value-minute", t('Minute'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-minute", t('Minute'));
$this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-second\"]", NULL, 'Second element not found.');
$this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-ampm\"]", NULL, 'AMPM element found.');
$this->assertOptionSelected("edit-$field_name-0-value-ampm", '', 'No ampm selected.');
- $this->assertOptionByText("edit-$field_name-0-value-ampm", t('AM/PM'));
+ $this->assertSession()->optionExists("edit-$field_name-0-value-ampm", t('AM/PM'));
// Submit a valid date and ensure it is accepted.
$date_value = ['year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 5, 'minute' => 15];
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
index fa54e14f5b..e83ef261e0 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -64,7 +64,12 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
// Create users with specific permissions.
- $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access administration pages', 'access site reports', 'administer users']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'access administration pages',
+ 'access site reports',
+ 'administer users',
+ ]);
$this->webUser = $this->drupalCreateUser([]);
}
@@ -228,7 +233,7 @@ public function testLogEventPageWithMissingInfo() {
// Verify location is available as plain text.
$this->assertEquals($request_uri, $this->cssSelect('table.dblog-event > tbody > tr:nth-child(4) > td')[0]->getHtml());
- $this->assertNoLink($request_uri);
+ $this->assertSession()->linkNotExists($request_uri);
}
/**
@@ -782,7 +787,7 @@ protected function getSeverityConstant($class) {
*/
protected function assertLogMessage($log_message, $message) {
$message_text = Unicode::truncate(Html::decodeEntities(strip_tags($log_message)), 56, TRUE, TRUE);
- $this->assertLink($message_text, 0, $message);
+ $this->assertSession()->linkExists($message_text, 0, $message);
}
/**
diff --git a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index 795d0daeb7..99454969d3 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -105,9 +105,23 @@ protected function setUp() {
->save();
// Create 3 users, each with access to different text formats.
- $this->untrustedUser = $this->drupalCreateUser(['create article content', 'edit any article content']);
- $this->normalUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'use text format filtered_html']);
- $this->privilegedUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'create page content', 'edit any page content', 'use text format filtered_html', 'use text format full_html']);
+ $this->untrustedUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit any article content',
+ ]);
+ $this->normalUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit any article content',
+ 'use text format filtered_html',
+ ]);
+ $this->privilegedUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit any article content',
+ 'create page content',
+ 'edit any page content',
+ 'use text format filtered_html',
+ 'use text format full_html',
+ ]);
}
/**
diff --git a/web/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php b/web/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
index b7a88d809c..f917b95e62 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
@@ -66,7 +66,10 @@ protected function setUp() {
])->save();
// Create admin user.
- $this->adminUser = $this->drupalCreateUser(['administer filters', 'use text format basic_html']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer filters',
+ 'use text format basic_html',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/field/field.api.php b/web/core/modules/field/field.api.php
index 36e5fcefe9..557ff58057 100644
--- a/web/core/modules/field/field.api.php
+++ b/web/core/modules/field/field.api.php
@@ -17,8 +17,8 @@
*
* In the Field API, each field has a type, which determines what kind of data
* (integer, string, date, etc.) the field can hold, which settings it provides,
- * and so on. The data type(s) accepted by a field are defined in
- * hook_field_schema().
+ * and so on. The data type(s) accepted by a field are defined in the class
+ * implementing \Drupal\Core\Field\FieldItemInterface::schema() method.
*
* Field types are plugins annotated with class
* \Drupal\Core\Field\Annotation\FieldType, and implement plugin interface
diff --git a/web/core/modules/field/src/Entity/FieldStorageConfig.php b/web/core/modules/field/src/Entity/FieldStorageConfig.php
index fcfa7caf20..1209fffb88 100644
--- a/web/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/web/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -175,12 +175,14 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
* The custom storage indexes for the field data storage.
*
* This set of indexes is merged with the "default" indexes specified by the
- * field type in hook_field_schema() to determine the actual set of indexes
- * that get created.
+ * field type in the class implementing
+ * \Drupal\Core\Field\FieldItemInterface::schema() method to determine the
+ * actual set of indexes that get created.
*
* The indexes are defined using the same definition format as Schema API
* index specifications. Only columns that are part of the field schema, as
- * defined by the field type in hook_field_schema(), are allowed.
+ * defined by the field type in the class implementing
+ * \Drupal\Core\Field\FieldItemInterface::schema() method, are allowed.
*
* Some storage backends might not support indexes, and discard that
* information.
diff --git a/web/core/modules/field/src/Tests/FieldTestBase.php b/web/core/modules/field/src/Tests/FieldTestBase.php
index ebd679c9e0..cf487d49df 100644
--- a/web/core/modules/field/src/Tests/FieldTestBase.php
+++ b/web/core/modules/field/src/Tests/FieldTestBase.php
@@ -24,6 +24,7 @@ abstract class FieldTestBase extends WebTestBase {
*
* @param $cardinality
* Number of values to generate.
+ *
* @return
* An array of random values, in the format expected for field values.
*/
diff --git a/web/core/modules/field/tests/modules/field_test/field_test.module b/web/core/modules/field/tests/modules/field_test/field_test.module
index 585fa35c2f..7804a7ab4d 100644
--- a/web/core/modules/field/tests/modules/field_test/field_test.module
+++ b/web/core/modules/field/tests/modules/field_test/field_test.module
@@ -58,6 +58,7 @@
* The key under which to store to $value, or NULL as described above.
* @param $value
* A value to store for $key.
+ *
* @return
* An array mapping each $key to an array of each $value passed in
* for that key.
diff --git a/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php b/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
index 85ed22c873..614ca02b8e 100644
--- a/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
@@ -50,7 +50,14 @@ protected function setUp() {
$type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
$this->bundle = $type->id();
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node display', 'bypass node access', 'administer nodes']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node display',
+ 'bypass node access',
+ 'administer nodes',
+ ]);
$this->drupalLogin($admin_user);
$this->fieldName = mb_strtolower($this->randomMachineName(8));
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index fe09077b90..086e245226 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -192,7 +192,7 @@ public function testFieldAdminHandler() {
'field_test_entity_ref_field[0][target_id]' => $node1->getTitle() . ' (' . $node1->id() . ')',
];
$this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
- $this->assertLink($node1->getTitle());
+ $this->assertSession()->linkExists($node1->getTitle());
// Tests adding default values to autocomplete widgets.
Vocabulary::create(['vid' => 'tags', 'name' => 'tags'])->save();
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
index 831775380d..2147042897 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
@@ -92,7 +92,10 @@ protected function setUp() {
])
->save();
- $account = $this->drupalCreateUser(['access content', "create $this->referencingType content"]);
+ $account = $this->drupalCreateUser([
+ 'access content',
+ "create $this->referencingType content",
+ ]);
$this->drupalLogin($account);
}
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
index f4329f4797..9be563772d 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -44,7 +44,13 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'referenced_content']);
// Create admin user.
- $this->adminUser = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
index 79ba27170b..5e0c791201 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
@@ -147,7 +147,9 @@ protected function setUp() {
$this->setUpEntityReferenceField();
$this->createContent();
- $this->webUser = $this->drupalCreateUser(['edit any ' . $this->referrerType->id() . ' content']);
+ $this->webUser = $this->drupalCreateUser([
+ 'edit any ' . $this->referrerType->id() . ' content',
+ ]);
}
/**
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
index d2012e16e1..92d69045cb 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
@@ -121,7 +121,10 @@ protected function setUp() {
* Tests that the autocomplete input element does not cause ajax fatal.
*/
public function testFileUpload() {
- $user1 = $this->drupalCreateUser(['access content', "create $this->referencingType content"]);
+ $user1 = $this->drupalCreateUser([
+ 'access content',
+ "create $this->referencingType content",
+ ]);
$this->drupalLogin($user1);
$test_file = current($this->getTestFiles('text'));
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
index cc13122746..36d9358d81 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
@@ -59,7 +59,11 @@ protected function setUp() {
parent::setUp();
// Create a test user.
- $web_user = $this->drupalCreateUser(['administer entity_test content', 'administer entity_test fields', 'view test entity']);
+ $web_user = $this->drupalCreateUser([
+ 'administer entity_test content',
+ 'administer entity_test fields',
+ 'view test entity',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/field/tests/src/Functional/FieldHelpTest.php b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
index d0c2bb777f..54d9d72f74 100644
--- a/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -35,7 +35,10 @@ protected function setUp() {
parent::setUp();
// Create the admin user.
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'view the administration theme',
+ ]);
}
/**
@@ -55,10 +58,10 @@ public function testFieldHelp() {
\Drupal::service('plugin.manager.field.field_type')->clearCachedDefinitions();
$this->drupalGet('admin/help/field');
- $this->assertLink('Options', 0, 'Options module is listed on the Field help page.');
+ $this->assertSession()->linkExists('Options', 0, 'Options module is listed on the Field help page.');
$this->assertText('Field API Test', 'Modules with field types that do not implement hook_help are listed.');
- $this->assertNoLink('Field API Test', 'Modules with field types that do not implement hook_help are not linked.');
- $this->assertNoLink('Link', 'Modules that have not been installed, are not listed.');
+ $this->assertSession()->linkNotExists('Field API Test', 'Modules with field types that do not implement hook_help are not linked.');
+ $this->assertSession()->linkNotExists('Link', 'Modules that have not been installed, are not listed.');
}
}
diff --git a/web/core/modules/field/tests/src/Functional/FieldTestBase.php b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
index db20aa2fe1..2de6ac1ce1 100644
--- a/web/core/modules/field/tests/src/Functional/FieldTestBase.php
+++ b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
@@ -17,6 +17,7 @@ abstract class FieldTestBase extends BrowserTestBase {
*
* @param $cardinality
* Number of values to generate.
+ *
* @return
* An array of random values, in the format expected for field values.
*/
diff --git a/web/core/modules/field/tests/src/Functional/FormTest.php b/web/core/modules/field/tests/src/Functional/FormTest.php
index dd475dbec9..48613f1382 100644
--- a/web/core/modules/field/tests/src/Functional/FormTest.php
+++ b/web/core/modules/field/tests/src/Functional/FormTest.php
@@ -69,7 +69,10 @@ class FormTest extends FieldTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
+ $web_user = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]);
$this->drupalLogin($web_user);
$this->fieldStorageSingle = [
diff --git a/web/core/modules/field/tests/src/Functional/NestedFormTest.php b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
index 78be016d44..772d2abc9a 100644
--- a/web/core/modules/field/tests/src/Functional/NestedFormTest.php
+++ b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
@@ -28,7 +28,10 @@ class NestedFormTest extends FieldTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
+ $web_user = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]);
$this->drupalLogin($web_user);
$this->fieldStorageSingle = [
diff --git a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
index 9be6e01b7b..2d6194882e 100644
--- a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
@@ -37,7 +37,11 @@ class StringFieldTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->webUser = $this->drupalCreateUser(['view test entity', 'administer entity_test content', 'access content']);
+ $this->webUser = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ 'access content',
+ ]);
$this->drupalLogin($this->webUser);
}
diff --git a/web/core/modules/field/tests/src/Functional/TranslationWebTest.php b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
index d15692e1ad..a65bf44057 100644
--- a/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
+++ b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
@@ -92,7 +92,10 @@ protected function setUp() {
* Tests field translations when creating a new revision.
*/
public function testFieldFormTranslationRevisions() {
- $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
+ $web_user = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]);
$this->drupalLogin($web_user);
// Prepare the field translations.
diff --git a/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php b/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
index ac14ccc287..1b2ad0a747 100644
--- a/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
@@ -96,7 +96,10 @@ public function testReEnabledField() {
// Test that the module can't be uninstalled from the UI while there is data
// for its fields.
- $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+ $admin_user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/modules/uninstall');
$this->assertText("The Telephone number field type is used in the following field: node.field_telephone");
diff --git a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index c20ee81884..b42fa3b6d9 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -163,6 +163,7 @@ protected function entityValidateAndSave(EntityInterface $entity) {
*
* @param $cardinality
* Number of values to generate.
+ *
* @return
* An array of random values, in the format expected for field values.
*/
diff --git a/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index 72751d3bbc..9e2ba1dc12 100644
--- a/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -60,7 +60,7 @@ public function testEntityViewModeUI() {
$this->assertSession()->statusCodeEquals(404);
$this->drupalGet('admin/structure/display-modes/view/add');
- $this->assertNoLink(t('Test entity - revisions and data table'), 'An entity type with no view builder cannot have view modes.');
+ $this->assertSession()->linkNotExists(t('Test entity - revisions and data table'), 'An entity type with no view builder cannot have view modes.');
// Test adding a view mode including dots in machine_name.
$this->clickLink(t('Test entity'));
@@ -114,7 +114,7 @@ public function testEntityFormModeUI() {
$this->assertSession()->statusCodeEquals(404);
$this->drupalGet('admin/structure/display-modes/form/add');
- $this->assertNoLink(t('Entity Test without label'), 'An entity type with no form cannot have form modes.');
+ $this->assertSession()->linkNotExists(t('Entity Test without label'), 'An entity type with no form cannot have form modes.');
// Test adding a view mode including dots in machine_name.
$this->clickLink(t('Test entity'));
diff --git a/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
index 742b2796b4..62146c7319 100644
--- a/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
@@ -54,7 +54,17 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
// Create a test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'administer node display',
+ 'administer users',
+ 'administer account settings',
+ 'administer user display',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
index 0eeff4bcbd..26417e8c42 100644
--- a/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
@@ -30,7 +30,11 @@ protected function setUp() {
parent::setUp();
// Create a test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node display']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node display',
+ ]);
$this->drupalLogin($admin_user);
// Create Basic page node type.
diff --git a/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
index ab5a0ba312..ab57c9941f 100644
--- a/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
@@ -87,7 +87,7 @@ public function testFieldUIRoutes() {
$edit = ['display_modes_custom[test]' => TRUE];
$this->drupalPostForm('admin/config/people/accounts/display', $edit, t('Save'));
- $this->assertLink('Test');
+ $this->assertSession()->linkExists('Test');
// Create new form mode and verify it's available on the Manage Form
// Display screen after enabling it.
@@ -100,17 +100,17 @@ public function testFieldUIRoutes() {
$edit = ['display_modes_custom[test]' => TRUE];
$this->drupalPostForm('admin/config/people/accounts/form-display', $edit, t('Save'));
- $this->assertLink('Test');
+ $this->assertSession()->linkExists('Test');
}
/**
* Asserts that local tasks exists.
*/
public function assertLocalTasks() {
- $this->assertLink('Settings');
- $this->assertLink('Manage fields');
- $this->assertLink('Manage display');
- $this->assertLink('Manage form display');
+ $this->assertSession()->linkExists('Settings');
+ $this->assertSession()->linkExists('Manage fields');
+ $this->assertSession()->linkExists('Manage display');
+ $this->assertSession()->linkExists('Manage form display');
}
/**
diff --git a/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index d1db9a2f4f..b61ea7060a 100644
--- a/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -49,7 +49,20 @@ protected function setUp() {
$this->drupalPlaceBlock('local_tasks_block');
// Create a test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'administer node display',
+ 'administer taxonomy',
+ 'administer taxonomy_term fields',
+ 'administer taxonomy_term display',
+ 'administer users',
+ 'administer account settings',
+ 'administer user display',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
// Create content type, with underscores.
@@ -149,12 +162,12 @@ public function testViewModeCustom() {
public function testViewModeLocalTasks() {
$manage_display = 'admin/structure/types/manage/' . $this->type . '/display';
$this->drupalGet($manage_display);
- $this->assertNoLink('Full content');
- $this->assertLink('Teaser');
+ $this->assertSession()->linkNotExists('Full content');
+ $this->assertSession()->linkExists('Teaser');
$this->drupalGet($manage_display . '/teaser');
- $this->assertNoLink('Full content');
- $this->assertLink('Default');
+ $this->assertSession()->linkNotExists('Full content');
+ $this->assertSession()->linkExists('Default');
}
/**
@@ -225,6 +238,7 @@ public function assertNodeViewText(EntityInterface $node, $view_mode, $text, $me
* Plain text to look for.
* @param $message
* Message to display.
+ *
* @return
* TRUE on pass, FALSE on fail.
*/
diff --git a/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php b/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
index db6634dd71..de67f75202 100644
--- a/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
@@ -81,7 +81,20 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
// Create a test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'administer node display',
+ 'administer taxonomy',
+ 'administer taxonomy_term fields',
+ 'administer taxonomy_term display',
+ 'administer users',
+ 'administer account settings',
+ 'administer user display',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
// Create content type, with underscores.
@@ -158,7 +171,7 @@ public function manageFieldsPage($type = '') {
}
// Test the "Add field" action link.
- $this->assertLink('Add field');
+ $this->assertSession()->linkExists('Add field');
// Assert entity operations for all fields.
$number_of_links = 3;
@@ -278,9 +291,9 @@ public function cardinalitySettings() {
$this->assertFieldByXPath("//input[@name='cardinality_number']", 6);
// Check that tabs displayed.
- $this->assertLink(t('Edit'));
+ $this->assertSession()->linkExists(t('Edit'));
$this->assertLinkByHref('admin/structure/types/manage/article/fields/node.article.body');
- $this->assertLink(t('Field settings'));
+ $this->assertSession()->linkExists(t('Field settings'));
$this->assertLinkByHref($field_edit_path);
// Add two entries in the body.
diff --git a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
index a55d993b6a..56f175de10 100644
--- a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
@@ -51,7 +51,17 @@ protected function setUp() {
$this->drupalPlaceBlock('system_breadcrumb_block');
// Create a test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'administer node display',
+ 'administer users',
+ 'administer account settings',
+ 'administer user display',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
// Create content type, with underscores.
diff --git a/web/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php b/web/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
index de125d1854..e5554cbdae 100644
--- a/web/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
+++ b/web/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
@@ -47,7 +47,7 @@ public function fieldUIAddNewField($bundle_path, $field_name, $label = NULL, $fi
$this->drupalPostForm($bundle_path, $initial_edit, t('Save and continue'));
$this->assertRaw(t('These settings apply to the %label field everywhere it is used.', ['%label' => $label]), 'Storage settings page was displayed.');
// Test Breadcrumbs.
- $this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the storage settings page.');
+ $this->assertSession()->linkExists($label, 0, 'Field label is correct in the breadcrumb of the storage settings page.');
// Second step: 'Storage settings' form.
$this->drupalPostForm(NULL, $storage_edit, t('Save field settings'));
@@ -115,7 +115,7 @@ public function fieldUIDeleteField($bundle_path, $field_name, $label, $bundle_la
$this->assertRaw(t('Are you sure you want to delete the field %label', ['%label' => $label]), 'Delete confirmation was found.');
// Test Breadcrumbs.
- $this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the field delete page.');
+ $this->assertSession()->linkExists($label, 0, 'Field label is correct in the breadcrumb of the field delete page.');
// Submit confirmation form.
$this->drupalPostForm(NULL, [], t('Delete'));
diff --git a/web/core/modules/file/file.api.php b/web/core/modules/file/file.api.php
index 1fda717da7..7ba8f60401 100644
--- a/web/core/modules/file/file.api.php
+++ b/web/core/modules/file/file.api.php
@@ -18,6 +18,7 @@
*
* @param \Drupal\file\FileInterface $file
* The file entity being validated.
+ *
* @return array
* An array of error messages. If there are no problems with the file return
* an empty array.
diff --git a/web/core/modules/file/src/Tests/FileManagedTestBase.php b/web/core/modules/file/src/Tests/FileManagedTestBase.php
index 685877c035..c86c9e7b12 100644
--- a/web/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/web/core/modules/file/src/Tests/FileManagedTestBase.php
@@ -148,6 +148,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
* @param string $scheme
* Optional string indicating the stream scheme to use. Drupal core includes
* public, private, and temporary. The public wrapper is the default.
+ *
* @return \Drupal\file\FileInterface
* File entity.
*/
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php b/web/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
index 73f94047a0..0eaf79d502 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
@@ -63,14 +63,13 @@ public function testFileFieldRSSContent() {
// Check that the RSS enclosure appears in the RSS feed.
$this->drupalGet('rss.xml');
- $uploaded_filename = str_replace('public://', '', $node_file->getFileUri());
$selector = sprintf(
- 'enclosure[@url="%s"][@length="%s"][@type="%s"]',
- file_create_url("public://$uploaded_filename", ['absolute' => TRUE]),
+ '//enclosure[@url="%s" and @length="%s" and @type="%s"]',
+ file_create_url($node_file->getFileUri()),
$node_file->getSize(),
$node_file->getMimeType()
);
- $this->assertNotNull($this->getSession()->getDriver()->find('xpath', $selector), 'File field RSS enclosure is displayed when viewing the RSS feed.');
+ $this->assertNotEmpty($this->getSession()->getDriver()->find($selector), 'File field RSS enclosure is displayed when viewing the RSS feed.');
}
}
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php b/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
index 05f084ee34..629629025f 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@ -46,7 +46,18 @@ abstract class FileFieldTestBase extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer users',
+ 'administer permissions',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node display',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->adminUser);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
diff --git a/web/core/modules/file/tests/src/Functional/FileListingTest.php b/web/core/modules/file/tests/src/Functional/FileListingTest.php
index 95ac9aedac..4410720924 100644
--- a/web/core/modules/file/tests/src/Functional/FileListingTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -40,7 +40,10 @@ protected function setUp() {
->set('make_unused_managed_files_temporary', TRUE)
->save();
- $this->adminUser = $this->drupalCreateUser(['access files overview', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access files overview',
+ 'bypass node access',
+ ]);
$this->baseUser = $this->drupalCreateUser();
$this->createFileField('file', 'node', 'article', [], ['file_extensions' => 'txt png']);
}
@@ -50,6 +53,7 @@ protected function setUp() {
*
* @param $usage array
* Array of file usage information as returned from file_usage subsystem.
+ *
* @return int
* Total usage count.
*/
@@ -201,8 +205,8 @@ public function testFileListingUsageNoLink() {
// Entity name should be displayed, but not linked if Entity::toUrl
// throws an exception
$this->assertText($entity_name, 'Entity name is added to file usage listing.');
- $this->assertNoLink($entity_name, 'Linked entity name not added to file usage listing.');
- $this->assertLink($node->getTitle());
+ $this->assertSession()->linkNotExists($entity_name, 'Linked entity name not added to file usage listing.');
+ $this->assertSession()->linkExists($node->getTitle());
}
/**
diff --git a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
index 2a4465d811..1538e4c5eb 100644
--- a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
+++ b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -143,6 +143,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
* @param string $scheme
* Optional string indicating the stream scheme to use. Drupal core includes
* public, private, and temporary. The public wrapper is the default.
+ *
* @return \Drupal\file\FileInterface
* File entity.
*/
diff --git a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
index c563337ddd..54c44753d3 100644
--- a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
+++ b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
@@ -42,7 +42,18 @@ class FileFieldWidgetTest extends WebDriverTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer users',
+ 'administer permissions',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node display',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->adminUser);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
diff --git a/web/core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php b/web/core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php
index a4f2c0ca55..625878ad88 100644
--- a/web/core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php
+++ b/web/core/modules/file/tests/src/FunctionalJavascript/FileManagedFileElementTest.php
@@ -33,7 +33,18 @@ class FileManagedFileElementTest extends WebDriverTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer users',
+ 'administer permissions',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node display',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->adminUser);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
diff --git a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
index aa336f1e2c..715d96b973 100644
--- a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
+++ b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -156,6 +156,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
* @param string $scheme
* Optional string indicating the stream scheme to use. Drupal core includes
* public, private, and temporary. The public wrapper is the default.
+ *
* @return \Drupal\file\FileInterface
* File entity.
*/
diff --git a/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php b/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
index ea18cffa77..14a3c35c2a 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
@@ -111,7 +111,10 @@ protected function setUp() {
'access site reports',
]);
- $this->webUser = $this->drupalCreateUser(['create page content', 'edit own page content']);
+ $this->webUser = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ ]);
user_role_grant_permissions('authenticated', [$basic_html_format->getPermissionName()]);
user_role_grant_permissions('anonymous', [$restricted_html_format->getPermissionName()]);
$this->drupalLogin($this->adminUser);
@@ -320,7 +323,7 @@ public function testFilterAdmin() {
$edit['body[0][format]'] = $plain;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$this->drupalGet('node/' . $node->id());
- $this->assertEscaped($text, 'The "Plain text" text format escapes all HTML tags.');
+ $this->assertEscaped($text);
$this->config('filter.settings')
->set('always_show_fallback_choice', FALSE)
->save();
diff --git a/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php b/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
index d74a14dc6f..ce12706055 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
@@ -44,7 +44,10 @@ public function testDefaultTextFormats() {
}
list($first_format, $second_format) = $formats;
$second_format_permission = $second_format->getPermissionName();
- $first_user = $this->drupalCreateUser([$first_format->getPermissionName(), $second_format_permission]);
+ $first_user = $this->drupalCreateUser([
+ $first_format->getPermissionName(),
+ $second_format_permission,
+ ]);
$second_user = $this->drupalCreateUser([$second_format_permission]);
// Adjust the weights so that the first and second formats (in that order)
diff --git a/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php b/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
index a70a95f965..3fd9513c2e 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
@@ -36,7 +36,11 @@ public function testFilterHooks() {
$type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
$node_permission = "create $type_name content";
- $admin_user = $this->drupalCreateUser(['administer filters', 'administer nodes', $node_permission]);
+ $admin_user = $this->drupalCreateUser([
+ 'administer filters',
+ 'administer nodes',
+ $node_permission,
+ ]);
$this->drupalLogin($admin_user);
// Add a text format.
diff --git a/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
index 103c6e3cde..1d6c10cc43 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
@@ -46,7 +46,11 @@ protected function setUp() {
$filtered_html_permission = $filtered_html_format->getPermissionName();
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [$filtered_html_permission]);
- $this->adminUser = $this->drupalCreateUser(['administer modules', 'administer filters', 'administer site configuration']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer filters',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
index a5043fe265..3bd1d43c9a 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
@@ -58,12 +58,12 @@ public function testNewForumTopicsBlock() {
// Create 5 forum topics.
$topics = $this->createForumTopics();
- $this->assertLink(t('More'), 0, 'New forum topics block has a "more"-link.');
+ $this->assertSession()->linkExists(t('More'), 0, 'New forum topics block has a "more"-link.');
$this->assertLinkByHref('forum', 0, 'New forum topics block has a "more"-link.');
// We expect all 5 forum topics to appear in the "New forum topics" block.
foreach ($topics as $topic) {
- $this->assertLink($topic, 0, new FormattableMarkup('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topic]));
+ $this->assertSession()->linkExists($topic, 0, new FormattableMarkup('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topic]));
}
// Configure the new forum topics block to only show 2 topics.
@@ -75,7 +75,7 @@ public function testNewForumTopicsBlock() {
// topics" block.
for ($index = 0; $index < 5; $index++) {
if (in_array($index, [3, 4])) {
- $this->assertLink($topics[$index], 0, new FormattableMarkup('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topics[$index]]));
+ $this->assertSession()->linkExists($topics[$index], 0, new FormattableMarkup('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topics[$index]]));
}
else {
$this->assertNoText($topics[$index], new FormattableMarkup('Forum topic @topic not found in the "New forum topics" block.', ['@topic' => $topics[$index]]));
@@ -113,7 +113,7 @@ public function testActiveForumTopicsBlock() {
// Enable the block.
$block = $this->drupalPlaceBlock('forum_active_block');
$this->drupalGet('');
- $this->assertLink(t('More'), 0, 'Active forum topics block has a "more"-link.');
+ $this->assertSession()->linkExists(t('More'), 0, 'Active forum topics block has a "more"-link.');
$this->assertLinkByHref('forum', 0, 'Active forum topics block has a "more"-link.');
// We expect the first 5 forum topics to appear in the "Active forum topics"
@@ -121,7 +121,7 @@ public function testActiveForumTopicsBlock() {
$this->drupalGet('<front>');
for ($index = 0; $index < 10; $index++) {
if ($index < 5) {
- $this->assertLink($topics[$index], 0, new FormattableMarkup('Forum topic @topic found in the "Active forum topics" block.', ['@topic' => $topics[$index]]));
+ $this->assertSession()->linkExists($topics[$index], 0, new FormattableMarkup('Forum topic @topic found in the "Active forum topics" block.', ['@topic' => $topics[$index]]));
}
else {
$this->assertNoText($topics[$index], new FormattableMarkup('Forum topic @topic not found in the "Active forum topics" block.', ['@topic' => $topics[$index]]));
@@ -138,7 +138,7 @@ public function testActiveForumTopicsBlock() {
// the "Active forum topics" block.
for ($index = 0; $index < 10; $index++) {
if (in_array($index, [3, 4])) {
- $this->assertLink($topics[$index], 0, 'Forum topic found in the "Active forum topics" block.');
+ $this->assertSession()->linkExists($topics[$index], 0, 'Forum topic found in the "Active forum topics" block.');
}
else {
$this->assertNoText($topics[$index], 'Forum topic not found in the "Active forum topics" block.');
diff --git a/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
index 3bb803a971..de07fd0c4e 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
@@ -27,7 +27,13 @@ protected function setUp() {
parent::setUp();
// Create a test user.
- $web_user = $this->drupalCreateUser(['create forum content', 'edit own forum content', 'edit any forum content', 'administer nodes', 'administer forums']);
+ $web_user = $this->drupalCreateUser([
+ 'create forum content',
+ 'edit own forum content',
+ 'edit any forum content',
+ 'administer nodes',
+ 'administer forums',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
index e18efd9367..acf3f2a7e9 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
@@ -49,7 +49,12 @@ public function testForumNodeAccess() {
// Create some users.
$access_user = $this->drupalCreateUser(['node test view']);
$no_access_user = $this->drupalCreateUser();
- $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules', 'administer blocks', 'create forum content']);
+ $admin_user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ 'administer blocks',
+ 'create forum content',
+ ]);
$this->drupalLogin($admin_user);
diff --git a/web/core/modules/forum/tests/src/Functional/ForumTest.php b/web/core/modules/forum/tests/src/Functional/ForumTest.php
index fd54ff9998..0b44b6a1b6 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -189,9 +189,9 @@ public function testForum() {
// Verify that this user is shown a local task to add new forum content.
$this->drupalGet('forum');
- $this->assertLink(t('Add new Forum topic'));
+ $this->assertSession()->linkExists(t('Add new Forum topic'));
$this->drupalGet('forum/' . $this->forum['tid']);
- $this->assertLink(t('Add new Forum topic'));
+ $this->assertSession()->linkExists(t('Add new Forum topic'));
// Log in a user with permission to edit any forum content.
$this->drupalLogin($this->editAnyTopicsUser);
@@ -224,7 +224,11 @@ public function testForum() {
$this->assertEquals('6', $elements[0]->getText(), 'Number of posts found.');
// Test loading multiple forum nodes on the front page.
- $this->drupalLogin($this->drupalCreateUser(['administer content types', 'create forum content', 'post comments']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer content types',
+ 'create forum content',
+ 'post comments',
+ ]));
$this->drupalPostForm('admin/structure/types/manage/forum', ['options[promote]' => 'promote'], t('Save content type'));
$this->createForumTopic($this->forum, FALSE);
$this->createForumTopic($this->forum, FALSE);
@@ -256,7 +260,7 @@ public function testForum() {
// Test anonymous action link.
$this->drupalLogout();
$this->drupalGet('forum/' . $this->forum['tid']);
- $this->assertLink(t('Log in to post new content in the forum.'));
+ $this->assertSession()->linkExists(t('Log in to post new content in the forum.'));
}
/**
@@ -319,8 +323,8 @@ private function doAdminTests($user) {
// Verify help text is shown.
$this->assertText(t('Forums contain forum topics. Use containers to group related forums'));
// Verify action links are there.
- $this->assertLink('Add forum');
- $this->assertLink('Add container');
+ $this->assertSession()->linkExists('Add forum');
+ $this->assertSession()->linkExists('Add container');
$this->clickLink('edit container');
$this->assertRaw('Edit container', 'Followed the link to edit the container');
// Create forum inside the forum container.
@@ -365,7 +369,7 @@ private function doAdminTests($user) {
// Test tags vocabulary form is not affected.
$this->drupalGet('admin/structure/taxonomy/manage/tags');
$this->assertSession()->buttonExists('Save');
- $this->assertLink(t('Delete'));
+ $this->assertSession()->linkExists(t('Delete'));
// Test tags vocabulary term form is not affected.
$this->drupalGet('admin/structure/taxonomy/manage/tags/add');
$this->assertField('parent[]', 'Parent field found.');
@@ -547,7 +551,7 @@ public function testForumWithNewPost() {
$this->assertSession()->statusCodeEquals(200);
// Verify there is no unintentional HTML tag escaping.
- $this->assertNoEscaped('<', '');
+ $this->assertNoEscaped('<');
}
/**
diff --git a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
index 78e4492f6d..430c6837f7 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
@@ -32,7 +32,13 @@ class ForumUninstallTest extends BrowserTestBase {
* Tests if forum module uninstallation properly deletes the field.
*/
public function testForumUninstallWithField() {
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'administer nodes', 'administer modules', 'delete any forum content', 'administer content types']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'administer nodes',
+ 'administer modules',
+ 'delete any forum content',
+ 'administer content types',
+ ]));
// Ensure that the field exists before uninstallation.
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
$this->assertNotNull($field_storage, 'The taxonomy_forums field storage exists.');
@@ -91,7 +97,7 @@ public function testForumUninstallWithField() {
// Ensure that the forum node type can not be deleted.
$this->drupalGet('admin/structure/types/manage/forum');
- $this->assertNoLink(t('Delete'));
+ $this->assertSession()->linkNotExists(t('Delete'));
// Now attempt to uninstall forum.
$this->drupalGet('admin/modules/uninstall');
diff --git a/web/core/modules/help/tests/src/Functional/HelpTest.php b/web/core/modules/help/tests/src/Functional/HelpTest.php
index 199f6809c1..a3b9f8530c 100644
--- a/web/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpTest.php
@@ -49,7 +49,11 @@ protected function setUp() {
parent::setUp();
// Create users.
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme', 'administer permissions']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'view the administration theme',
+ 'administer permissions',
+ ]);
$this->anyUser = $this->drupalCreateUser([]);
}
@@ -82,7 +86,7 @@ public function testHelp() {
// Make sure links are properly added for modules implementing hook_help().
foreach ($this->getModuleList() as $module => $name) {
- $this->assertLink($name, 0, new FormattableMarkup('Link properly added to @name (admin/help/@module)', ['@module' => $module, '@name' => $name]));
+ $this->assertSession()->linkExists($name, 0, new FormattableMarkup('Link properly added to @name (admin/help/@module)', ['@module' => $module, '@name' => $name]));
}
// Ensure that module which does not provide an module overview page is
@@ -99,7 +103,7 @@ public function testHelp() {
$pos = $start;
$list = ['Block', 'Color', 'Custom Block', 'History', 'Text Editor'];
foreach ($list as $name) {
- $this->assertLink($name);
+ $this->assertSession()->linkExists($name);
$new_pos = strpos($page_text, $name, $start);
$this->assertTrue($new_pos > $pos, 'Order of ' . $name . ' is correct on page');
$pos = $new_pos;
@@ -135,12 +139,12 @@ protected function verifyHelp($response = 200) {
$this->assertText(t('@module administration pages', ['@module' => $name]));
}
foreach ($admin_tasks as $task) {
- $this->assertLink($task['title']);
+ $this->assertSession()->linkExists($task['title']);
// Ensure there are no double escaped '&' or '<' characters.
- $this->assertNoEscaped('&', 'The help text does not have double escaped &.');
- $this->assertNoEscaped('<', 'The help text does not have double escaped <.');
+ $this->assertNoEscaped('&');
+ $this->assertNoEscaped('<');
// Ensure there are no escaped '<' characters.
- $this->assertNoEscaped('<', 'The help text does not have single escaped <.');
+ $this->assertNoEscaped('<');
}
// Ensure there are no double escaped '&' or '<' characters.
$this->assertNoEscaped('&');
diff --git a/web/core/modules/history/tests/src/Functional/HistoryTest.php b/web/core/modules/history/tests/src/Functional/HistoryTest.php
index ab9b3562bf..5d4e80ec47 100644
--- a/web/core/modules/history/tests/src/Functional/HistoryTest.php
+++ b/web/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -47,7 +47,10 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
- $this->user = $this->drupalCreateUser(['create page content', 'access content']);
+ $this->user = $this->drupalCreateUser([
+ 'create page content',
+ 'access content',
+ ]);
$this->drupalLogin($this->user);
$this->testNode = $this->drupalCreateNode(['type' => 'page', 'uid' => $this->user->id()]);
}
diff --git a/web/core/modules/image/image.module b/web/core/modules/image/image.module
index d7bb236c38..35db4a8e33 100644
--- a/web/core/modules/image/image.module
+++ b/web/core/modules/image/image.module
@@ -248,6 +248,7 @@ function image_path_flush($path) {
*
* @param $include_empty
* If TRUE a '- None -' option will be inserted in the options array.
+ *
* @return
* Array of image styles both key and value are set to style name.
*/
diff --git a/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyImageFormatter.php b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyImageFormatter.php
new file mode 100644
index 0000000000..43a6860bd6
--- /dev/null
+++ b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyImageFormatter.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\image_module_test\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+
+/**
+ * Plugin implementation of the Dummy image formatter.
+ *
+ * @FieldFormatter(
+ * id = "dummy_image_formatter",
+ * label = @Translation("Dummy image"),
+ * field_types = {
+ * "image"
+ * },
+ * quickedit = {
+ * "editor" = "image"
+ * }
+ * )
+ */
+class DummyImageFormatter extends FormatterBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function viewElements(FieldItemListInterface $items, $langcode) {
+ return [
+ ['#markup' => 'Dummy'],
+ ];
+ }
+
+}
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
index b736e8f466..3d0421e1ac 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
@@ -49,7 +49,19 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
}
- $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer node fields', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles', 'administer node display']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer content types',
+ 'administer node fields',
+ 'administer nodes',
+ 'create article content',
+ 'edit any article content',
+ 'delete any article content',
+ 'administer image styles',
+ 'administer node display',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
index f117de6a88..f2da5ad366 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
@@ -1029,7 +1029,10 @@ public function testNonTranslatableEntityUpdatesFromIssue3043168() {
$this->assertInstanceOf(TranslatableInterface::class, $entity);
$this->assertFalse($entity->isTranslatable());
// Set up a test user with permission to view and update the test entity.
- $user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
+ $user = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]);
$request_options[RequestOptions::HEADERS]['Accept'] = 'application/vnd.api+json';
$request_options[RequestOptions::AUTH] = [
$user->getAccountName(),
diff --git a/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php b/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
index 1511bf1f14..afdfaa3653 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
@@ -19,7 +19,11 @@ class LanguageBlockSettingsVisibilityTest extends BrowserTestBase {
protected $defaultTheme = 'stark';
public function testUnnecessaryLanguageSettingsVisibility() {
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer blocks']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'administer blocks',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
$this->drupalGet('admin/structure/block/add/system_menu_block:admin/stark');
diff --git a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
index 6c76a02111..36159ead5e 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
@@ -25,7 +25,10 @@ class LanguageBrowserDetectionTest extends BrowserTestBase {
*/
public function testUIBrowserLanguageMappings() {
// User to manage languages.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
// Check that the configure link exists.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
index 8e70032900..e9f520dbf0 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
@@ -35,7 +35,11 @@ class LanguageConfigurationElementTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content types']);
+ $user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer languages',
+ 'administer content types',
+ ]);
$this->drupalLogin($user);
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
index 06f4cee3ba..fa40a942f3 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
@@ -36,7 +36,10 @@ public function testLanguageConfiguration() {
$this->assertEqual(ConfigurableLanguage::load('en')->getWeight(), 0, 'The English language has a weight of 0.');
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
// Check if the Default English language has no path prefix.
@@ -157,7 +160,10 @@ public function testLanguageConfiguration() {
*/
public function testLanguageConfigurationWeight() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
$this->checkConfigurableLanguageWeight();
diff --git a/web/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php b/web/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
index 52bbde1172..e4bcfc5166 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
@@ -32,7 +32,10 @@ class LanguageCustomLanguageConfigurationTest extends BrowserTestBase {
public function testLanguageConfiguration() {
// Create user with permissions to add and remove languages.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
// Add custom language.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
index e63c31726c..f825049cde 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
@@ -30,7 +30,10 @@ class LanguageListModuleInstallTest extends BrowserTestBase {
public function testModuleInstallLanguageList() {
// Since LanguageManager::getLanguages() uses static caches we need to do
// this by enabling the module using the UI.
- $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+ $admin_user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ ]);
$this->drupalLogin($admin_user);
$edit = [];
$edit['modules[language][enable]'] = 'language';
diff --git a/web/core/modules/language/tests/src/Functional/LanguageListTest.php b/web/core/modules/language/tests/src/Functional/LanguageListTest.php
index bdaf682592..ac84fd9ece 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageListTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageListTest.php
@@ -33,7 +33,10 @@ class LanguageListTest extends BrowserTestBase {
public function testLanguageList() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
// Get the weight of the last language.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php b/web/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
index 2809d32986..6b78d8d298 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
@@ -38,7 +38,10 @@ protected function setUp() {
*/
public function testLanguageLocaleList() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
// Add predefined language.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
index 35974cfd51..22cd83e784 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
@@ -31,7 +31,12 @@ class LanguageNegotiationInfoTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'view the administration theme', 'administer modules']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'view the administration theme',
+ 'administer modules',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'it'], t('Add language'));
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
index 06affc01f8..aea3a7f376 100644
--- a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
@@ -27,7 +27,11 @@ protected function setUp() {
parent::setUp();
// Create and log in user.
- $web_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer site configuration']);
+ $web_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($web_user);
// Enable French language.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
index 7f20d47d12..c636f250ec 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
@@ -38,7 +38,11 @@ protected function setUp() {
parent::setUp();
// Create and log in user.
- $admin_user = $this->drupalCreateUser(['administer blocks', 'administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageTourTest.php b/web/core/modules/language/tests/src/Functional/LanguageTourTest.php
index 9bae57720a..804b86ced9 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageTourTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageTourTest.php
@@ -35,7 +35,10 @@ class LanguageTourTest extends TourTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'access tour']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'access tour',
+ ]);
$this->drupalLogin($this->adminUser);
$this->drupalPlaceBlock('local_actions_block');
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
index 62e0ae5e72..7816321881 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
@@ -74,7 +74,12 @@ class LanguageUILanguageNegotiationTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'administer blocks']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ 'administer blocks',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
index 456c5b6202..60d5885dde 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
@@ -39,7 +39,10 @@ protected function setUp() {
parent::setUp();
// Create and log in user.
- $this->webUser = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $this->webUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->webUser);
// Install French language.
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
index 55c69ac176..ecaccd94ef 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
@@ -189,7 +189,12 @@ public function testAccessWithoutBundles(array $permissions, $default_access, $n
$this->drupalGet('user/' . $non_editable_user->id() . '/layout');
$this->assertExpectedAccess($non_editable_access);
- $non_viewable_user = $this->drupalCreateUser([], 'bad person', FALSE, ['status' => 0]);
+ $non_viewable_user = $this->drupalCreateUser(
+ [],
+ 'bad person',
+ FALSE,
+ ['status' => 0]
+ );
$this->drupalGet($non_viewable_user->toUrl());
$this->assertExpectedAccess(FALSE);
$this->drupalGet($non_viewable_user->toUrl('edit-form'));
diff --git a/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php b/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
index 65e4125dc3..dd2318e428 100644
--- a/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
+++ b/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
@@ -68,8 +68,14 @@ protected function setUp() {
$this->firstContentType = $this->drupalCreateContentType();
$this->secondContentType = $this->drupalCreateContentType();
- $this->adminUser = $this->drupalCreateUser(['administer content types', 'administer node fields', 'administer node display']);
- $this->helpTextUser = $this->drupalCreateUser(['create ' . $this->secondContentType->id() . ' content']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer content types',
+ 'administer node fields',
+ 'administer node display',
+ ]);
+ $this->helpTextUser = $this->drupalCreateUser([
+ 'create ' . $this->secondContentType->id() . ' content',
+ ]);
$this->drupalPlaceBlock('system_breadcrumb_block');
}
diff --git a/web/core/modules/locale/src/LocaleConfigManager.php b/web/core/modules/locale/src/LocaleConfigManager.php
index 547a1b504f..2ebdd735c9 100644
--- a/web/core/modules/locale/src/LocaleConfigManager.php
+++ b/web/core/modules/locale/src/LocaleConfigManager.php
@@ -621,6 +621,7 @@ public function updateConfigTranslations(array $names, array $langcodes = []) {
* Configuration override data.
* @param array $translatable
* Translatable data array. @see self::getTranslatableData()
+ *
* @return array
* Nested array of any items of $override_data which did not have keys in
* $translatable. May be empty if $override_data only had items which were
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
index 64dcb705d8..d51a2d3d08 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
@@ -36,7 +36,13 @@ protected function setUp() {
* Test update changes configuration translations if enabled after language.
*/
public function testConfigTranslationImport() {
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'administer permissions',
+ ]);
$this->drupalLogin($admin_user);
// Add a language. The Afrikaans translation file of locale_test_translate
@@ -90,7 +96,14 @@ public function testConfigTranslationModuleInstall() {
// import. Test that this override is in place.
$this->assertFalse($this->config('locale.settings')->get('translation.import_enabled'), 'Translations imports are disabled by default in the Testing profile.');
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'administer permissions',
+ 'translate configuration',
+ ]);
$this->drupalLogin($admin_user);
// Enable import of translations. By default this is disabled for automated
@@ -149,7 +162,14 @@ public function testLocaleRemovalAndConfigOverrideDelete() {
$this->container->get('module_installer')->install(['locale']);
$this->resetAll();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'administer permissions',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
// Enable import of translations. By default this is disabled for automated
@@ -187,7 +207,14 @@ public function testLocaleRemovalAndConfigOverridePreserve() {
$this->container->get('module_installer')->install(['locale']);
$this->resetAll();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'administer permissions',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
// Enable import of translations. By default this is disabled for automated
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
index c555099bcc..e42f8d39a8 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
@@ -48,7 +48,15 @@ protected function setUp() {
// Add custom language.
$this->langcode = 'xx';
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access site-wide contact form', 'administer contact forms', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ 'administer modules',
+ 'access site-wide contact form',
+ 'administer contact forms',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$name = $this->randomMachineName(16);
$edit = [
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
index 9ac40754f8..04c09ff81d 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
@@ -31,7 +31,12 @@ class LocaleContentTest extends BrowserTestBase {
*/
public function testMachineNameLTR() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'administer content types',
+ 'access administration pages',
+ 'administer site configuration',
+ ]);
// Log in as admin.
$this->drupalLogin($admin_user);
@@ -63,9 +68,17 @@ public function testContentTypeLanguageConfiguration() {
$type2 = $this->drupalCreateContentType();
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'administer content types',
+ 'access administration pages',
+ ]);
// User to create a node.
- $web_user = $this->drupalCreateUser(["create {$type1->id()} content", "create {$type2->id()} content", "edit any {$type2->id()} content"]);
+ $web_user = $this->drupalCreateUser([
+ "create {$type1->id()} content",
+ "create {$type2->id()} content",
+ "edit any {$type2->id()} content",
+ ]);
// Add custom language.
$this->drupalLogin($admin_user);
@@ -140,9 +153,16 @@ public function testContentTypeDirLang() {
$type = $this->drupalCreateContentType();
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'administer content types',
+ 'access administration pages',
+ ]);
// User to create a node.
- $web_user = $this->drupalCreateUser(["create {$type->id()} content", "edit own {$type->id()} content"]);
+ $web_user = $this->drupalCreateUser([
+ "create {$type->id()} content",
+ "edit own {$type->id()} content",
+ ]);
// Log in as admin.
$this->drupalLogin($admin_user);
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php b/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
index 9869fb70a2..5170a8317b 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
@@ -35,7 +35,11 @@ class LocaleExportTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->adminUser);
// Copy test po files to the translations directory.
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index 9342c6ed84..526db97c0a 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -55,8 +55,17 @@ protected function setUp() {
$file_system->copy(__DIR__ . '/../../../tests/test.de.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
$file_system->copy(__DIR__ . '/../../../tests/test.xx.po', 'translations://', FileSystemInterface::EXISTS_REPLACE);
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
- $this->adminUserAccessSiteReports = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'access site reports']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ ]);
+ $this->adminUserAccessSiteReports = $this->drupalCreateUser([
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ 'access site reports',
+ ]);
$this->drupalLogin($this->adminUser);
// Enable import of translations. By default this is disabled for automated
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php b/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
index 087052974c..7b735b7f32 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
@@ -116,7 +116,11 @@ public function testFileParsing() {
*/
public function testLocaleTranslationJsDependencies() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
// Add custom language.
$this->drupalLogin($admin_user);
diff --git a/web/core/modules/locale/tests/src/Functional/LocalePathTest.php b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
index 8ec53c666b..9357230ab2 100644
--- a/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
@@ -44,7 +44,14 @@ protected function setUp() {
*/
public function testPathLanguageConfiguration() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'access administration pages', 'access content overview']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'create page content',
+ 'administer url aliases',
+ 'create url aliases',
+ 'access administration pages',
+ 'access content overview',
+ ]);
// Add custom language.
$this->drupalLogin($admin_user);
diff --git a/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php b/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
index b85e737a06..552273cfa7 100644
--- a/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
@@ -39,7 +39,11 @@ class LocalePluralFormatTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'translate interface',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
index 19db1b38ed..f2307cf919 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
@@ -35,7 +35,11 @@ class LocaleTranslateStringTourTest extends TourTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['translate interface', 'access tour', 'administer languages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'translate interface',
+ 'access tour',
+ 'administer languages',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index 3905116eae..aac663b25b 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -32,7 +32,10 @@ class LocaleTranslationUiTest extends BrowserTestBase {
* Enable interface translation to English.
*/
public function testEnglishTranslation() {
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPostForm('admin/config/regional/language/edit/en', ['locale_translate_english' => TRUE], t('Save language'));
@@ -44,9 +47,15 @@ public function testEnglishTranslation() {
*/
public function testStringTranslation() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
// User to translate and delete string.
- $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
+ $translate_user = $this->drupalCreateUser([
+ 'translate interface',
+ 'access administration pages',
+ ]);
// Code for the language.
$langcode = 'xx';
// The English name for the language. This will be translated.
@@ -216,7 +225,11 @@ public function testStringTranslation() {
* properly created and rebuilt on deletion.
*/
public function testJavaScriptTranslation() {
- $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
+ $user = $this->drupalCreateUser([
+ 'translate interface',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($user);
$config = $this->config('locale.settings');
@@ -279,7 +292,11 @@ public function testJavaScriptTranslation() {
*/
public function testStringValidation() {
// User to add language and strings.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
$langcode = 'xx';
// The English name for the language. This will be translated.
@@ -333,9 +350,15 @@ public function testStringValidation() {
*/
public function testStringSearch() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
// User to translate and delete string.
- $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
+ $translate_user = $this->drupalCreateUser([
+ 'translate interface',
+ 'access administration pages',
+ ]);
// Code for the language.
$langcode = 'xx';
@@ -474,7 +497,11 @@ public function testStringSearch() {
* Tests that only changed strings are saved customized when edited.
*/
public function testUICustomizedStrings() {
- $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
+ $user = $this->drupalCreateUser([
+ 'translate interface',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($user);
ConfigurableLanguage::createFromLangcode('de')->save();
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateCronTest.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateCronTest.php
index 34ee9dc36a..d7ebf3254d 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateCronTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateCronTest.php
@@ -26,7 +26,13 @@ class LocaleUpdateCronTest extends LocaleUpdateBase {
*/
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
$this->addLanguage('de');
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
index 5921198407..a04eafc19a 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
@@ -21,7 +21,12 @@ class LocaleUpdateDevelopmentReleaseTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
module_load_include('compare.inc', 'locale');
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
index 516d5b6386..02049b6646 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
@@ -29,7 +29,13 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
*/
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
index d6818a8f14..d1b12c17f4 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
@@ -24,7 +24,13 @@ protected function setUp() {
parent::setUp();
module_load_include('compare.inc', 'locale');
module_load_include('fetch.inc', 'locale');
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer site configuration',
+ 'administer languages',
+ 'access administration pages',
+ 'translate interface',
+ ]);
$this->drupalLogin($admin_user);
// We use German as test language. This language must match the translation
// file that come with the locale_test module (test.de.po) and can therefore
diff --git a/web/core/modules/menu_link_content/menu_link_content.module b/web/core/modules/menu_link_content/menu_link_content.module
index def0ed9db0..a593bef4e3 100644
--- a/web/core/modules/menu_link_content/menu_link_content.module
+++ b/web/core/modules/menu_link_content/menu_link_content.module
@@ -104,6 +104,11 @@ function menu_link_content_entity_predelete(EntityInterface $entity) {
$entity_type_id = $entity->getEntityTypeId();
foreach ($entity->uriRelationships() as $rel) {
$url = $entity->toUrl($rel);
+ // Entities can provide uri relationships that are not routed, in this case
+ // getRouteParameters() will throw an exception.
+ if (!$url->isRouted()) {
+ continue;
+ }
$route_parameters = $url->getRouteParameters();
if (!isset($route_parameters[$entity_type_id])) {
// Do not delete links which do not relate to this exact entity. For
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
index 942703ae53..bf77e30307 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
@@ -52,7 +52,7 @@ public function testMenuLinkContentDeleteForm() {
$menu_link = MenuLinkContent::load(1);
$this->drupalGet($menu_link->toUrl('delete-form'));
$this->assertRaw(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
- $this->assertLink(t('Cancel'));
+ $this->assertSession()->linkExists(t('Cancel'));
// Make sure cancel link points to link edit
$this->assertLinkByHref($menu_link->toUrl('edit-form')->toString());
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
index 8b58f4ff28..d2c1b750e5 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
@@ -47,7 +47,10 @@ class MenuLinkContentFormTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer menu', 'link to any page']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer menu',
+ 'link to any page',
+ ]);
$this->basicUser = $this->drupalCreateUser(['administer menu']);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index badeb9cc00..334bfcf018 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -73,7 +73,7 @@ protected function createEntity($values, $langcode, $bundle_name = NULL) {
*/
public function testTranslationLinkOnMenuEditForm() {
$this->drupalGet('admin/structure/menu/manage/tools');
- $this->assertNoLink(t('Translate'));
+ $this->assertSession()->linkNotExists(t('Translate'));
$menu_link_content = MenuLinkContent::create([
'menu_name' => 'tools',
@@ -82,7 +82,7 @@ public function testTranslationLinkOnMenuEditForm() {
]);
$menu_link_content->save();
$this->drupalGet('admin/structure/menu/manage/tools');
- $this->assertLink(t('Translate'));
+ $this->assertSession()->linkExists(t('Translate'));
}
/**
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
index d7d3812f70..6883c76abb 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
@@ -4,6 +4,7 @@
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\entity_test\Entity\EntityTestExternal;
use Drupal\KernelTests\KernelTestBase;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\system\Entity\Menu;
@@ -17,11 +18,10 @@
class MenuLinksTest extends KernelTestBase {
/**
- * Modules to enable.
- *
- * @var array
+ * {@inheritdoc}
*/
- public static $modules = [
+ protected static $modules = [
+ 'entity_test',
'link',
'menu_link_content',
'router_test',
@@ -46,6 +46,7 @@ protected function setUp() {
$this->installSchema('system', ['sequences']);
$this->installSchema('user', ['users_data']);
+ $this->installEntitySchema('entity_test_external');
$this->installEntitySchema('menu_link_content');
$this->installEntitySchema('user');
@@ -163,6 +164,12 @@ public function testMenuLinkOnEntityDelete() {
$user = User::create(['name' => 'username']);
$user->save();
+ // Create External test entity.
+ $external_entity = EntityTestExternal::create();
+ $external_entity->save();
+ // Ensure an external entity can be deleted.
+ $external_entity->delete();
+
// Create "canonical" menu link pointing to the user.
$menu_link_content = MenuLinkContent::create([
'title' => 'username profile',
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
index 88e515857f..0a94dbd289 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
@@ -40,7 +40,7 @@ public function testDefaultMenuLinkReorder() {
// Assert that the Home link is available.
$this->drupalGet('test-page');
- $this->assertLink('Home');
+ $this->assertSession()->linkExists('Home');
// The administrator user that can re-order menu links.
$this->administrator = $this->drupalCreateUser([
@@ -58,14 +58,14 @@ public function testDefaultMenuLinkReorder() {
// The link is still there.
$this->drupalGet('test-page');
- $this->assertLink('Home');
+ $this->assertSession()->linkExists('Home');
// Clear all caches.
$this->drupalPostForm('admin/config/development/performance', [], t('Clear all caches'));
// Clearing all caches should not affect the state of the menu link.
$this->drupalGet('test-page');
- $this->assertLink('Home');
+ $this->assertSession()->linkExists('Home');
}
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
index dcdb3277b6..af69440e0b 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
@@ -38,7 +38,10 @@ class MenuUiLanguageTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer menu']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer menu',
+ ]));
// Add some custom languages.
foreach (['aa', 'bb', 'cc', 'cs'] as $language_code) {
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index 5909ee0db5..05b2dd91fc 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -141,7 +141,7 @@ public function testMenuNodeFormWidget() {
$node = $this->drupalGetNodeByTitle($node_title);
// Assert that there is no link for the node.
$this->drupalGet('test-page');
- $this->assertNoLink($node_title);
+ $this->assertSession()->linkNotExists($node_title);
// Edit the node, enable the menu link setting, but skip the link title.
$edit = [
@@ -150,7 +150,7 @@ public function testMenuNodeFormWidget() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
// Assert that there is no link for the node.
$this->drupalGet('test-page');
- $this->assertNoLink($node_title);
+ $this->assertSession()->linkNotExists($node_title);
// Make sure the menu links only appear when the node is published.
// These buttons just appear for 'administer nodes' users.
@@ -171,12 +171,12 @@ public function testMenuNodeFormWidget() {
];
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save');
$this->drupalGet('test-page');
- $this->assertNoLink($node_title, 'Found no menu link with the node unpublished');
+ $this->assertSession()->linkNotExists($node_title, 'Found no menu link with the node unpublished');
// Assert that the link exists if published.
$edit['status[value]'] = TRUE;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save');
$this->drupalGet('test-page');
- $this->assertLink($node_title, 0, 'Found a menu link with the node published');
+ $this->assertSession()->linkExists($node_title, 0, 'Found a menu link with the node published');
// Log back in as normal user.
$this->drupalLogin($this->editor);
@@ -189,7 +189,7 @@ public function testMenuNodeFormWidget() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
// Assert that the link exists.
$this->drupalGet('test-page');
- $this->assertLink($node_title);
+ $this->assertSession()->linkExists($node_title);
$this->drupalGet('node/' . $node->id() . '/edit');
$this->assertFieldById('edit-menu-weight', 17, 'Menu weight correct in edit form');
@@ -213,7 +213,7 @@ public function testMenuNodeFormWidget() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
// Assert that there is no link for the node.
$this->drupalGet('test-page');
- $this->assertNoLink($node_title);
+ $this->assertSession()->linkNotExists($node_title);
// Add a menu link to the Administration menu.
$item = MenuLinkContent::create([
@@ -335,11 +335,11 @@ public function testMultilingualMenuNodeFormWidget() {
// Assert that the original link exists in the frontend.
$this->drupalGet('node/' . $node->id(), ['language' => $languages[$langcodes[0]]]);
- $this->assertLink($node_title);
+ $this->assertSession()->linkExists($node_title);
// Assert that the translated link exists in the frontend.
$this->drupalGet('node/' . $node->id(), ['language' => $languages[$langcodes[1]]]);
- $this->assertLink($translated_node_title);
+ $this->assertSession()->linkExists($translated_node_title);
// Revisit the edit page in original language, check the loaded menu item title and save.
$options = ['language' => $languages[$langcodes[0]]];
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
index 38823057fc..de15179d68 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
@@ -88,7 +88,12 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
// Create users.
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer blocks', 'administer menu', 'create article content']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer blocks',
+ 'administer menu',
+ 'create article content',
+ ]);
$this->authenticatedUser = $this->drupalCreateUser([]);
}
@@ -557,7 +562,13 @@ public function testSystemMenuRename() {
* Tests that menu items pointing to unpublished nodes are editable.
*/
public function testUnpublishedNodeMenuItem() {
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer blocks', 'administer menu', 'create article content', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer blocks',
+ 'administer menu',
+ 'create article content',
+ 'bypass node access',
+ ]));
// Create an unpublished node.
$node = $this->drupalCreateNode([
'type' => 'article',
@@ -704,7 +715,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
if (isset($parent)) {
// Verify menu link.
$title = $parent->getTitle();
- $this->assertLink($title, 0, 'Parent menu link was displayed');
+ $this->assertSession()->linkExists($title, 0, 'Parent menu link was displayed');
// Verify menu link link.
$this->clickLink($title);
@@ -714,7 +725,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
// Verify menu link.
$title = $item->getTitle();
- $this->assertLink($title, 0, 'Menu link was displayed');
+ $this->assertSession()->linkExists($title, 0, 'Menu link was displayed');
// Verify menu link link.
$this->clickLink($title);
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 38b4cbe3ab..f66559032f 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -160,6 +160,7 @@ protected function moduleExists($module) {
* Name of the variable.
* @param $default
* The default value.
+ *
* @return mixed
*/
protected function variableGet($name, $default) {
diff --git a/web/core/modules/node/src/NodeGrantDatabaseStorage.php b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
index 1bea256c20..bacd952c36 100644
--- a/web/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -288,6 +288,7 @@ public function deleteNodeRecords(array $nids) {
*
* @param array $node_access_grants
* An array of grants, as returned by node_access_grants().
+ *
* @return \Drupal\Core\Database\Query\Condition
* A condition object to be passed to $query->condition().
*
diff --git a/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php b/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
index 837d96ce31..5e49d08acc 100644
--- a/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
@@ -29,7 +29,10 @@ class MultiStepNodeFormBasicOptionsTest extends NodeTestBase {
*/
public function testMultiStepNodeFormBasicOptions() {
// Prepare a user to create the node.
- $web_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
+ $web_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'create page content',
+ ]);
$this->drupalLogin($web_user);
// Create an unlimited cardinality field.
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index c5f376b73a..3ed15bc97f 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -100,7 +100,10 @@ public function testNodeAccessBasic() {
// Array of nids marked private.
$private_nodes = [];
for ($i = 0; $i < $num_simple_users; $i++) {
- $simple_users[$i] = $this->drupalCreateUser(['access content', 'create article content']);
+ $simple_users[$i] = $this->drupalCreateUser([
+ 'access content',
+ 'create article content',
+ ]);
}
foreach ($simple_users as $this->webUser) {
$this->drupalLogin($this->webUser);
@@ -160,7 +163,12 @@ public function testNodeAccessBasic() {
}
// Now test that a user with 'node test view' permissions can view content.
- $access_user = $this->drupalCreateUser(['access content', 'create article content', 'node test view', 'search content']);
+ $access_user = $this->drupalCreateUser([
+ 'access content',
+ 'create article content',
+ 'node test view',
+ 'search content',
+ ]);
$this->drupalLogin($access_user);
foreach ($this->nodesByUser as $private_status) {
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index d92b5ef8a8..8f29c65e87 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -51,8 +51,15 @@ protected function setUp() {
node_access_rebuild();
// Create some users.
- $this->adminUser = $this->drupalCreateUser(['access content', 'bypass node access']);
- $this->contentAdminUser = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access content',
+ 'bypass node access',
+ ]);
+ $this->contentAdminUser = $this->drupalCreateUser([
+ 'access content',
+ 'administer content types',
+ 'administer node fields',
+ ]);
// Add a custom field to the page content type.
$this->fieldName = mb_strtolower($this->randomMachineName() . '_field_name');
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
index ba9f2bb154..4352c6c974 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
@@ -50,9 +50,19 @@ protected function setUp() {
// Create user with simple node access permission. The 'node test view'
// permission is implemented and granted by the node_access_test module.
- $this->accessUser = $this->drupalCreateUser(['access content overview', 'access content', 'node test view']);
- $this->noAccessUser = $this->drupalCreateUser(['access content overview', 'access content']);
- $this->noAccessUser2 = $this->drupalCreateUser(['access content overview', 'access content']);
+ $this->accessUser = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ 'node test view',
+ ]);
+ $this->noAccessUser = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ ]);
+ $this->noAccessUser2 = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ ]);
$this->userMapping = [
1 => $this->rootUser,
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
index 54c912345d..fdd35dd64a 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
@@ -59,19 +59,19 @@ public function testNodeAccessMenuLink() {
'menu[title]' => $menu_link_title,
];
$this->drupalPostForm('node/add/page', $edit, t('Save'));
- $this->assertLink($menu_link_title);
+ $this->assertSession()->linkExists($menu_link_title);
// Ensure anonymous users without "access content" permission do not see
// this menu link.
$this->drupalLogout();
$this->drupalGet('');
- $this->assertNoLink($menu_link_title);
+ $this->assertSession()->linkNotExists($menu_link_title);
// Ensure anonymous users with "access content" permission see this menu
// link.
$this->config('user.role.' . RoleInterface::ANONYMOUS_ID)->set('permissions', ['access content'])->save();
$this->drupalGet('');
- $this->assertLink($menu_link_title);
+ $this->assertSession()->linkExists($menu_link_title);
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
index 76acb9f9f4..11fde433a7 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
@@ -34,7 +34,11 @@ protected function setUp() {
node_access_rebuild();
$this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
$this->addDefaultCommentField('node', 'page');
- $this->webUser = $this->drupalCreateUser(['access content', 'access comments', 'node test view']);
+ $this->webUser = $this->drupalCreateUser([
+ 'access content',
+ 'access comments',
+ 'node test view',
+ ]);
}
/**
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
index 8c61404b8d..dae3088328 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
@@ -37,7 +37,11 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access administration pages', 'access site reports']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'access administration pages',
+ 'access site reports',
+ ]);
$this->drupalLogin($this->adminUser);
$this->webUser = $this->drupalCreateUser();
diff --git a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
index 707f0b3ffb..5c4f046f8c 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
@@ -60,10 +60,21 @@ protected function setUp() {
// correctly.
user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, ['view own unpublished content']);
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'access content overview', 'administer nodes', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'access content overview',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->baseUser1 = $this->drupalCreateUser(['access content overview']);
- $this->baseUser2 = $this->drupalCreateUser(['access content overview', 'view own unpublished content']);
- $this->baseUser3 = $this->drupalCreateUser(['access content overview', 'bypass node access']);
+ $this->baseUser2 = $this->drupalCreateUser([
+ 'access content overview',
+ 'view own unpublished content',
+ ]);
+ $this->baseUser3 = $this->drupalCreateUser([
+ 'access content overview',
+ 'bypass node access',
+ ]);
}
/**
diff --git a/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php b/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
index b0b0aae17b..1ed8f982e3 100644
--- a/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
@@ -47,8 +47,16 @@ protected function setUp() {
parent::setUp();
// Create users and test node.
- $this->adminUser = $this->drupalCreateUser(['administer content types', 'administer nodes', 'administer blocks', 'access content overview']);
- $this->webUser = $this->drupalCreateUser(['access content', 'create article content']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer content types',
+ 'administer nodes',
+ 'administer blocks',
+ 'access content overview',
+ ]);
+ $this->webUser = $this->drupalCreateUser([
+ 'access content',
+ 'create article content',
+ ]);
}
/**
diff --git a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
index 62fb395ed4..1791bb0ab8 100644
--- a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -31,7 +31,10 @@ class NodeCreationTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['create page content', 'edit own page content']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ ]);
$this->drupalLogin($web_user);
}
@@ -79,7 +82,10 @@ public function testNodeCreation() {
$this->assertText($this->container->get('date.formatter')->format($node->getCreatedTime()));
// Check if the node revision checkbox is not rendered on node creation form.
- $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'create page content',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('node/add/page');
$this->assertNoFieldById('edit-revision', NULL, 'The revision checkbox is not present.');
@@ -227,7 +233,10 @@ public function testAuthoredDate() {
* Tests the author autocompletion textfield.
*/
public function testAuthorAutocomplete() {
- $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'create page content',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('node/add/page');
@@ -235,7 +244,11 @@ public function testAuthorAutocomplete() {
$result = $this->xpath('//input[@id="edit-uid-0-value" and contains(@data-autocomplete-path, "user/autocomplete")]');
$this->assertCount(0, $result, 'No autocompletion without access user profiles.');
- $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content', 'access user profiles']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'create page content',
+ 'access user profiles',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('node/add/page');
@@ -260,7 +273,9 @@ public function testNodeAddWithoutContentTypes() {
$this->drupalGet('node/add');
$this->assertSession()->statusCodeEquals(403);
- $admin_content_types = $this->drupalCreateUser(['administer content types']);
+ $admin_content_types = $this->drupalCreateUser([
+ 'administer content types',
+ ]);
$this->drupalLogin($admin_content_types);
$this->drupalGet('node/add');
diff --git a/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php b/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
index 9193b6efc9..994c30f1ce 100644
--- a/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
@@ -32,7 +32,10 @@ public function testDisplayConfigurable() {
$node_type->setDisplaySubmitted(TRUE);
$node_type->save();
- $user = $this->drupalCreateUser(['access in-place editing', 'administer nodes']);
+ $user = $this->drupalCreateUser([
+ 'access in-place editing',
+ 'administer nodes',
+ ]);
$this->drupalLogin($user);
$node = $this->drupalCreateNode(['uid' => $user->id()]);
$assert = $this->assertSession();
diff --git a/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php b/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
index 62d0a61006..8e39d08456 100644
--- a/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
@@ -48,8 +48,14 @@ class NodeEditFormTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $this->webUser = $this->drupalCreateUser(['edit own page content', 'create page content']);
- $this->adminUser = $this->drupalCreateUser(['bypass node access', 'administer nodes']);
+ $this->webUser = $this->drupalCreateUser([
+ 'edit own page content',
+ 'create page content',
+ ]);
+ $this->adminUser = $this->drupalCreateUser([
+ 'bypass node access',
+ 'administer nodes',
+ ]);
$this->drupalPlaceBlock('local_tasks_block');
$this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
@@ -95,7 +101,10 @@ public function testNodeEdit() {
$this->assertText($edit[$body_key], 'Body displayed.');
// Log in as a second administrator user.
- $second_web_user = $this->drupalCreateUser(['administer nodes', 'edit any page content']);
+ $second_web_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'edit any page content',
+ ]);
$this->drupalLogin($second_web_user);
// Edit the same node, creating a new revision.
$this->drupalGet("node/" . $node->id() . "/edit");
diff --git a/web/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php b/web/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
index c51af5d42c..31f32aba16 100644
--- a/web/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
@@ -28,7 +28,10 @@ class NodeEntityViewModeAlterTest extends NodeTestBase {
* Create a "Basic page" node and verify its consistency in the database.
*/
public function testNodeViewModeChange() {
- $web_user = $this->drupalCreateUser(['create page content', 'edit own page content']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ ]);
$this->drupalLogin($web_user);
// Create a node.
diff --git a/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php b/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
index 2d1f97472d..2bf6b30e3e 100644
--- a/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
@@ -34,7 +34,13 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Setup users.
- $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages', 'create page content', 'edit own page content']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'administer content types',
+ 'access administration pages',
+ 'create page content',
+ 'edit own page content',
+ ]);
$this->drupalLogin($admin_user);
// Add a new language.
diff --git a/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php b/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
index 6dfd5a73c2..f16453e2bf 100644
--- a/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
@@ -44,7 +44,11 @@ protected function setUp() {
'name' => 'Article',
]);
- $this->authorUser = $this->drupalCreateUser(['access content', 'create article content', 'edit any article content'], 'author');
+ $this->authorUser = $this->drupalCreateUser([
+ 'access content',
+ 'create article content',
+ 'edit any article content',
+ ], 'author');
$this->drupalLogin($this->authorUser);
// Create one node of the above node type .
diff --git a/web/core/modules/node/tests/src/Functional/NodeLinksTest.php b/web/core/modules/node/tests/src/Functional/NodeLinksTest.php
index 31b222d5aa..67500661a7 100644
--- a/web/core/modules/node/tests/src/Functional/NodeLinksTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeLinksTest.php
@@ -35,7 +35,7 @@ public function testHideLinks() {
// Links are displayed by default.
$this->drupalGet('node');
$this->assertText($node->getTitle());
- $this->assertLink('Read more');
+ $this->assertSession()->linkExists('Read more');
// Hide links.
\Drupal::service('entity_display.repository')
@@ -45,7 +45,7 @@ public function testHideLinks() {
$this->drupalGet('node');
$this->assertText($node->getTitle());
- $this->assertNoLink('Read more');
+ $this->assertSession()->linkNotExists('Read more');
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
index 5f503e358d..effa4f52d0 100644
--- a/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
@@ -25,7 +25,10 @@ class NodeLoadMultipleTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['create article content', 'create page content']);
+ $web_user = $this->drupalCreateUser([
+ 'create article content',
+ 'create page content',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
index 5e788b507b..02a6d4602c 100644
--- a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
@@ -18,7 +18,11 @@ class NodePostSettingsTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['create page content', 'administer content types', 'access user profiles']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'administer content types',
+ 'access user profiles',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
index 3771323006..11ca8549b2 100644
--- a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
@@ -46,9 +46,19 @@ protected function setUp() {
// Create user with simple node access permission. The 'node test view'
// permission is implemented and granted by the node_access_test module.
- $this->accessUser = $this->drupalCreateUser(['access content overview', 'access content', 'node test view']);
- $this->noAccessUser = $this->drupalCreateUser(['access content overview', 'access content']);
- $this->noAccessUser2 = $this->drupalCreateUser(['access content overview', 'access content']);
+ $this->accessUser = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ 'node test view',
+ ]);
+ $this->noAccessUser = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ ]);
+ $this->noAccessUser2 = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ ]);
}
/**
diff --git a/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
index 6dd1592228..fa81958d94 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -33,7 +33,11 @@ protected function setUp() {
// Use bypass node access permission here, because the test class uses
// hook_grants_alter() to deny access to everyone on node_access
// queries.
- $user = $this->drupalCreateUser(['bypass node access', 'access content', 'create article content']);
+ $user = $this->drupalCreateUser([
+ 'bypass node access',
+ 'access content',
+ 'create article content',
+ ]);
$this->drupalLogin($user);
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
index 3418bcb269..12625c799d 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
@@ -87,7 +87,10 @@ public function testNodeRevisionAccessAnyType() {
}
// Create an admin account (returns TRUE for all revision permissions).
- $admin_account = $this->drupalCreateUser(['access content', 'administer nodes']);
+ $admin_account = $this->drupalCreateUser([
+ 'access content',
+ 'administer nodes',
+ ]);
$admin_account->is_admin = TRUE;
$this->accounts['admin'] = $admin_account;
$accounts['admin'] = $admin_account;
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
index d63bb7dca3..c4062b0731 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
@@ -76,7 +76,7 @@ public function testDisplayRevisionTab() {
$this->assertUrl($node->toUrl());
// Verify revisions exist since the content type has revisions enabled.
- $this->assertLink(t('Revisions'));
+ $this->assertSession()->linkExists(t('Revisions'));
// Verify the checkbox is checked on the node edit form.
$this->drupalGet('node/' . $node->id() . '/edit');
@@ -87,7 +87,7 @@ public function testDisplayRevisionTab() {
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save');
$this->assertUrl($node->toUrl());
- $this->assertLink(t('Revisions'));
+ $this->assertSession()->linkExists(t('Revisions'));
// Unset page revision setting 'create new revision'. This will mean new
// revisions are not created by default when the node is edited.
@@ -108,7 +108,7 @@ public function testDisplayRevisionTab() {
$this->assertUrl($node->toUrl());
// Verify that no link to revisions is displayed since the type
// has the 'create new revision' setting unset.
- $this->assertNoLink(t('Revisions'));
+ $this->assertSession()->linkNotExists(t('Revisions'));
// Verify the checkbox is unchecked on the node edit form.
$this->drupalGet('node/' . $node->id() . '/edit');
@@ -121,7 +121,7 @@ public function testDisplayRevisionTab() {
$this->assertUrl($node->toUrl());
// Verify that the link is displayed since a new revision is created and
// the 'create new revision' checkbox on the node is checked.
- $this->assertLink(t('Revisions'));
+ $this->assertSession()->linkExists(t('Revisions'));
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeTitleTest.php b/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
index ff6c432e81..152aed37c4 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
@@ -41,7 +41,12 @@ protected function setUp() {
$this->drupalPlaceBlock('system_breadcrumb_block');
$this->drupalPlaceBlock('page_title_block');
- $this->adminUser = $this->drupalCreateUser(['administer nodes', 'create article content', 'create page content', 'post comments']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer nodes',
+ 'create article content',
+ 'create page content',
+ 'post comments',
+ ]);
$this->drupalLogin($this->adminUser);
$this->addDefaultCommentField('node', 'page');
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php b/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
index a5302e7042..6207a0bbf6 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
@@ -22,7 +22,10 @@ class NodeTitleXSSTest extends NodeTestBase {
*/
public function testNodeTitleXSS() {
// Prepare a user to do the stuff.
- $web_user = $this->drupalCreateUser(['create page content', 'edit any page content']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit any page content',
+ ]);
$this->drupalLogin($web_user);
$xss = '<script>alert("xss")</script>';
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
index 8d970e7d9a..ee875d1b5d 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
@@ -26,7 +26,14 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer languages']);
+ $web_user = $this->drupalCreateUser([
+ 'bypass node access',
+ 'administer content types',
+ 'administer node fields',
+ 'administer node form display',
+ 'administer node display',
+ 'administer languages',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
index 7e9498254e..b19b3d72b6 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
@@ -60,14 +60,19 @@ public function testNodeTypeCreation() {
$this->assertTrue($type_exists, 'The new content type has been created in the database.');
// Log in a test user.
- $web_user = $this->drupalCreateUser(['create ' . $type->label() . ' content']);
+ $web_user = $this->drupalCreateUser([
+ 'create ' . $type->label() . ' content',
+ ]);
$this->drupalLogin($web_user);
$this->drupalGet('node/add/' . $type->id());
$this->assertSession()->statusCodeEquals(200);
// Create a content type via the user interface.
- $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types']);
+ $web_user = $this->drupalCreateUser([
+ 'bypass node access',
+ 'administer content types',
+ ]);
$this->drupalLogin($web_user);
$this->drupalGet('node/add');
@@ -96,7 +101,11 @@ public function testNodeTypeCreation() {
public function testNodeTypeEditing() {
$assert = $this->assertSession();
$this->drupalPlaceBlock('system_breadcrumb_block');
- $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types', 'administer node fields']);
+ $web_user = $this->drupalCreateUser([
+ 'bypass node access',
+ 'administer content types',
+ 'administer node fields',
+ ]);
$this->drupalLogin($web_user);
$field = FieldConfig::loadByName('node', 'page', 'body');
@@ -202,7 +211,7 @@ public function testNodeTypeDeletion() {
// way installing a module through the UI does.
$this->resetAll();
$this->drupalGet('admin/structure/types/manage/default');
- $this->assertNoLink(t('Delete'));
+ $this->assertSession()->linkNotExists(t('Delete'));
$this->drupalGet('admin/structure/types/manage/default/delete');
$this->assertSession()->statusCodeEquals(403);
$this->container->get('module_installer')->uninstall(['node_test_config']);
@@ -221,7 +230,10 @@ public function testNodeTypeDeletion() {
*/
public function testNodeTypeFieldUiPermissions() {
// Create an admin user who can only manage node fields.
- $admin_user_1 = $this->drupalCreateUser(['administer content types', 'administer node fields']);
+ $admin_user_1 = $this->drupalCreateUser([
+ 'administer content types',
+ 'administer node fields',
+ ]);
$this->drupalLogin($admin_user_1);
// Test that the user only sees the actions available to them.
@@ -230,7 +242,10 @@ public function testNodeTypeFieldUiPermissions() {
$this->assertNoLinkByHref('admin/structure/types/manage/article/display');
// Create another admin user who can manage node fields display.
- $admin_user_2 = $this->drupalCreateUser(['administer content types', 'administer node display']);
+ $admin_user_2 = $this->drupalCreateUser([
+ 'administer content types',
+ 'administer node display',
+ ]);
$this->drupalLogin($admin_user_2);
// Test that the user only sees the actions available to them.
diff --git a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
index aa9c6477f4..0b9bb2d78f 100644
--- a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -59,7 +59,11 @@ protected function setUp() {
parent::setUp();
$this->addDefaultCommentField('node', 'page');
- $web_user = $this->drupalCreateUser(['edit own page content', 'create page content', 'administer menu']);
+ $web_user = $this->drupalCreateUser([
+ 'edit own page content',
+ 'create page content',
+ 'administer menu',
+ ]);
$this->drupalLogin($web_user);
// Add a vocabulary so we can test different view modes.
@@ -200,10 +204,10 @@ public function testPagePreview() {
// Check that the preview is displaying the title, body and term.
$expected_title = $edit[$title_key] . ' | Drupal';
$this->assertSession()->titleEquals($expected_title);
- $this->assertEscaped($edit[$title_key], 'Title displayed and escaped.');
+ $this->assertEscaped($edit[$title_key]);
$this->assertText($edit[$body_key], 'Body displayed.');
$this->assertText($edit[$term_key], 'Term displayed.');
- $this->assertLink(t('Back to content editing'));
+ $this->assertSession()->linkExists(t('Back to content editing'));
// Check that we see the class of the node type on the body element.
$body_class_element = $this->xpath("//body[contains(@class, 'page-node-type-page')]");
@@ -240,10 +244,10 @@ public function testPagePreview() {
// Return to page preview to check everything is as expected.
$this->drupalPostForm(NULL, [], t('Preview'));
$this->assertSession()->titleEquals($expected_title);
- $this->assertEscaped($edit[$title_key], 'Title displayed and escaped.');
+ $this->assertEscaped($edit[$title_key]);
$this->assertText($edit[$body_key], 'Body displayed.');
$this->assertText($edit[$term_key], 'Term displayed.');
- $this->assertLink(t('Back to content editing'));
+ $this->assertSession()->linkExists(t('Back to content editing'));
// Assert the content is kept when reloading the page.
$this->drupalGet('node/add/page', ['query' => ['uuid' => $uuid]]);
@@ -274,9 +278,9 @@ public function testPagePreview() {
$this->assertRaw('>' . $newterm1 . '<', 'First new term displayed.');
$this->assertRaw('>' . $newterm2 . '<', 'Second new term displayed.');
// The first term should be displayed as link, the others not.
- $this->assertLink($this->term->getName());
- $this->assertNoLink($newterm1);
- $this->assertNoLink($newterm2);
+ $this->assertSession()->linkExists($this->term->getName());
+ $this->assertSession()->linkNotExists($newterm1);
+ $this->assertSession()->linkNotExists($newterm2);
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
@@ -290,9 +294,9 @@ public function testPagePreview() {
$this->assertRaw('>' . $newterm2 . '<', 'Second existing term displayed.');
$this->assertRaw('>' . $newterm3 . '<', 'Third new term displayed.');
$this->assertNoText($this->term->getName());
- $this->assertLink($newterm1);
- $this->assertLink($newterm2);
- $this->assertNoLink($newterm3);
+ $this->assertSession()->linkExists($newterm1);
+ $this->assertSession()->linkExists($newterm2);
+ $this->assertSession()->linkNotExists($newterm3);
// Check that editing an existing node after it has been previewed and not
// saved doesn't remember the previous changes.
diff --git a/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php b/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
index 0de0ed127a..79231fcf0e 100644
--- a/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
@@ -161,7 +161,12 @@ public function testNodeDeleteAccess() {
'uid' => $author->id(),
]);
// Create an account that may view the private node, but not delete it.
- $account = $this->drupalCreateUser(['access content', 'administer nodes', 'delete own article content', 'node test view']);
+ $account = $this->drupalCreateUser([
+ 'access content',
+ 'administer nodes',
+ 'delete own article content',
+ 'node test view',
+ ]);
// Create a node that may be deleted too, to ensure the delete confirmation
// page is shown later. In node_access_test.module, nodes may only be
// deleted by the author.
diff --git a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
index 99a9534c50..2e57f5e7e1 100644
--- a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
@@ -91,7 +91,11 @@ protected function setUp($import_test_views = TRUE) {
$this->assertCount(10, $view->result, 'All created translations are selected.');
// Check the operations are accessible to the logged in user.
- $this->drupalLogin($this->drupalCreateUser(['administer nodes', 'access content overview', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer nodes',
+ 'access content overview',
+ 'bypass node access',
+ ]));
$this->drupalGet('test-node-bulk-form');
$elements = $this->xpath('//select[@id="edit-action"]//option');
$this->assertCount(8, $elements, 'All node operations are found.');
diff --git a/web/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php b/web/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
index e5597d07ba..6040a67393 100644
--- a/web/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
@@ -53,7 +53,10 @@ protected function setUp($import_test_views = TRUE) {
$this->users = [];
for ($i = 0; $i < $num_simple_users; $i++) {
- $this->users[$i] = $this->drupalCreateUser(['access content', 'create article content']);
+ $this->users[$i] = $this->drupalCreateUser([
+ 'access content',
+ 'create article content',
+ ]);
}
foreach ($this->users as $web_user) {
$this->drupalLogin($web_user);
@@ -100,7 +103,10 @@ public function testFilterNodeAccess() {
$this->assertNoText('Private Article created by ' . $this->users[0]->getAccountName());
// Test that a user with administer nodes permission can't see all nodes.
- $administer_nodes_user = $this->drupalCreateUser(['access content', 'administer nodes']);
+ $administer_nodes_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer nodes',
+ ]);
$this->drupalLogin($administer_nodes_user);
$this->drupalGet('test_filter_node_access');
$this->assertNoText('Private Article created by ' . $this->users[0]->getAccountName());
@@ -109,7 +115,10 @@ public function testFilterNodeAccess() {
$this->assertText('Public Article created by ' . $this->users[1]->getAccountName());
// Test that a user with bypass node access can see all nodes.
- $bypass_access_user = $this->drupalCreateUser(['access content', 'bypass node access']);
+ $bypass_access_user = $this->drupalCreateUser([
+ 'access content',
+ 'bypass node access',
+ ]);
$this->drupalLogin($bypass_access_user);
$this->drupalGet('test_filter_node_access');
$this->assertText('Private Article created by ' . $this->users[0]->getAccountName());
diff --git a/web/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php b/web/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
index 012f6dd57c..d506f69441 100644
--- a/web/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
@@ -103,7 +103,10 @@ protected function setUp($import_test_views = TRUE) {
$this->container->get('router.builder')->rebuild();
- $user = $this->drupalCreateUser(['access content overview', 'access content']);
+ $user = $this->drupalCreateUser([
+ 'access content overview',
+ 'access content',
+ ]);
$this->drupalLogin($user);
}
diff --git a/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php b/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
index 55c4d0082b..64b930bb67 100644
--- a/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
@@ -32,7 +32,13 @@ public function testRevisionLinks() {
// Create one user which can view/revert and delete and one which can only
// do one of them.
$this->drupalCreateContentType(['name' => 'page', 'type' => 'page']);
- $account = $this->drupalCreateUser(['revert all revisions', 'view all revisions', 'delete all revisions', 'edit any page content', 'delete any page content']);
+ $account = $this->drupalCreateUser([
+ 'revert all revisions',
+ 'view all revisions',
+ 'delete all revisions',
+ 'edit any page content',
+ 'delete any page content',
+ ]);
$this->drupalLogin($account);
// Create two nodes, one without an additional revision and one with a
// revision.
@@ -70,8 +76,14 @@ public function testRevisionLinks() {
$accounts = [
'view' => $this->drupalCreateUser(['view all revisions']),
- 'revert' => $this->drupalCreateUser(['revert all revisions', 'edit any page content']),
- 'delete' => $this->drupalCreateUser(['delete all revisions', 'delete any page content']),
+ 'revert' => $this->drupalCreateUser([
+ 'revert all revisions',
+ 'edit any page content',
+ ]),
+ 'delete' => $this->drupalCreateUser([
+ 'delete all revisions',
+ 'delete any page content',
+ ]),
];
$url = $nodes[1]->toUrl()->toString();
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
index c6314385fe..da96fc1098 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
@@ -150,7 +150,10 @@ public function testNodeAccessPrivate() {
// Creating a private node with langcode Catalan to test that the
// node_access_test_secret_catalan flag works.
- $private_ca_user = $this->drupalCreateUser(['access content', 'node test view']);
+ $private_ca_user = $this->drupalCreateUser([
+ 'access content',
+ 'node test view',
+ ]);
$node_private_ca = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'ca', 'private' => TRUE]);
$this->assertTrue($node_private_ca->language()->getId() == 'ca', 'Node created as Catalan.');
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index f4e1683b6c..607260e8e3 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -64,7 +64,17 @@ protected function setUp() {
parent::setUp();
// Create test user.
- $admin_user = $this->drupalCreateUser(['access content', 'administer taxonomy', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'bypass node access', 'administer node fields', 'administer node display']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content',
+ 'administer taxonomy',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer content types',
+ 'administer nodes',
+ 'bypass node access',
+ 'administer node fields',
+ 'administer node display',
+ ]);
$this->drupalLogin($admin_user);
// Create content type, with underscores.
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
index 8b3ef78241..00fa57e560 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
@@ -35,7 +35,17 @@ protected function setUp() {
parent::setUp();
// Create test user.
- $admin_user = $this->drupalCreateUser(['synchronize configuration', 'access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'bypass node access', 'administer node fields', 'administer node display']);
+ $admin_user = $this->drupalCreateUser([
+ 'synchronize configuration',
+ 'access content',
+ 'access administration pages',
+ 'administer site configuration',
+ 'administer content types',
+ 'administer nodes',
+ 'bypass node access',
+ 'administer node fields',
+ 'administer node display',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php b/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
index 6738dbf68c..a0f88aa5e5 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
@@ -22,7 +22,10 @@ public function testSelectListDynamic() {
$this->entity->save();
// Create a web user.
- $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
+ $web_user = $this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]);
$this->drupalLogin($web_user);
// Display form.
diff --git a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
index 7b3ac433d0..306121a061 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
@@ -112,7 +112,10 @@ protected function setUp() {
$this->float->save();
// Create a web user.
- $this->drupalLogin($this->drupalCreateUser(['view test entity', 'administer entity_test content']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'view test entity',
+ 'administer entity_test content',
+ ]));
}
/**
diff --git a/web/core/modules/path/tests/src/Functional/PathAdminTest.php b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
index 2ac11efa6a..dbf4154d51 100644
--- a/web/core/modules/path/tests/src/Functional/PathAdminTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
@@ -25,7 +25,12 @@ protected function setUp() {
parent::setUp();
// Create test user and log in.
- $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ 'administer url aliases',
+ 'create url aliases',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/path/tests/src/Functional/PathAliasTest.php b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
index b325069550..9216535779 100644
--- a/web/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -30,7 +30,13 @@ protected function setUp() {
parent::setUp();
// Create test user and log in.
- $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases', 'access content overview']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ 'administer url aliases',
+ 'create url aliases',
+ 'access content overview',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
index 6ab6e2c22c..34268d41c9 100644
--- a/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
@@ -27,7 +27,14 @@ protected function setUp() {
parent::setUp();
// Create and log in user.
- $web_user = $this->drupalCreateUser(['edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages']);
+ $web_user = $this->drupalCreateUser([
+ 'edit any page content',
+ 'create page content',
+ 'administer url aliases',
+ 'create url aliases',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($web_user);
// Enable French language.
diff --git a/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
index 66c6198cc9..cf009193af 100644
--- a/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
@@ -25,7 +25,10 @@ protected function setUp() {
parent::setUp();
// Create test user and log in.
- $web_user = $this->drupalCreateUser(['create page content', 'create url aliases']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'create url aliases',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index 5bb92e2e8c..586fae1080 100644
--- a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -35,7 +35,11 @@ protected function setUp() {
$vocabulary->save();
// Create and log in user.
- $web_user = $this->drupalCreateUser(['administer url aliases', 'administer taxonomy', 'access administration pages']);
+ $web_user = $this->drupalCreateUser([
+ 'administer url aliases',
+ 'administer taxonomy',
+ 'access administration pages',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/quickedit/src/MetadataGeneratorInterface.php b/web/core/modules/quickedit/src/MetadataGeneratorInterface.php
index a319ae439e..a739fb2b6b 100644
--- a/web/core/modules/quickedit/src/MetadataGeneratorInterface.php
+++ b/web/core/modules/quickedit/src/MetadataGeneratorInterface.php
@@ -15,6 +15,7 @@ interface MetadataGeneratorInterface {
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity, in the language in which one of its fields is being edited.
+ *
* @return array
* An array containing metadata with the following keys:
* - label: the user-visible label for the entity in the given language.
@@ -28,6 +29,7 @@ public function generateEntityMetadata(EntityInterface $entity);
* The field values to be in-place edited.
* @param string $view_mode
* The view mode the field should be rerendered in.
+ *
* @return array
* An array containing metadata with the following keys:
* - label: the user-visible label for the field.
diff --git a/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
index 5c80dc1815..129e348ae9 100644
--- a/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
@@ -158,7 +158,7 @@ public function testCommentRdfAuthorMarkup() {
// Ensure that the author link still works properly after the author output
// is modified by the RDF module.
$this->drupalGet('node/' . $this->node->id());
- $this->assertLink($this->webUser->getAccountName());
+ $this->assertSession()->linkExists($this->webUser->getAccountName());
$this->assertLinkByHref('user/' . $this->webUser->id());
}
diff --git a/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
index ce76ba3160..d662a3fcf2 100644
--- a/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
@@ -52,7 +52,10 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['bypass node access', 'administer taxonomy']);
+ $web_user = $this->drupalCreateUser([
+ 'bypass node access',
+ 'administer taxonomy',
+ ]);
$this->drupalLogin($web_user);
$this->vocabulary = $this->createVocabulary();
diff --git a/web/core/modules/rest/src/Routing/ResourceRoutes.php b/web/core/modules/rest/src/Routing/ResourceRoutes.php
index 0588a01219..9809ee0794 100644
--- a/web/core/modules/rest/src/Routing/ResourceRoutes.php
+++ b/web/core/modules/rest/src/Routing/ResourceRoutes.php
@@ -58,6 +58,7 @@ public function __construct(ResourcePluginManager $manager, EntityTypeManagerInt
*
* @param \Drupal\Core\Routing\RouteBuildEvent $event
* The route build event.
+ *
* @return array
*/
public function onDynamicRouteEvent(RouteBuildEvent $event) {
diff --git a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
index 40165c81b8..7bbfb27af6 100644
--- a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
+++ b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
@@ -77,7 +77,12 @@ protected function setUp($import_test_views = TRUE) {
ViewTestData::createTestViews(get_class($this), ['rest_test_views']);
- $this->adminUser = $this->drupalCreateUser(['administer views', 'administer entity_test content', 'access user profiles', 'view test entity']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer views',
+ 'administer entity_test content',
+ 'access user profiles',
+ 'view test entity',
+ ]);
// Save some entity_test entities.
for ($i = 1; $i <= 10; $i++) {
diff --git a/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php b/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
index 099663ed59..9907445d80 100644
--- a/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
@@ -35,7 +35,12 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
// Create and log in user.
- $test_user = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'administer nodes']);
+ $test_user = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'use advanced search',
+ 'administer nodes',
+ ]);
$this->drupalLogin($test_user);
// Create initial node.
diff --git a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
index bef1643590..261f8d1473 100644
--- a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
@@ -134,7 +134,7 @@ public function testSearchFormBlock() {
$name = $this->adminUser->getAccountName();
$email = $this->adminUser->getEmail();
$this->drupalPostForm('node', ['keys' => $name], t('Search'));
- $this->assertLink($name);
+ $this->assertSession()->linkExists($name);
}
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
index 03520359ad..a6fcd2b274 100644
--- a/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
@@ -52,7 +52,13 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
// Create searching user.
- $this->searchingUser = $this->drupalCreateUser(['search content', 'access content', 'access comments', 'post comments', 'skip comment approval']);
+ $this->searchingUser = $this->drupalCreateUser([
+ 'search content',
+ 'access content',
+ 'access comments',
+ 'post comments',
+ 'skip comment approval',
+ ]);
// Log in with sufficient privileges.
$this->drupalLogin($this->searchingUser);
diff --git a/web/core/modules/search/tests/src/Functional/SearchCommentTest.php b/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
index c513be8d53..9d280d4da7 100644
--- a/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
@@ -173,7 +173,7 @@ public function testSearchResultsComment() {
// Verify that comment is rendered using proper format.
$this->assertText($comment_body, 'Comment body text found in search results.');
$this->assertNoRaw(t('n/a'), 'HTML in comment body is not hidden.');
- $this->assertNoEscaped($edit_comment['comment_body[0][value]'], 'HTML in comment body is not escaped.');
+ $this->assertNoEscaped($edit_comment['comment_body[0][value]']);
// Search for the evil script comment subject.
$edit = [
diff --git a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
index b1d119ac7b..9d0c1f5f8e 100644
--- a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
@@ -52,7 +52,16 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Log in as a user that can create and search content.
- $this->searchUser = $this->drupalCreateUser(['search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks', 'access site reports']);
+ $this->searchUser = $this->drupalCreateUser([
+ 'search content',
+ 'administer search',
+ 'administer nodes',
+ 'bypass node access',
+ 'access user profiles',
+ 'administer users',
+ 'administer blocks',
+ 'access site reports',
+ ]);
$this->drupalLogin($this->searchUser);
// Add a single piece of content and index it.
@@ -104,7 +113,7 @@ public function testSearchSettingsPage() {
$text = $this->randomMachineName(5);
$this->drupalPostForm('search/node', ['keys' => $text], t('Search'));
$this->drupalGet('admin/reports/dblog');
- $this->assertNoLink('Searched Content for ' . $text . '.', 'Search was not logged');
+ $this->assertSession()->linkNotExists('Searched Content for ' . $text . '.', 'Search was not logged');
// Turn on logging.
$edit = ['logging' => TRUE];
@@ -112,7 +121,7 @@ public function testSearchSettingsPage() {
$text = $this->randomMachineName(5);
$this->drupalPostForm('search/node', ['keys' => $text], t('Search'));
$this->drupalGet('admin/reports/dblog');
- $this->assertLink('Searched Content for ' . $text . '.', 0, 'Search was logged');
+ $this->assertSession()->linkExists('Searched Content for ' . $text . '.', 0, 'Search was logged');
}
@@ -314,7 +323,7 @@ public function testMultipleSearchPages() {
// Disable the first search page.
$this->clickLink(t('Disable'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertNoLink(t('Disable'));
+ $this->assertSession()->linkNotExists(t('Disable'));
$this->verifySearchPageOperations($first_id, TRUE, TRUE, FALSE, TRUE);
$this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
diff --git a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
index f2b05c76f4..e8d5b81c37 100644
--- a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
@@ -33,7 +33,15 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create and log in user.
- $test_user = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'administer nodes', 'administer languages', 'access administration pages', 'administer site configuration']);
+ $test_user = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'use advanced search',
+ 'administer nodes',
+ 'administer languages',
+ 'access administration pages',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($test_user);
// Add a new language.
@@ -78,8 +86,8 @@ public function testDateIntervalQueryAlter() {
// The nodes must have the same node ID but the created date is different.
// So only the Spanish translation must appear.
- $this->assertLink('Node ES', 0, 'Spanish translation found in search results');
- $this->assertNoLink('Node EN', 'Search results do not contain English node');
+ $this->assertSession()->linkExists('Node ES', 0, 'Spanish translation found in search results');
+ $this->assertSession()->linkNotExists('Node EN', 'Search results do not contain English node');
}
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php b/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
index 80033b4de7..ad2d385048 100644
--- a/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
@@ -41,7 +41,11 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create a user and a node, and update the search index.
- $test_user = $this->drupalCreateUser(['access content', 'search content', 'administer nodes']);
+ $test_user = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'administer nodes',
+ ]);
$this->drupalLogin($test_user);
$this->node = $this->drupalCreateNode();
diff --git a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
index 58e97f1c9d..35a4428e20 100644
--- a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
@@ -42,7 +42,12 @@ protected function setUp() {
parent::setUp();
// Create searching user.
- $this->searchingUser = $this->drupalCreateUser(['search content', 'access content', 'access comments', 'skip comment approval']);
+ $this->searchingUser = $this->drupalCreateUser([
+ 'search content',
+ 'access content',
+ 'access comments',
+ 'skip comment approval',
+ ]);
// Log in with sufficient privileges.
$this->drupalLogin($this->searchingUser);
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
index f30787ca8b..63b04481b0 100644
--- a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
@@ -37,7 +37,15 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create and log in user.
- $test_user = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'administer nodes', 'administer languages', 'access administration pages', 'administer site configuration']);
+ $test_user = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'use advanced search',
+ 'administer nodes',
+ 'administer languages',
+ 'access administration pages',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($test_user);
// Add a new language.
@@ -121,12 +129,12 @@ public function testLanguages() {
$edit = ['keys' => 'node', 'language[es]' => TRUE];
$this->drupalPostForm('search/node', $edit, 'edit-submit--2');
// Check for Spanish results.
- $this->assertLink('Second node this is the Spanish title', 0, 'Second node Spanish title found in search results');
- $this->assertLink('Third node es', 0, 'Third node Spanish found in search results');
+ $this->assertSession()->linkExists('Second node this is the Spanish title', 0, 'Second node Spanish title found in search results');
+ $this->assertSession()->linkExists('Third node es', 0, 'Third node Spanish found in search results');
// Ensure that results don't contain other language nodes.
- $this->assertNoLink('First node en', 'Search results do not contain first English node');
- $this->assertNoLink('Second node en', 'Search results do not contain second English node');
- $this->assertNoLink('Third node en', 'Search results do not contain third English node');
+ $this->assertSession()->linkNotExists('First node en', 'Search results do not contain first English node');
+ $this->assertSession()->linkNotExists('Second node en', 'Search results do not contain second English node');
+ $this->assertSession()->linkNotExists('Third node en', 'Search results do not contain third English node');
// Change the default language and delete English.
$path = 'admin/config/regional/language';
diff --git a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
index e3197150fb..ed9d944391 100644
--- a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
@@ -52,7 +52,14 @@ protected function setUp() {
// Create a user who can administer search, do searches, see the status
// report, and administer cron. Log in.
- $user = $this->drupalCreateUser(['administer search', 'search content', 'use advanced search', 'access content', 'access site reports', 'administer site configuration']);
+ $user = $this->drupalCreateUser([
+ 'administer search',
+ 'search content',
+ 'use advanced search',
+ 'access content',
+ 'access site reports',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($user);
// Set up the search plugin.
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
index 2e7150d8d2..e9751cb0f9 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
@@ -36,7 +36,12 @@ protected function setUp() {
node_access_rebuild();
// Create a test user and log in.
- $this->testUser = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'access user profiles']);
+ $this->testUser = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'use advanced search',
+ 'access user profiles',
+ ]);
$this->drupalLogin($this->testUser);
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
index 02945562a7..9fb4cda5d5 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
@@ -35,7 +35,12 @@ protected function setUp() {
node_access_rebuild();
// Create a test user and log in.
- $this->testUser = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'access user profiles']);
+ $this->testUser = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ 'use advanced search',
+ 'access user profiles',
+ ]);
$this->drupalLogin($this->testUser);
}
@@ -59,7 +64,7 @@ public function testPhraseSearchPunctuation() {
// Check if the author is linked correctly to the user profile page.
$username = $node->getOwner()->getAccountName();
- $this->assertLink($username);
+ $this->assertSession()->linkExists($username);
// Search for "&" and verify entities are not broken up in the output.
$edit = ['keys' => '&'];
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php b/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
index 6f2a4941cc..4e984037d3 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
@@ -36,7 +36,10 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create a test user and log in.
- $this->testUser = $this->drupalCreateUser(['access content', 'search content']);
+ $this->testUser = $this->drupalCreateUser([
+ 'access content',
+ 'search content',
+ ]);
$this->drupalLogin($this->testUser);
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php b/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
index 8888b4ddc5..f25afa3d73 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
@@ -65,7 +65,12 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
- $this->testUser = $this->drupalCreateUser(['search content', 'access content', 'administer nodes', 'access site reports']);
+ $this->testUser = $this->drupalCreateUser([
+ 'search content',
+ 'access content',
+ 'administer nodes',
+ 'access site reports',
+ ]);
$this->drupalLogin($this->testUser);
foreach ($this->numbers as $num) {
diff --git a/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php b/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
index 43dd788d17..f65e12e0f0 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
@@ -71,7 +71,12 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
- $this->testUser = $this->drupalCreateUser(['search content', 'access content', 'administer nodes', 'access site reports']);
+ $this->testUser = $this->drupalCreateUser([
+ 'search content',
+ 'access content',
+ 'administer nodes',
+ 'access site reports',
+ ]);
$this->drupalLogin($this->testUser);
foreach ($this->numbers as $doc => $num) {
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php b/web/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
index daa55efaee..1e6ff7846e 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
@@ -53,7 +53,10 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create user.
- $this->searchingUser = $this->drupalCreateUser(['search content', 'access user profiles']);
+ $this->searchingUser = $this->drupalCreateUser([
+ 'search content',
+ 'access user profiles',
+ ]);
// Create a node and update the search index.
$this->node = $this->drupalCreateNode(['title' => 'bike shed shop']);
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
index 2faac41a5a..d7cf74defe 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
@@ -35,7 +35,10 @@ protected function setUp() {
parent::setUp();
// Log in as a user that can create and search content.
- $this->searchUser = $this->drupalCreateUser(['search content', 'administer search']);
+ $this->searchUser = $this->drupalCreateUser([
+ 'search content',
+ 'administer search',
+ ]);
$this->drupalLogin($this->searchUser);
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
index f9c8891f95..62999854fe 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
@@ -39,7 +39,11 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Create user.
- $this->searchingUser = $this->drupalCreateUser(['search content', 'access user profiles', 'use advanced search']);
+ $this->searchingUser = $this->drupalCreateUser([
+ 'search content',
+ 'access user profiles',
+ 'use advanced search',
+ ]);
$this->drupalPlaceBlock('local_tasks_block');
$this->drupalPlaceBlock('page_title_block');
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php b/web/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
index bcfd7e2692..fa705b28ae 100644
--- a/web/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
@@ -29,7 +29,10 @@ public function testQueryAlter() {
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
// Log in with sufficient privileges.
- $this->drupalLogin($this->drupalCreateUser(['create page content', 'search content']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'create page content',
+ 'search content',
+ ]));
// Create a node and an article with the same keyword. The query alter
// test module will alter the query so only articles should be returned.
diff --git a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
index 8b29beda67..189ffce492 100644
--- a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
@@ -49,7 +49,12 @@ protected function setUp() {
$this->nodeSearch = SearchPage::load('node_search');
// Log in with sufficient privileges.
- $this->drupalLogin($this->drupalCreateUser(['post comments', 'skip comment approval', 'create page content', 'administer search']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'post comments',
+ 'skip comment approval',
+ 'create page content',
+ 'administer search',
+ ]));
}
public function testRankings() {
diff --git a/web/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php b/web/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
index 50296711f3..365e30a4e4 100644
--- a/web/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
+++ b/web/core/modules/serialization/src/Normalizer/TimeStampItemNormalizerTrait.php
@@ -37,6 +37,7 @@ trait TimeStampItemNormalizerTrait {
*
* @param array $normalized
* The normalized field data to process.
+ *
* @return array
* The processed data.
*/
diff --git a/web/core/modules/shortcut/shortcut.api.php b/web/core/modules/shortcut/shortcut.api.php
index c5c609c38f..ff40a30d3f 100644
--- a/web/core/modules/shortcut/shortcut.api.php
+++ b/web/core/modules/shortcut/shortcut.api.php
@@ -26,6 +26,7 @@
*
* @param $account
* The user account whose default shortcut set is being requested.
+ *
* @return string
* The name of the shortcut set that this module recommends for that user, if
* there is one.
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
index 52876a4e37..4d0367c7b7 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
@@ -117,7 +117,7 @@ public function testToolbar() {
// Verify that users without the 'access shortcuts' permission can't see the
// shortcuts.
$this->drupalLogin($this->drupalCreateUser(['access toolbar']));
- $this->assertNoLink('Shortcuts');
+ $this->assertSession()->linkNotExists('Shortcuts');
$this->verifyDynamicPageCache($test_page_url, 'MISS');
$this->verifyDynamicPageCache($test_page_url, 'HIT');
@@ -129,8 +129,8 @@ public function testToolbar() {
]));
$this->verifyDynamicPageCache($test_page_url, 'MISS');
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertLink('Shortcuts');
- $this->assertNoLink('Cron');
+ $this->assertSession()->linkExists('Shortcuts');
+ $this->assertSession()->linkNotExists('Cron');
// Create a role with access to shortcuts as well as the necessary
// permissions to see specific shortcuts.
@@ -155,14 +155,14 @@ public function testToolbar() {
$this->verifyDynamicPageCache($test_page_url, 'MISS');
$this->verifyDynamicPageCache($test_page_url, 'HIT');
$this->assertCacheContexts(['user', 'url.query_args:_wrapper_format']);
- $this->assertLink('Shortcuts');
- $this->assertLink('Cron');
+ $this->assertSession()->linkExists('Shortcuts');
+ $this->assertSession()->linkExists('Cron');
$this->drupalLogin($site_configuration_user2);
$this->verifyDynamicPageCache($test_page_url, 'HIT');
$this->assertCacheContexts(['user', 'url.query_args:_wrapper_format']);
- $this->assertLink('Shortcuts');
- $this->assertLink('Cron');
+ $this->assertSession()->linkExists('Shortcuts');
+ $this->assertSession()->linkExists('Cron');
// Add another shortcut.
$shortcut = Shortcut::create([
@@ -176,21 +176,21 @@ public function testToolbar() {
// The shortcuts are displayed in a lazy builder, so the page is still a
// cache HIT but shows the new shortcut immediately.
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertLink('Cron');
- $this->assertLink('Llama');
+ $this->assertSession()->linkExists('Cron');
+ $this->assertSession()->linkExists('Llama');
// Update the shortcut title and assert that it is updated.
$shortcut->set('title', 'Alpaca');
$shortcut->save();
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertLink('Cron');
- $this->assertLink('Alpaca');
+ $this->assertSession()->linkExists('Cron');
+ $this->assertSession()->linkExists('Alpaca');
// Delete the shortcut and assert that the link is gone.
$shortcut->delete();
$this->verifyDynamicPageCache($test_page_url, 'HIT');
- $this->assertLink('Cron');
- $this->assertNoLink('Alpaca');
+ $this->assertSession()->linkExists('Cron');
+ $this->assertSession()->linkNotExists('Alpaca');
}
}
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
index 512fd2b7b1..f06baa857c 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
@@ -87,10 +87,10 @@ public function testShortcutLinkAdd() {
$this->assertContains('internal:' . $test_path, $paths, 'Shortcut created: ' . $test_path);
if (in_array($test_path, $test_cases_non_access)) {
- $this->assertNoLink($title, new FormattableMarkup('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
+ $this->assertSession()->linkNotExists($title, new FormattableMarkup('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
}
else {
- $this->assertLink($title, 0, new FormattableMarkup('Shortcut link %url found on the page.', ['%url' => $test_path]));
+ $this->assertSession()->linkExists($title, 0, new FormattableMarkup('Shortcut link %url found on the page.', ['%url' => $test_path]));
}
}
$saved_set = ShortcutSet::load($set->id());
@@ -121,7 +121,7 @@ public function testShortcutLinkAdd() {
'link[0][uri]' => '/node',
];
$this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
- $this->assertLink($title, 0, 'Shortcut link found on the page.');
+ $this->assertSession()->linkExists($title, 0, 'Shortcut link found on the page.');
// Create a new shortcut set and add a link to it.
$this->drupalLogin($this->adminUser);
@@ -154,19 +154,19 @@ public function testShortcutQuickLink() {
// Test the "Add to shortcuts" link.
$this->clickLink('Add to Default shortcuts');
$this->assertText('Added a shortcut for Cron.');
- $this->assertLink('Cron', 0, 'Shortcut link found on page');
+ $this->assertSession()->linkExists('Cron', 0, 'Shortcut link found on page');
$this->drupalGet('admin/structure');
- $this->assertLink('Cron', 0, 'Shortcut link found on different page');
+ $this->assertSession()->linkExists('Cron', 0, 'Shortcut link found on different page');
// Test the "Remove from shortcuts" link.
$this->clickLink('Cron');
$this->clickLink('Remove from Default shortcuts');
$this->assertText('The shortcut Cron has been deleted.');
- $this->assertNoLink('Cron', 'Shortcut link removed from page');
+ $this->assertSession()->linkNotExists('Cron', 'Shortcut link removed from page');
$this->drupalGet('admin/structure');
- $this->assertNoLink('Cron', 'Shortcut link removed from different page');
+ $this->assertSession()->linkNotExists('Cron', 'Shortcut link removed from different page');
$this->drupalGet('admin/people');
@@ -240,7 +240,7 @@ public function testShortcutLinkRename() {
$saved_set = ShortcutSet::load($set->id());
$titles = $this->getShortcutInformation($saved_set, 'title');
$this->assertContains($new_link_name, $titles, 'Shortcut renamed: ' . $new_link_name);
- $this->assertLink($new_link_name, 0, 'Renamed shortcut link appears on the page.');
+ $this->assertSession()->linkExists($new_link_name, 0, 'Renamed shortcut link appears on the page.');
$this->assertText(t('The shortcut @link has been updated.', ['@link' => $new_link_name]));
}
@@ -352,13 +352,16 @@ public function testAccessShortcutsPermission() {
// Verify that users without the 'access shortcuts' permission can't see the
// shortcuts.
$this->drupalLogin($this->drupalCreateUser(['access toolbar']));
- $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
+ $this->assertSession()->linkNotExists('Shortcuts', 'Shortcut link not found on page.');
// Verify that users without the 'administer site configuration' permission
// can't see the cron shortcuts but can see shortcuts.
- $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts']));
- $this->assertLink('Shortcuts');
- $this->assertNoLink('Cron', 'Cron shortcut link not found on page.');
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access toolbar',
+ 'access shortcuts',
+ ]));
+ $this->assertSession()->linkExists('Shortcuts');
+ $this->assertSession()->linkNotExists('Cron', 'Cron shortcut link not found on page.');
// Verify that users with the 'access shortcuts' permission can see the
// shortcuts.
@@ -366,7 +369,7 @@ public function testAccessShortcutsPermission() {
'access toolbar', 'access shortcuts', 'administer site configuration',
]));
$this->clickLink('Shortcuts', 0, 'Shortcut link found on page.');
- $this->assertLink('Cron', 0, 'Cron shortcut link found on page.');
+ $this->assertSession()->linkExists('Cron', 0, 'Cron shortcut link found on page.');
$this->verifyAccessShortcutsPermissionForEditPages();
}
@@ -376,7 +379,12 @@ public function testAccessShortcutsPermission() {
*/
public function testShortcutLinkOrder() {
// Ensure to give permissions to access the shortcuts.
- $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts', 'access content overview', 'administer content types']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access toolbar',
+ 'access shortcuts',
+ 'access content overview',
+ 'administer content types',
+ ]));
$this->drupalGet(Url::fromRoute('<front>'));
$shortcuts = $this->cssSelect('#toolbar-item-shortcuts-tray .toolbar-menu a');
$this->assertEqual($shortcuts[0]->getText(), 'Add content');
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
index 4372aeae94..aeedc8bf66 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
@@ -83,7 +83,7 @@ public function testShortcutSetEdit() {
$title = $shortcut->getTitle();
// Confirm that a link to the shortcut is found within the table.
- $this->assertLink($title);
+ $this->assertSession()->linkExists($title);
// Look for a test shortcut weight select form element.
$this->assertFieldByName('shortcuts[links][' . $shortcut->id() . '][weight]');
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
index c11c418ae9..9c7aecd14f 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
@@ -78,8 +78,23 @@ protected function setUp() {
}
// Create users.
- $this->adminUser = $this->drupalCreateUser(['access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview', 'administer users', 'link to any page', 'edit any article content']);
- $this->shortcutUser = $this->drupalCreateUser(['customize shortcut links', 'switch shortcut sets', 'access shortcuts', 'access content']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access toolbar',
+ 'administer shortcuts',
+ 'view the administration theme',
+ 'create article content',
+ 'create page content',
+ 'access content overview',
+ 'administer users',
+ 'link to any page',
+ 'edit any article content',
+ ]);
+ $this->shortcutUser = $this->drupalCreateUser([
+ 'customize shortcut links',
+ 'switch shortcut sets',
+ 'access shortcuts',
+ 'access content',
+ ]);
// Create a node.
$this->node = $this->drupalCreateNode(['type' => 'article']);
diff --git a/web/core/modules/simpletest/simpletest.module b/web/core/modules/simpletest/simpletest.module
index a538575503..31749c7e90 100644
--- a/web/core/modules/simpletest/simpletest.module
+++ b/web/core/modules/simpletest/simpletest.module
@@ -422,6 +422,7 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
*
* @param $test_id
* The test ID to get the last test from.
+ *
* @return array
* Array containing the last database prefix used and the last test class
* that ran.
diff --git a/web/core/modules/simpletest/src/KernelTestBase.php b/web/core/modules/simpletest/src/KernelTestBase.php
index 952896a244..bd6a89e300 100644
--- a/web/core/modules/simpletest/src/KernelTestBase.php
+++ b/web/core/modules/simpletest/src/KernelTestBase.php
@@ -151,7 +151,7 @@ protected function prepareConfigDirectories() {
$this->configDirectories = [];
// Assign the relative path to the global variable.
$path = $this->siteDirectory . '/config_' . CONFIG_SYNC_DIRECTORY;
- // Ensure the directory can be created and is writeable.
+ // Ensure the directory can be created and is writable.
if (!\Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS)) {
throw new \RuntimeException("Failed to create '" . CONFIG_SYNC_DIRECTORY . "' config directory $path");
}
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index b0f6334425..fc7ea25fb5 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -58,7 +58,11 @@ protected function setUp() {
if ($this->profile != 'standard') {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
}
- $this->privilegedUser = $this->drupalCreateUser(['administer statistics', 'view post access counter', 'create page content']);
+ $this->privilegedUser = $this->drupalCreateUser([
+ 'administer statistics',
+ 'view post access counter',
+ 'create page content',
+ ]);
$this->drupalLogin($this->privilegedUser);
$this->testNode = $this->drupalCreateNode(['type' => 'page', 'uid' => $this->privilegedUser->id()]);
$this->client = \Drupal::httpClient();
diff --git a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
index a03535f17e..1fa68a8055 100644
--- a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
@@ -53,7 +53,10 @@ protected function setUp($import_test_views = TRUE) {
ViewTestData::createTestViews(get_class($this), ['statistics_test_views']);
// Create a new user for viewing nodes and statistics.
- $this->webUser = $this->drupalCreateUser(['access content', 'view post access counter']);
+ $this->webUser = $this->drupalCreateUser([
+ 'access content',
+ 'view post access counter',
+ ]);
// Create a new user for viewing nodes only.
$this->deniedUser = $this->drupalCreateUser(['access content']);
diff --git a/web/core/modules/system/src/Form/FileSystemForm.php b/web/core/modules/system/src/Form/FileSystemForm.php
index d81488b44e..cad3342d6b 100644
--- a/web/core/modules/system/src/Form/FileSystemForm.php
+++ b/web/core/modules/system/src/Form/FileSystemForm.php
@@ -122,7 +122,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#markup' => $this->fileSystem->getTempDirectory(),
'#description' => t('A local file system path where temporary files will be stored. This directory should not be accessible over the web. This must be changed in settings.php.'),
];
- // Any visible, writeable wrapper can potentially be used for the files
+ // Any visible, writable wrapper can potentially be used for the files
// directory, including a remote file system that integrates with a CDN.
$options = $this->streamWrapperManager->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE);
diff --git a/web/core/modules/system/src/Form/ThemeSettingsForm.php b/web/core/modules/system/src/Form/ThemeSettingsForm.php
index 2a65c6b52d..e1f13a7930 100644
--- a/web/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/web/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -514,6 +514,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
* @param string $path
* A path relative to the Drupal root or to the public files directory, or
* a stream wrapper URI.
+ *
* @return mixed
* A valid path that can be displayed through the theme system, or FALSE if
* the path could not be validated.
diff --git a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
index 261ae32a24..609ffd5154 100644
--- a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
+++ b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
@@ -207,8 +207,6 @@ protected function getRequestForPath($path, array $exclude) {
if (!empty($exclude[$path])) {
return NULL;
}
- // @todo Use the RequestHelper once https://www.drupal.org/node/2090293 is
- // fixed.
$request = Request::create($path);
// Performance optimization: set a short accept header to reduce overhead in
// AcceptHeaderMatcher when matching the request.
diff --git a/web/core/modules/system/src/Tests/Cache/CacheTestBase.php b/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
index dc2f601c5f..431e72b91f 100644
--- a/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
+++ b/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
@@ -29,6 +29,7 @@ abstract class CacheTestBase extends WebTestBase {
* The variable the cache should contain.
* @param $bin
* The bin the cache item was stored in.
+ *
* @return
* TRUE on pass, FALSE on fail.
*/
diff --git a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index 625baa5a77..042f287a90 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -171,6 +171,7 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity to be tested, as created by createEntity().
+ *
* @return array
* An array of the additional cache tags.
*
diff --git a/web/core/modules/system/src/Tests/Routing/MockAliasManager.php b/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
index dcbfbe7162..b52b0b44c7 100644
--- a/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
+++ b/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
@@ -73,6 +73,7 @@ public function getPathByAlias($alias, $langcode = NULL) {
* {@inheritdoc}
* @param $path
* @param null $langcode
+ *
* @return
*/
public function getAliasByPath($path, $langcode = NULL) {
diff --git a/web/core/modules/system/system.module b/web/core/modules/system/system.module
index 208372ccaa..ba714a4a4d 100644
--- a/web/core/modules/system/system.module
+++ b/web/core/modules/system/system.module
@@ -473,6 +473,7 @@ function template_preprocess_entity_add_list(&$variables) {
* object created by authorize.php when the user authorizes the operation.
* @param $page_title
* Optional string to use as the page title once redirected to authorize.php.
+ *
* @return
* Nothing, this function just initializes variables in the user's session.
*/
@@ -500,6 +501,7 @@ function system_authorized_init($callback, $file, $arguments = [], $page_title =
*
* @param array $options
* Optional array of options to set on the \Drupal\Core\Url object.
+ *
* @return \Drupal\Core\Url
* The full URL to authorize.php, using HTTPS if available.
*
@@ -1031,6 +1033,7 @@ function system_rebuild_module_data() {
* @param $show
* Possible values: REGIONS_ALL or REGIONS_VISIBLE. Visible excludes hidden
* regions.
+ *
* @return
* An array of regions in the form $region['name'] = 'description'.
*/
@@ -1096,6 +1099,7 @@ function system_system_info_alter(&$info, Extension $file, $type) {
*
* @param $theme
* The name of a theme.
+ *
* @return
* A string that is the region name.
*/
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestExternal.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestExternal.php
new file mode 100644
index 0000000000..b6587a9a9e
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestExternal.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Url;
+
+/**
+ * Test entity class.
+ *
+ * @ContentEntityType(
+ * id = "entity_test_external",
+ * label = @Translation("Entity test external"),
+ * base_table = "entity_test_external",
+ * entity_keys = {
+ * "id" = "id",
+ * "uuid" = "uuid",
+ * "bundle" = "type",
+ * },
+ * links = {
+ * "canonical" = "/entity_test_external/{entity_test_external}"
+ * },
+ * )
+ */
+class EntityTestExternal extends EntityTest {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function toUrl($rel = 'canonical', array $options = []) {
+ if ($rel === 'canonical') {
+ return Url::fromUri('http://example.com', $options);
+ }
+ return parent::toUrl($rel, $options);
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameValidationForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameValidationForm.php
index ff2dcaac58..81f3a864c8 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameValidationForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameValidationForm.php
@@ -121,6 +121,7 @@ public function buildAjaxSnackConfigureForm(array $form, FormStateInterface $for
* Loading stub for machine name
*
* @param $machine_name
+ *
* @return bool
*/
public function load($machine_name) {
diff --git a/web/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module b/web/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module
new file mode 100644
index 0000000000..cf6983bc7f
--- /dev/null
+++ b/web/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @file
+ * Test module.
+ */
+
+use Drupal\module_autoload_test\SomeClass;
+
+define('MODULE_AUTOLOAD_TEST_CONSTANT', SomeClass::TEST);
diff --git a/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php b/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
index 11993b71f4..65529f23dc 100644
--- a/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
+++ b/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
@@ -4,6 +4,8 @@
class SomeClass {
+ const TEST = '\Drupal\module_autoload_test\SomeClass::TEST';
+
public function testMethod() {
return 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.';
}
diff --git a/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
index 38fee503ec..53908cf158 100644
--- a/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
+++ b/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
@@ -78,11 +78,11 @@ public function onRequest(GetResponseEvent $event) {
*/
public function onView(GetResponseEvent $event) {
$current_route = $this->currentRouteMatch->getRouteName();
- $entity_autcomplete_route = [
+ $entity_autocomplete_route = [
'system.entity_autocomplete',
];
- if (in_array($current_route, $entity_autcomplete_route)) {
+ if (in_array($current_route, $entity_autocomplete_route)) {
if ($this->container->initialized('theme.registry')) {
throw new \Exception('registry initialized');
}
diff --git a/web/core/modules/system/tests/modules/token_test/token_test.routing.yml b/web/core/modules/system/tests/modules/token_test/token_test.routing.yml
index 5fc239ad49..0de9339c29 100644
--- a/web/core/modules/system/tests/modules/token_test/token_test.routing.yml
+++ b/web/core/modules/system/tests/modules/token_test/token_test.routing.yml
@@ -5,7 +5,7 @@ token_test.test:
requirements:
_access: 'TRUE'
token_test.test_without_bubbleable_metadata:
- path: token-test-without-bubleable-metadata/{node}
+ path: token-test-without-bubbleable-metadata/{node}
defaults:
_controller: Drupal\token_test\Controller\TestController::tokenReplaceWithoutPassedBubbleableMetadata
requirements:
diff --git a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index 37fd7eb1d9..634c8859b8 100644
--- a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -54,14 +54,17 @@ public function testBatchForm() {
// Batch 0: no operation.
$edit = ['batch' => 'batch_0'];
$this->drupalPostForm('batch-test', $edit, 'Submit');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ // If there is any escaped markup it will include at least an escaped '<'
+ // character, so assert on each page that there is no escaped '<' as a way
+ // of verifying that no markup is incorrectly escaped.
+ $this->assertNoEscaped('<');
$this->assertBatchMessages($this->_resultMessages('batch_0'), 'Batch with no operation performed successfully.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
// Batch 1: several simple operations.
$edit = ['batch' => 'batch_1'];
$this->drupalPostForm('batch-test', $edit, 'Submit');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
$this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch with simple operations performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
@@ -69,7 +72,7 @@ public function testBatchForm() {
// Batch 2: one multistep operation.
$edit = ['batch' => 'batch_2'];
$this->drupalPostForm('batch-test', $edit, 'Submit');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
$this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch with multistep operation performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
@@ -77,7 +80,7 @@ public function testBatchForm() {
// Batch 3: simple + multistep combined.
$edit = ['batch' => 'batch_3'];
$this->drupalPostForm('batch-test', $edit, 'Submit');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
$this->assertBatchMessages($this->_resultMessages('batch_3'), 'Batch with simple and multistep operations performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_3'), 'Execution order was correct.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
@@ -85,7 +88,7 @@ public function testBatchForm() {
// Batch 4: nested batch.
$edit = ['batch' => 'batch_4'];
$this->drupalPostForm('batch-test', $edit, 'Submit');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
$this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_4'), 'Execution order was correct.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
@@ -121,7 +124,7 @@ public function testBatchForm() {
*/
public function testBatchFormMultistep() {
$this->drupalGet('batch-test/multistep');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
$this->assertText('step 1', 'Form is displayed in step 1.');
// First step triggers batch 1.
@@ -129,14 +132,14 @@ public function testBatchFormMultistep() {
$this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 1 performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
$this->assertText('step 2', 'Form is displayed in step 2.');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
// Second step triggers batch 2.
$this->drupalPostForm(NULL, [], 'Submit');
$this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch for step 2 performed successfully.');
$this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.');
$this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
- $this->assertNoEscaped('<', 'No escaped markup is present.');
+ $this->assertNoEscaped('<');
// Extra query arguments will trigger logic that will add them to the
// redirect URL. Make sure they are persisted.
diff --git a/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
index f1439eaeb2..08c4db5e8a 100644
--- a/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
@@ -22,6 +22,7 @@ abstract class CacheTestBase extends BrowserTestBase {
* The variable the cache should contain.
* @param $bin
* The bin the cache item was stored in.
+ *
* @return
* TRUE on pass, FALSE on fail.
*/
diff --git a/web/core/modules/system/tests/src/Functional/Common/FormatDateTest.php b/web/core/modules/system/tests/src/Functional/Common/FormatDateTest.php
index b2ff7b1a00..b0aae40e6a 100644
--- a/web/core/modules/system/tests/src/Functional/Common/FormatDateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/FormatDateTest.php
@@ -21,7 +21,9 @@ class FormatDateTest extends BrowserTestBase {
*/
public function testAdminDefinedFormatDate() {
// Create and log in an admin user.
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
// Add new date format.
$edit = [
diff --git a/web/core/modules/system/tests/src/Functional/Common/UrlTest.php b/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
index cc9e4fbe3c..693dc0162c 100644
--- a/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
@@ -313,6 +313,11 @@ public function testExternalUrls() {
$result = Url::fromUri($url)->toString();
$this->assertEqual($url, $result);
+ // Verify external URL can contain a query string with an integer key.
+ $url = $test_url . '?120=1';
+ $result = Url::fromUri($url)->toString();
+ $this->assertEqual($url, $result);
+
// Verify external URL can be extended with a query string.
$url = $test_url;
$query = ['awesome' => 'drupal'];
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
index 747cfb639e..f8157ca5ce 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
@@ -48,7 +48,7 @@ public function testAddPageWithBundleEntities() {
// has the necessary permissions.
$this->drupalGet('/entity_test_with_bundle/add');
$this->assertText('There is no test entity bundle yet.');
- $this->assertLink('Add a new test entity bundle.');
+ $this->assertSession()->linkExists('Add a new test entity bundle.');
// One bundle exists, confirm redirection to the add-form.
EntityTestBundle::create([
@@ -67,8 +67,8 @@ public function testAddPageWithBundleEntities() {
])->save();
$this->drupalGet('/entity_test_with_bundle/add');
- $this->assertLink('Test label');
- $this->assertLink('Test2 label');
+ $this->assertSession()->linkExists('Test label');
+ $this->assertSession()->linkExists('Test2 label');
$this->assertText('My test description');
$this->assertText('My test2 description');
@@ -93,9 +93,9 @@ public function testAddPageWithBundleEntities() {
'description' => 'My test3 description',
])->save();
$this->drupalGet('/entity_test_with_bundle/add');
- $this->assertLink('Test label');
- $this->assertLink('Test2 label');
- $this->assertNoLink('Test3 label');
+ $this->assertSession()->linkExists('Test label');
+ $this->assertSession()->linkExists('Test2 label');
+ $this->assertSession()->linkNotExists('Test3 label');
$this->clickLink(t('Test label'));
$this->assertSession()->statusCodeEquals(200);
@@ -114,10 +114,10 @@ public function testAddPageWithBundleEntities() {
// does not have bundle specific permissions. The add bundle message is
// present as the user has bundle create permissions.
$this->drupalGet('/entity_test_with_bundle/add');
- $this->assertNoLink('Test label');
- $this->assertNoLink('Test2 label');
- $this->assertNoLink('Test3 label');
- $this->assertLink('Add a new test entity bundle.');
+ $this->assertSession()->linkNotExists('Test label');
+ $this->assertSession()->linkNotExists('Test2 label');
+ $this->assertSession()->linkNotExists('Test3 label');
+ $this->assertSession()->linkExists('Add a new test entity bundle.');
}
/**
@@ -141,8 +141,8 @@ public function testAddPageWithoutBundleEntities() {
entity_test_create_bundle('test2', 'Test2 label', 'entity_test_mul');
$this->drupalGet('/entity_test_mul/add');
- $this->assertLink('Test label');
- $this->assertLink('Test2 label');
+ $this->assertSession()->linkExists('Test label');
+ $this->assertSession()->linkExists('Test2 label');
$this->clickLink('Test2 label');
$this->drupalGet('/entity_test_mul/add/test2');
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
index 5ec1384a94..31544aed65 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -164,6 +164,7 @@ protected function getAdditionalCacheContextsForEntity(EntityInterface $entity)
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity to be tested, as created by createEntity().
+ *
* @return array
* An array of the additional cache tags.
*
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
index 02b8929a05..628e351cfc 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
@@ -27,7 +27,10 @@ class EntityFormTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $web_user = $this->drupalCreateUser(['administer entity_test content', 'view test entity']);
+ $web_user = $this->drupalCreateUser([
+ 'administer entity_test content',
+ 'view test entity',
+ ]);
$this->drupalLogin($web_user);
// Add a language.
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
index 07d58b6517..d88d76879b 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
@@ -42,7 +42,7 @@ public function testEntityOperationAlter() {
$roles = user_roles();
foreach ($roles as $role) {
$this->assertLinkByHref($role->toUrl()->toString() . '/test_operation');
- $this->assertLink(new FormattableMarkup('Test Operation: @label', ['@label' => $role->label()]));
+ $this->assertSession()->linkExists(new FormattableMarkup('Test Operation: @label', ['@label' => $role->label()]));
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
index 7e206f7a57..ac35898497 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
@@ -52,7 +52,11 @@ protected function setUp() {
public function testEntityFormLanguage() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
- $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer content types']);
+ $web_user = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ 'administer content types',
+ ]);
$this->drupalLogin($web_user);
// Create a node with language LanguageInterface::LANGCODE_NOT_SPECIFIED.
diff --git a/web/core/modules/system/tests/src/Functional/File/ConfigTest.php b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
index f44e8a924a..cac94da53e 100644
--- a/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
+++ b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
@@ -18,7 +18,9 @@ class ConfigTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
index e90c4dfe3d..27f18e800e 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
@@ -42,7 +42,9 @@ class ElementsVerticalTabsTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access vertical_tab_test tabs']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access vertical_tab_test tabs',
+ ]);
$this->webUser = $this->drupalCreateUser();
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
index 70af48083b..f1eeee7426 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
@@ -27,7 +27,10 @@ class ModulesListFormWebTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
\Drupal::state()->set('system_test.module_hidden', FALSE);
- $this->drupalLogin($this->drupalCreateUser(['administer modules', 'administer permissions']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer modules',
+ 'administer permissions',
+ ]));
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index b1b4fc137f..fc4431d51b 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -154,9 +154,9 @@ public function testBreadCrumbs() {
$trail = $home;
$this->assertBreadcrumb("node/$nid1", $trail);
// Also verify that the node does not appear elsewhere (e.g., menu trees).
- $this->assertNoLink($node1->getTitle());
+ $this->assertSession()->linkNotExists($node1->getTitle());
// Also verify that the node does not appear elsewhere (e.g., menu trees).
- $this->assertNoLink($node1->getTitle());
+ $this->assertSession()->linkNotExists($node1->getTitle());
$trail += [
"node/$nid1" => $node1->getTitle(),
@@ -286,7 +286,8 @@ public function testBreadCrumbs() {
$link_path => $link->getTitle(),
];
$this->assertBreadcrumb($link_path, $trail, $term->getName(), $tree);
- $this->assertEscaped($parent->getTitle(), 'Tagged node found.');
+ // Ensure that the tagged node is found.
+ $this->assertEscaped($parent->getTitle());
// Additionally make sure that this link appears only once; i.e., the
// untranslated menu links automatically generated from menu router items
diff --git a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
index 3ca2fe911f..e0fd44abb8 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
@@ -79,7 +79,7 @@ protected function assertLocalTasks(array $routes, $level = 0) {
* @return bool
* TRUE if the local task exists on the page.
*/
- protected function assertLocalTaskAppers($title) {
+ protected function assertLocalTaskAppears($title) {
// SimpleXML gives us the unescaped text, not the actual escaped markup,
// so use a pattern instead to check the raw content.
// This behavior is a bug in libxml, see
@@ -116,9 +116,9 @@ public function testPluginLocalTask() {
// Verify that script tags are escaped on output.
$title = Html::escape("Task 1 <script>alert('Welcome to the jungle!')</script>");
- $this->assertLocalTaskAppers($title);
+ $this->assertLocalTaskAppears($title);
$title = Html::escape("<script>alert('Welcome to the derived jungle!')</script>");
- $this->assertLocalTaskAppers($title);
+ $this->assertLocalTaskAppears($title);
// Verify that local tasks appear as defined in the router.
$this->drupalGet(Url::fromRoute('menu_test.local_task_test_tasks_view'));
@@ -130,7 +130,7 @@ public function testPluginLocalTask() {
]);
$title = Html::escape("<script>alert('Welcome to the jungle!')</script>");
- $this->assertLocalTaskAppers($title);
+ $this->assertLocalTaskAppears($title);
// Ensure the view tab is active.
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
diff --git a/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
index 36eb424239..dadfae0dba 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
@@ -42,11 +42,11 @@ public function testMenuBlockLinksAccessCheck() {
$this->drupalPlaceBlock('system_menu_block:account');
// Test that there's link rendered on the route.
$this->drupalGet('menu_test_access_check_session');
- $this->assertLink('Test custom route access check');
+ $this->assertSession()->linkExists('Test custom route access check');
// Page is still accessible but there should be no menu link.
$this->drupalGet('menu_test_access_check_session');
$this->assertSession()->statusCodeEquals(200);
- $this->assertNoLink('Test custom route access check');
+ $this->assertSession()->linkNotExists('Test custom route access check');
// Test that page is no more accessible.
$this->drupalGet('menu_test_access_check_session');
$this->assertSession()->statusCodeEquals(403);
diff --git a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
index 1da42f1371..8c435c85b4 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
@@ -65,10 +65,10 @@ protected function doTestHookMenuIntegration() {
// Confirm correct controller activated.
$this->assertText('test1');
// Confirm local task links are displayed.
- $this->assertLink('Local task A');
- $this->assertLink('Local task B');
- $this->assertNoLink('Local task C');
- $this->assertEscaped("<script>alert('Welcome to the jungle!')</script>", ENT_QUOTES, 'UTF-8');
+ $this->assertSession()->linkExists('Local task A');
+ $this->assertSession()->linkExists('Local task B');
+ $this->assertSession()->linkNotExists('Local task C');
+ $this->assertEscaped("<script>alert('Welcome to the jungle!')</script>");
// Confirm correct local task href.
$this->assertLinkByHref(Url::fromRoute('menu_test.router_test1', ['bar' => $machine_name])->toString());
$this->assertLinkByHref(Url::fromRoute('menu_test.router_test2', ['bar' => $machine_name])->toString());
diff --git a/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
index cb855e34a9..c22247b63f 100644
--- a/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\system\Functional\Module;
+use Drupal\module_autoload_test\SomeClass;
use Drupal\Tests\BrowserTestBase;
/**
@@ -96,4 +97,19 @@ public function testMultipleModules() {
$this->assertTrue(\Drupal::moduleHandler()->moduleExists('module_install_class_loader_test2'), 'The module_install_class_loader_test2 module has been installed.');
}
+ /**
+ * Tests that .module files can use class constants in main section.
+ */
+ public function testAutoloadFromModuleFile() {
+ $this->assertFalse(defined('MODULE_AUTOLOAD_TEST_CONSTANT'));
+ $this->drupalLogin($this->rootUser);
+ $edit = [
+ "modules[module_autoload_test][enable]" => TRUE,
+ ];
+ $this->drupalPostForm('admin/modules', $edit, t('Install'));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->resetAll();
+ $this->assertSame(SomeClass::TEST, MODULE_AUTOLOAD_TEST_CONSTANT);
+ }
+
}
diff --git a/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php b/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
index eba632f0f9..9608ca061c 100644
--- a/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
@@ -29,7 +29,10 @@ class ExperimentalModuleTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
index 5e69fcccf7..ce0ea8ad80 100644
--- a/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
@@ -358,7 +358,7 @@ protected function assertHelp($module, $name) {
$this->drupalGet('admin/help/' . $module);
$this->assertSession()->statusCodeEquals(200);
$this->assertText($name . ' module', "'$name module' is on the help page for $module");
- $this->assertLink('online documentation for the ' . $name . ' module', 0, "Correct online documentation link is in the help page for $module");
+ $this->assertSession()->linkExists('online documentation for the ' . $name . ' module', 0, "Correct online documentation link is in the help page for $module");
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
index 1e681859b6..88c8d4c860 100644
--- a/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
@@ -26,7 +26,10 @@ abstract class ModuleTestBase extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer modules',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
index 10c48ef804..c61d789c42 100644
--- a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
@@ -36,7 +36,12 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
// Create an administrative user.
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer site configuration', 'link to any page', 'administer blocks']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer site configuration',
+ 'link to any page',
+ 'administer blocks',
+ ]);
$this->adminUser->roles[] = 'administrator';
$this->adminUser->save();
diff --git a/web/core/modules/system/tests/src/Functional/System/AdminTest.php b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
index 1d11616bca..546cc222ff 100644
--- a/web/core/modules/system/tests/src/Functional/System/AdminTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
@@ -63,7 +63,7 @@ public function testAdminPages() {
// Verify that all visible, top-level administration links are listed on
// the main administration page.
foreach ($this->getTopLevelMenuLinks() as $item) {
- $this->assertLink($item->getTitle());
+ $this->assertSession()->linkExists($item->getTitle());
$this->assertLinkByHref($item->getUrlObject()->toString());
// The description should appear below the link.
$this->assertText($item->getDescription());
diff --git a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
index 10a3bd98cc..8ae1d70594 100644
--- a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
@@ -159,7 +159,8 @@ public function testDateFormatConfiguration() {
$date_format->save();
$this->drupalGet(Url::fromRoute('entity.date_format.collection'));
- $this->assertEscaped("<script>alert('XSS');</script>", 'The date format was properly escaped');
+ // Ensure that the date format is properly escaped.
+ $this->assertEscaped("<script>alert('XSS');</script>");
// Add a new date format with HTML in it.
$date_format_id = strtolower($this->randomMachineName(8));
@@ -216,7 +217,9 @@ public function testEnteringDateTimeViaSelectors() {
$this->drupalLogout();
// Now log in as a regular editor.
- $this->drupalLogin($this->drupalCreateUser(['create page_with_date content']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'create page_with_date content',
+ ]));
$this->drupalGet('node/add/page_with_date');
$edit = [
diff --git a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
index cea415863d..f869b50ae3 100644
--- a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
@@ -34,7 +34,10 @@ protected function setUp() {
parent::setUp();
// Create an administrative user.
- $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'link to any page']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'link to any page',
+ ]);
$this->adminUser->roles[] = 'administrator';
$this->adminUser->save();
diff --git a/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php b/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
index bc2ed20188..21c66ad2ec 100644
--- a/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
@@ -39,7 +39,13 @@ protected function setUp() {
$this->drupalPlaceBlock('page_title_block');
- $this->contentUser = $this->drupalCreateUser(['create page content', 'access content', 'administer themes', 'administer site configuration', 'link to any page']);
+ $this->contentUser = $this->drupalCreateUser([
+ 'create page content',
+ 'access content',
+ 'administer themes',
+ 'administer site configuration',
+ 'link to any page',
+ ]);
$this->drupalLogin($this->contentUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
index b61390a7e6..d7d2474b59 100644
--- a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
@@ -41,7 +41,10 @@ protected function setUp() {
// Create a user allowed to access site in maintenance mode.
$this->user = $this->drupalCreateUser(['access site in maintenance mode']);
// Create an administrative user.
- $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access site in maintenance mode']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'access site in maintenance mode',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
index a8db1d76aa..32024ade4b 100644
--- a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
@@ -27,7 +27,9 @@ protected function setUp() {
parent::setUp();
// Create an administrator user.
- $this->drupalLogin($this->drupalCreateUser(['administer software updates']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer software updates',
+ ]));
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
index eff90ee1a4..89e1d7a89b 100644
--- a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
@@ -43,7 +43,13 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme', 'administer themes', 'bypass node access', 'administer blocks']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'view the administration theme',
+ 'administer themes',
+ 'bypass node access',
+ 'administer blocks',
+ ]);
$this->drupalLogin($this->adminUser);
$this->node = $this->drupalCreateNode();
$this->drupalPlaceBlock('local_tasks_block');
@@ -202,16 +208,16 @@ public function testThemeSettings() {
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header']);
$this->drupalGet('admin/appearance/settings');
$theme_handler = \Drupal::service('theme_handler');
- $this->assertLink($theme_handler->getName('classy'));
- $this->assertLink($theme_handler->getName('bartik'));
- $this->assertNoLink($theme_handler->getName('stable'));
+ $this->assertSession()->linkExists($theme_handler->getName('classy'));
+ $this->assertSession()->linkExists($theme_handler->getName('bartik'));
+ $this->assertSession()->linkNotExists($theme_handler->getName('stable'));
// If a hidden theme is an admin theme it should be viewable.
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
$this->drupalGet('admin/appearance/settings');
- $this->assertLink($theme_handler->getName('stable'));
+ $this->assertSession()->linkExists($theme_handler->getName('stable'));
$this->drupalGet('admin/appearance/settings/stable');
$this->assertSession()->statusCodeEquals(200);
diff --git a/web/core/modules/system/tests/src/Functional/System/TokenReplaceWebTest.php b/web/core/modules/system/tests/src/Functional/System/TokenReplaceWebTest.php
index de6edc66c0..2e2664a25b 100644
--- a/web/core/modules/system/tests/src/Functional/System/TokenReplaceWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/TokenReplaceWebTest.php
@@ -38,7 +38,7 @@ public function testTokens() {
$this->assertCacheTags(['node:1', 'rendered', 'user:2']);
$this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT, 'user']);
- $this->drupalGet('token-test-without-bubleable-metadata/' . $node->id());
+ $this->drupalGet('token-test-without-bubbleable-metadata/' . $node->id());
$this->assertText("Tokens: {$node->id()} {$account->id()}");
$this->assertCacheTags(['node:1', 'rendered', 'user:2']);
$this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT, 'user']);
diff --git a/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
index 62ed131f67..74292c0269 100644
--- a/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
@@ -108,7 +108,7 @@ public function testShortcut() {
$this->drupalPlaceBlock('shortcuts');
$this->drupalGet('');
- $this->assertLink($shortcut->label());
+ $this->assertSession()->linkExists($shortcut->label());
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
index 130c8c41f4..2e2c6b2895 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
@@ -90,7 +90,10 @@ protected function setUp() {
\Drupal::service('theme_installer')->install(array_keys($this->themes));
// Create a test user.
- $this->user = $this->drupalCreateUser(['access content', 'access user profiles']);
+ $this->user = $this->drupalCreateUser([
+ 'access content',
+ 'access user profiles',
+ ]);
$this->user->name = $this->xssLabel;
$this->user->save();
$this->drupalLogin($this->user);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php
index 01409642f5..1fad43e7d5 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ExperimentalThemeTest.php
@@ -28,7 +28,10 @@ class ExperimentalThemeTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer themes']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer themes',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
index fe07bb50f3..d3c8b42078 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
@@ -28,7 +28,10 @@ class ThemeTokenTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $account = $this->drupalCreateUser(['administer blocks', 'view the administration theme']);
+ $account = $this->drupalCreateUser([
+ 'administer blocks',
+ 'view the administration theme',
+ ]);
$this->drupalLogin($account);
}
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
index c3771718d5..6edaa58b96 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
@@ -50,7 +50,9 @@ protected function setUp() {
require_once $this->root . '/core/includes/update.inc';
$this->updateUrl = $GLOBALS['base_url'] . '/update.php';
- $this->updateUser = $this->drupalCreateUser(['administer software updates']);
+ $this->updateUser = $this->drupalCreateUser([
+ 'administer software updates',
+ ]);
}
public function testInvalidUpdateHook() {
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
index 9b6cc77a4e..f51769ac4e 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
@@ -46,7 +46,9 @@ protected function setUp() {
require_once $this->root . '/core/includes/update.inc';
$this->updateUrl = Url::fromRoute('system.db_update');
- $this->updateUser = $this->drupalCreateUser(['administer software updates']);
+ $this->updateUser = $this->drupalCreateUser([
+ 'administer software updates',
+ ]);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
index 254a9d95ce..3aa73661e5 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
@@ -103,7 +103,7 @@ public function testUpdatedSite() {
// now that we're logged in.
$this->drupalGet('node/8', ['language' => $spanish]);
$this->assertText('Test 12');
- $this->assertLink('drupal');
+ $this->assertSession()->linkExists('drupal');
// Make sure the content for node 8 is still in the edit form.
$this->drupalGet('node/8/edit');
@@ -135,7 +135,7 @@ public function testUpdatedSite() {
$this->assertText('usuario_test');
$this->assertRaw('druplicon.small');
$this->assertText('Test file field');
- $this->assertLink('test.txt');
+ $this->assertSession()->linkExists('test.txt');
// Make sure the user is translated.
$this->drupalGet('user/3/translations');
@@ -235,24 +235,24 @@ public function testUpdatedSite() {
$this->drupalGet('admin/structure/types/manage/test_content_type/fields');
// Make sure fields are the right type.
- $this->assertLink('Text (formatted, long, with summary)');
- $this->assertLink('Boolean');
- $this->assertLink('Comments');
- $this->assertLink('Date');
- $this->assertLink('Email');
- $this->assertLink('Link');
- $this->assertLink('List (float)');
- $this->assertLink('Telephone number');
- $this->assertLink('Entity reference');
- $this->assertLink('File');
- $this->assertLink('Image');
- $this->assertLink('Text (plain, long)');
- $this->assertLink('List (text)');
- $this->assertLink('Text (formatted, long)');
- $this->assertLink('Text (plain)');
- $this->assertLink('List (integer)');
- $this->assertLink('Number (integer)');
- $this->assertLink('Number (float)');
+ $this->assertSession()->linkExists('Text (formatted, long, with summary)');
+ $this->assertSession()->linkExists('Boolean');
+ $this->assertSession()->linkExists('Comments');
+ $this->assertSession()->linkExists('Date');
+ $this->assertSession()->linkExists('Email');
+ $this->assertSession()->linkExists('Link');
+ $this->assertSession()->linkExists('List (float)');
+ $this->assertSession()->linkExists('Telephone number');
+ $this->assertSession()->linkExists('Entity reference');
+ $this->assertSession()->linkExists('File');
+ $this->assertSession()->linkExists('Image');
+ $this->assertSession()->linkExists('Text (plain, long)');
+ $this->assertSession()->linkExists('List (text)');
+ $this->assertSession()->linkExists('Text (formatted, long)');
+ $this->assertSession()->linkExists('Text (plain)');
+ $this->assertSession()->linkExists('List (integer)');
+ $this->assertSession()->linkExists('Number (integer)');
+ $this->assertSession()->linkExists('Number (float)');
// Make sure our form mode exists.
$this->drupalGet('admin/structure/display-modes/form');
@@ -327,7 +327,7 @@ public function testUpdatedSite() {
// Make sure the terms are still translated.
$this->drupalGet('taxonomy/term/2/translations');
- $this->assertLink('Test root term - Spanish');
+ $this->assertSession()->linkExists('Test root term - Spanish');
// Make sure our contact form exists.
$this->drupalGet('admin/structure/contact');
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
index 96f1559a05..b6dfc1a5de 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
@@ -56,7 +56,9 @@ protected function setUp() {
->execute();
$this->updateUrl = Url::fromRoute('system.db_update');
- $this->updateUser = $this->drupalCreateUser(['administer software updates']);
+ $this->updateUser = $this->drupalCreateUser([
+ 'administer software updates',
+ ]);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
index c075e1848b..9f2811c2d6 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
@@ -45,7 +45,10 @@ protected function setUp() {
parent::setUp();
require_once $this->root . '/core/includes/update.inc';
- $this->user = $this->drupalCreateUser(['administer software updates', 'access site in maintenance mode']);
+ $this->user = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access site in maintenance mode',
+ ]);
$this->updateUrl = Url::fromRoute('system.db_update');
}
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
index 7c3c3bff15..5cb492dfb3 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
@@ -86,7 +86,7 @@ public function testUpdateAccess() {
// Check that a link to the update page is not accessible to regular users.
$this->drupalGet('/update-script-test/database-updates-menu-item');
- $this->assertNoLink('Run database updates');
+ $this->assertSession()->linkNotExists('Run database updates');
// Try accessing update.php as an anonymous user.
$this->drupalLogout();
@@ -96,7 +96,7 @@ public function testUpdateAccess() {
// Check that a link to the update page is not accessible to anonymous
// users.
$this->drupalGet('/update-script-test/database-updates-menu-item');
- $this->assertNoLink('Run database updates');
+ $this->assertSession()->linkNotExists('Run database updates');
// Access the update page with the proper permission.
$this->drupalLogin($this->updateUser);
@@ -106,7 +106,7 @@ public function testUpdateAccess() {
// Check that a link to the update page is accessible to users with proper
// permissions.
$this->drupalGet('/update-script-test/database-updates-menu-item');
- $this->assertLink('Run database updates');
+ $this->assertSession()->linkExists('Run database updates');
// Access the update page as user 1.
$this->drupalLogin($this->rootUser);
@@ -115,7 +115,7 @@ public function testUpdateAccess() {
// Check that a link to the update page is accessible to user 1.
$this->drupalGet('/update-script-test/database-updates-menu-item');
- $this->assertLink('Run database updates');
+ $this->assertSession()->linkExists('Run database updates');
}
/**
@@ -519,19 +519,22 @@ public function testNoUpdateFunctionality() {
$this->updateRequirementsProblem();
$this->clickLink(t('Continue'));
$this->assertText(t('No pending updates.'));
- $this->assertNoLink('Administration pages');
+ $this->assertSession()->linkNotExists('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Front page');
$this->assertSession()->statusCodeEquals(200);
// Click through update.php with 'access administration pages' permission.
- $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access administration pages',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
$this->updateRequirementsProblem();
$this->clickLink(t('Continue'));
$this->assertText(t('No pending updates.'));
- $this->assertLink('Administration pages');
+ $this->assertSession()->linkExists('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
$this->assertSession()->statusCodeEquals(200);
@@ -558,7 +561,12 @@ public function testSuccessfulUpdateFunctionality() {
// Click through update.php with 'access administration pages' and
// 'access site reports' permissions.
- $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access administration pages',
+ 'access site reports',
+ 'access site in maintenance mode',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
$this->updateRequirementsProblem();
@@ -566,8 +574,8 @@ public function testSuccessfulUpdateFunctionality() {
$this->clickLink(t('Apply pending updates'));
$this->checkForMetaRefresh();
$this->assertText('Updates were attempted.');
- $this->assertLink('logged');
- $this->assertLink('Administration pages');
+ $this->assertSession()->linkExists('logged');
+ $this->assertSession()->linkExists('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
$this->assertSession()->statusCodeEquals(200);
@@ -617,7 +625,13 @@ public function testSuccessfulMultilingualUpdateFunctionality() {
$this->assertEqual($schema_version, 8000, 'update_script_test schema version overridden to 8000.');
// Create admin user.
- $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access administration pages',
+ 'access site reports',
+ 'access site in maintenance mode',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
// Visit status report page and ensure, that link to update.php has no path prefix set.
@@ -634,8 +648,8 @@ public function testSuccessfulMultilingualUpdateFunctionality() {
$this->clickLink(t('Apply pending updates'));
$this->checkForMetaRefresh();
$this->assertText('Updates were attempted.');
- $this->assertLink('logged');
- $this->assertLink('Administration pages');
+ $this->assertSession()->linkExists('logged');
+ $this->assertSession()->linkExists('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
$this->assertSession()->statusCodeEquals(200);
@@ -686,7 +700,7 @@ protected function runUpdates($maintenance_mode) {
// Verify that updates were completed successfully.
$this->assertText('Updates were attempted.');
- $this->assertLink('site');
+ $this->assertSession()->linkExists('site');
$this->assertText('The update_script_test_update_8001() update was executed successfully.');
// Verify that no 7.x updates were run.
@@ -694,9 +708,9 @@ protected function runUpdates($maintenance_mode) {
$this->assertNoText('The update_script_test_update_7201() update was executed successfully.');
// Verify that there are no links to different parts of the workflow.
- $this->assertNoLink('Administration pages');
+ $this->assertSession()->linkNotExists('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
- $this->assertNoLink('logged');
+ $this->assertSession()->linkNotExists('logged');
// Verify the front page can be visited following the upgrade.
$this->clickLink('Front page');
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
index 0eda9dd86d..7dca8dc9b3 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
@@ -43,7 +43,9 @@ protected function setUp() {
parent::setUp();
require_once $this->root . '/core/includes/update.inc';
$this->updateUrl = $GLOBALS['base_url'] . '/update.php';
- $this->updateUser = $this->drupalCreateUser(['administer software updates']);
+ $this->updateUser = $this->drupalCreateUser([
+ 'administer software updates',
+ ]);
}
public function testWith7x() {
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php
index 3460f15b3b..cd7890302b 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/System/DateFormatTest.php
@@ -29,7 +29,9 @@ protected function setUp() {
parent::setUp();
// Create admin user and log in admin user.
- $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer site configuration',
+ ]));
$this->drupalPlaceBlock('local_actions_block');
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php b/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
index 74b0093738..211e3e5732 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
@@ -51,7 +51,11 @@ protected function setUp() {
])
->save();
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'administer nodes', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'administer nodes',
+ 'bypass node access',
+ ]));
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
index d208a3a4e1..ae80adb5b4 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
@@ -42,7 +42,12 @@ class RssTest extends TaxonomyTestBase {
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access', 'administer content types', 'administer node display']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ 'administer content types',
+ 'administer node display',
+ ]));
$this->vocabulary = $this->createVocabulary();
$this->fieldName = 'taxonomy_' . $this->vocabulary->id();
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
index 4c3265192f..747a4c041f 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
@@ -80,7 +80,11 @@ protected function setUp() {
}
public function testTaxonomyImageAccess() {
- $user = $this->drupalCreateUser(['administer site configuration', 'administer taxonomy', 'access user profiles']);
+ $user = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer taxonomy',
+ 'access user profiles',
+ ]);
$this->drupalLogin($user);
// Create a term and upload the image.
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
index 8e580023e7..74d10f55bc 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
@@ -30,7 +30,10 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]));
$this->vocabulary = $this->createVocabulary();
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
index 99c80db177..c5866fddbe 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
@@ -33,7 +33,10 @@ class TaxonomyTermPagerTest extends TaxonomyTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]));
$this->vocabulary = $this->createVocabulary();
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
index dd240bee6d..f83313d77f 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
@@ -50,7 +50,10 @@ protected function setUp() {
parent::setUp();
// Create an administrative user.
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]));
// Create a vocabulary and add two term reference fields to article nodes.
$this->vocabulary = $this->createVocabulary();
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 9c5b993916..3c8e2ee004 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -51,7 +51,10 @@ protected function setUp() {
$this->drupalPlaceBlock('local_tasks_block');
$this->drupalPlaceBlock('page_title_block');
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]));
$this->vocabulary = $this->createVocabulary();
$field_name = 'taxonomy_' . $this->vocabulary->id();
@@ -355,7 +358,7 @@ public function testTermInterface() {
// Check that the term is still present at admin UI after edit.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
$this->assertText($edit['name[0][value]'], 'The randomly generated term name is present.');
- $this->assertLink(t('Edit'));
+ $this->assertSession()->linkExists(t('Edit'));
// Check the term link can be clicked through to the term page.
$this->clickLink($edit['name[0][value]']);
@@ -601,7 +604,7 @@ public function testTermBreadcrumbs() {
$this->assertCount(2, $breadcrumbs, 'The breadcrumbs are present on the page.');
$this->assertIdentical($breadcrumbs[0]->getText(), 'Home', 'First breadcrumb text is Home');
$this->assertIdentical($breadcrumbs[1]->getText(), $term->label(), 'Second breadcrumb text is term name on term edit page.');
- $this->assertEscaped($breadcrumbs[1]->getText(), 'breadcrumbs displayed and escaped.');
+ $this->assertEscaped($breadcrumbs[1]->getText());
// Check the breadcrumb on the term delete page.
$this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
@@ -609,7 +612,7 @@ public function testTermBreadcrumbs() {
$this->assertCount(2, $breadcrumbs, 'The breadcrumbs are present on the page.');
$this->assertIdentical($breadcrumbs[0]->getText(), 'Home', 'First breadcrumb text is Home');
$this->assertIdentical($breadcrumbs[1]->getText(), $term->label(), 'Second breadcrumb text is term name on term delete page.');
- $this->assertEscaped($breadcrumbs[1]->getText(), 'breadcrumbs displayed and escaped.');
+ $this->assertEscaped($breadcrumbs[1]->getText());
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php b/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
index e0a8774fc9..2fd550efcc 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
@@ -27,7 +27,10 @@ protected function setUp() {
// Create and log in as a user who has permission to add and edit taxonomy
// terms and view the administrative theme.
- $admin_user = $this->drupalCreateUser(['administer taxonomy', 'view the administration theme']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer taxonomy',
+ 'view the administration theme',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index 7474cee2d1..c210013660 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -35,7 +35,10 @@ class TokenReplaceTest extends TaxonomyTestBase {
protected function setUp() {
parent::setUp();
- $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'bypass node access']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]));
$this->vocabulary = $this->createVocabulary();
$this->fieldName = 'taxonomy_' . $this->vocabulary->id();
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index df286a331d..eb0774abb3 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -57,7 +57,10 @@ class TaxonomyIndexTidUiTest extends UITestBase {
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
- $this->adminUser = $this->drupalCreateUser(['administer taxonomy', 'administer views']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer taxonomy',
+ 'administer views',
+ ]);
$this->drupalLogin($this->adminUser);
Vocabulary::create([
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
index e1b7f3f1c9..f1ac4414bf 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
@@ -49,7 +49,10 @@ protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Create an administrative user.
- $this->adminUser = $this->drupalCreateUser(['administer taxonomy', 'bypass node access']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer taxonomy',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->adminUser);
// Create a vocabulary and add two term reference fields to article nodes.
diff --git a/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
index 40607d2359..447d26c3c4 100644
--- a/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
+++ b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
@@ -43,7 +43,10 @@ protected function setUp() {
parent::setUp();
$this->drupalCreateContentType(['type' => 'article']);
- $this->webUser = $this->drupalCreateUser(['create article content', 'edit own article content']);
+ $this->webUser = $this->drupalCreateUser([
+ 'create article content',
+ 'edit own article content',
+ ]);
$this->drupalLogin($this->webUser);
// Add the telephone field to the article content type.
diff --git a/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php b/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
index 9d939eead4..c3682771d3 100644
--- a/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
+++ b/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
@@ -30,7 +30,10 @@ protected function setUp() {
$this->drupalCreateContentType(['type' => 'page']);
- $account = $this->drupalCreateUser(['create page content', 'edit own page content']);
+ $account = $this->drupalCreateUser([
+ 'create page content',
+ 'edit own page content',
+ ]);
$this->drupalLogin($account);
}
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
index 8a0a3bb7fd..2afaeaebb3 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
@@ -262,7 +262,10 @@ public function testNonCurrentUserAccountUpdates() {
public function testLocaleTranslationSubtreesHashCacheClear() {
$admin_user = $this->adminUser;
// User to translate and delete string.
- $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
+ $translate_user = $this->drupalCreateUser([
+ 'translate interface',
+ 'access administration pages',
+ ]);
// Create a new language with the langcode 'xx'.
$langcode = 'xx';
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
index 8ff8fd8a5d..1b1a24cb40 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
@@ -39,7 +39,12 @@ protected function setUp() {
parent::setUp();
// Create an administrative user and log it in.
- $this->adminUser = $this->drupalCreateUser(['access toolbar', 'translate interface', 'administer languages', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'access toolbar',
+ 'translate interface',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/tour/tests/src/Functional/TourHelpPageTest.php b/web/core/modules/tour/tests/src/Functional/TourHelpPageTest.php
index a88da72cb9..d3d109485e 100644
--- a/web/core/modules/tour/tests/src/Functional/TourHelpPageTest.php
+++ b/web/core/modules/tour/tests/src/Functional/TourHelpPageTest.php
@@ -46,8 +46,14 @@ protected function setUp() {
// Create users. For the Tour user, include permissions for the language
// tours' parent pages, but not the translation tour's parent page. See
// self:getTourList().
- $this->tourUser = $this->drupalCreateUser(['access administration pages', 'access tour', 'administer languages']);
- $this->noTourUser = $this->drupalCreateUser(['access administration pages']);
+ $this->tourUser = $this->drupalCreateUser([
+ 'access administration pages',
+ 'access tour',
+ 'administer languages',
+ ]);
+ $this->noTourUser = $this->drupalCreateUser([
+ 'access administration pages',
+ ]);
}
/**
@@ -73,7 +79,7 @@ protected function verifyHelp($tours_ok = TRUE) {
// All users should be able to see the module section.
$this->assertText('Module overviews are provided by modules');
foreach ($this->getModuleList() as $name) {
- $this->assertLink($name);
+ $this->assertSession()->linkExists($name);
}
// Some users should be able to see the tour section.
@@ -89,10 +95,10 @@ protected function verifyHelp($tours_ok = TRUE) {
// Test the titles that should be links.
foreach ($titles[0] as $title) {
if ($tours_ok) {
- $this->assertLink($title);
+ $this->assertSession()->linkExists($title);
}
else {
- $this->assertNoLink($title);
+ $this->assertSession()->linkNotExists($title);
// Just test the first item in the list of links that should not
// be there, because the second matches the name of a module that is
// in the Module overviews section, so the link will be there and
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
index 990612d0be..1a7304f3b1 100644
--- a/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
@@ -42,7 +42,10 @@ protected function setUp() {
*/
public function testTrackerNodeAccess() {
// Create user with node test view permission.
- $access_user = $this->drupalCreateUser(['node test view', 'access user profiles']);
+ $access_user = $this->drupalCreateUser([
+ 'node test view',
+ 'access user profiles',
+ ]);
// Create user without node test view permission.
$no_access_user = $this->drupalCreateUser(['access user profiles']);
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerRecentContentLinkTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerRecentContentLinkTest.php
new file mode 100644
index 0000000000..f0b85b34de
--- /dev/null
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerRecentContentLinkTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\Tests\tracker\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests recent content link.
+ *
+ * @group tracker
+ */
+class TrackerRecentContentLinkTest extends BrowserTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['block', 'tracker'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Tests the recent content link in menu block.
+ */
+ public function testRecentContentLink() {
+ $this->drupalGet('<front>');
+ $this->assertSession()->linkNotExists('Recent content');
+ $this->drupalPlaceBlock('system_menu_block:tools');
+
+ // Create a regular user.
+ $user = $this->drupalCreateUser();
+
+ // Log in and get the homepage.
+ $this->drupalLogin($user);
+ $this->drupalGet('<front>');
+
+ $link = $this->xpath('//ul/li/a[contains(@href, :href) and text()=:text]', [
+ ':menu_class' => 'menu-item',
+ ':href' => '/activity',
+ ':text' => 'Recent content',
+ ]);
+ $this->assertCount(1, $link);
+ }
+
+}
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
index 8a8c378b99..0e98d86de5 100644
--- a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -215,7 +215,11 @@ public function testTrackerUser() {
$this->assertTitle($this->user->getAccountName() . ' | Drupal');
// Verify that unpublished comments are removed from the tracker.
- $admin_user = $this->drupalCreateUser(['post comments', 'administer comments', 'access user profiles']);
+ $admin_user = $this->drupalCreateUser([
+ 'post comments',
+ 'administer comments',
+ 'access user profiles',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPostForm('comment/1/edit', ['status' => CommentInterface::NOT_PUBLISHED], t('Save'));
$this->drupalGet('user/' . $this->user->id() . '/activity');
@@ -418,7 +422,11 @@ public function testTrackerCronIndexing() {
public function testTrackerAdminUnpublish() {
\Drupal::service('module_installer')->install(['views']);
\Drupal::service('router.builder')->rebuild();
- $admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content overview',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
$node = $this->drupalCreateNode([
diff --git a/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php b/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
index 2d7d780519..ac483cb21d 100644
--- a/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
+++ b/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
@@ -23,7 +23,11 @@ class FileTransferAuthorizeFormTest extends UpdateTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer software updates', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer software updates',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
// Create a local cache so the module is not downloaded from drupal.org.
diff --git a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
index 6410f5fde3..dc2907ffa1 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -507,7 +507,10 @@ public function testUpdateBrokenFetchURL() {
*/
public function testHookUpdateStatusAlter() {
$update_test_config = $this->config('update_test.settings');
- $update_admin_user = $this->drupalCreateUser(['administer site configuration', 'administer software updates']);
+ $update_admin_user = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer software updates',
+ ]);
$this->drupalLogin($update_admin_user);
$system_info = [
diff --git a/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php b/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
index a7a982f1c0..f01e9b2dd8 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
@@ -40,7 +40,11 @@ class UpdateCoreTest extends UpdateTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer modules', 'administer themes']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer modules',
+ 'administer themes',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalPlaceBlock('local_actions_block');
}
@@ -814,7 +818,12 @@ public function testLanguageModuleUpdate() {
* Ensures that the local actions appear.
*/
public function testLocalActions() {
- $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer modules', 'administer software updates', 'administer themes']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer site configuration',
+ 'administer modules',
+ 'administer software updates',
+ 'administer themes',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/modules');
diff --git a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
index c3da558329..f71b3430e9 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
@@ -32,7 +32,11 @@ class UpdateUploadTest extends UpdateTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer modules', 'administer software updates', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer modules',
+ 'administer software updates',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
}
@@ -88,11 +92,11 @@ public function testUploadModule() {
$this->assertFileExists($installedInfoFilePath);
// Ensure the links are relative to the site root and not
// core/authorize.php.
- $this->assertLink(t('Install another module'));
+ $this->assertSession()->linkExists(t('Install another module'));
$this->assertLinkByHref(Url::fromRoute('update.module_install')->toString());
- $this->assertLink(t('Enable newly added modules'));
+ $this->assertSession()->linkExists(t('Enable newly added modules'));
$this->assertLinkByHref(Url::fromRoute('system.modules_list')->toString());
- $this->assertLink(t('Administration pages'));
+ $this->assertSession()->linkExists(t('Administration pages'));
$this->assertLinkByHref(Url::fromRoute('system.admin')->toString());
// Ensure we can reach the "Install another module" link.
$this->clickLink(t('Install another module'));
diff --git a/web/core/modules/user/src/UserAuthInterface.php b/web/core/modules/user/src/UserAuthInterface.php
index 38cffc0391..91f2cc342c 100644
--- a/web/core/modules/user/src/UserAuthInterface.php
+++ b/web/core/modules/user/src/UserAuthInterface.php
@@ -14,6 +14,7 @@ interface UserAuthInterface {
* The user name to authenticate.
* @param string $password
* A plain-text password, such as trimmed text from form values.
+ *
* @return int|bool
* The user's uid on success, or FALSE on failure to authenticate.
*/
diff --git a/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php b/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
index 25b4df1ef6..456b1ee2fa 100644
--- a/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
@@ -78,7 +78,10 @@ public function testSecondaryMenu() {
*/
public function testDisabledAccountLink() {
// Create an admin user and log in.
- $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer menu']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access administration pages',
+ 'administer menu',
+ ]));
// Verify that the 'My account' link exists before we check for its
// disappearance.
@@ -134,7 +137,7 @@ public function testAccountPageTitles() {
// Check the page title for registered users is "My Account" in menus.
$this->drupalLogin($this->drupalCreateUser());
// After login, the client is redirected to /user.
- $this->assertLink(t('My account'), 0, "Page title of /user is 'My Account' in menus for registered users");
+ $this->assertSession()->linkExists(t('My account'), 0, "Page title of /user is 'My Account' in menus for registered users");
$this->assertLinkByHref(\Drupal::urlGenerator()->generate('user.page'), 0);
}
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
index a99017730c..30f03fea0f 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
@@ -41,7 +41,10 @@ class UserAdminLanguageTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
// User to add and remove language.
- $this->adminUser = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
// User to check non-admin access.
$this->regularUser = $this->drupalCreateUser();
}
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminTest.php b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
index c67dd6b162..ede9088c95 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
@@ -162,7 +162,10 @@ public function testUserAdmin() {
*/
public function testNotificationEmailAddress() {
// Test that the Notification Email address field is on the config page.
- $admin_user = $this->drupalCreateUser(['administer users', 'administer account settings']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer users',
+ 'administer account settings',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/config/people/accounts');
$this->assertRaw('id="edit-mail-notification-address"', 'Notification Email address field exists');
diff --git a/web/core/modules/user/tests/src/Functional/UserCancelTest.php b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
index b800a5c2e9..b714ff4279 100644
--- a/web/core/modules/user/tests/src/Functional/UserCancelTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -420,7 +420,11 @@ public function testUserDelete() {
$user_storage = $this->container->get('entity_type.manager')->getStorage('user');
// Create a user.
- $account = $this->drupalCreateUser(['cancel account', 'post comments', 'skip comment approval']);
+ $account = $this->drupalCreateUser([
+ 'cancel account',
+ 'post comments',
+ 'skip comment approval',
+ ]);
$this->drupalLogin($account);
// Load a real user object.
$user_storage->resetCache([$account->id()]);
diff --git a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
index d19ae76a2f..e6f8870b4e 100644
--- a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
@@ -30,7 +30,11 @@ class UserLanguageCreationTest extends BrowserTestBase {
*/
public function testLocalUserCreation() {
// User to add and remove language and create new users.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer users']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ 'administer users',
+ ]);
$this->drupalLogin($admin_user);
// Add predefined language.
diff --git a/web/core/modules/user/tests/src/Functional/UserLanguageTest.php b/web/core/modules/user/tests/src/Functional/UserLanguageTest.php
index d221a61c1e..b0bd1e4151 100644
--- a/web/core/modules/user/tests/src/Functional/UserLanguageTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLanguageTest.php
@@ -29,7 +29,10 @@ class UserLanguageTest extends BrowserTestBase {
*/
public function testUserLanguageConfiguration() {
// User to add and remove language.
- $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer languages',
+ 'access administration pages',
+ ]);
// User to change their default language.
$web_user = $this->drupalCreateUser();
diff --git a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index 7828e328d5..11a37c27c3 100644
--- a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -391,28 +391,28 @@ public function assertNoValidPasswordReset($name) {
}
/**
- * Helper function to make assertions about a password reset triggering user flood cotrol.
+ * Makes assertions about a password reset triggering user flood control.
*/
public function assertPasswordUserFlood() {
$this->assertText(t('Too many password recovery requests for this account. It is temporarily blocked. Try again later or contact the site administrator.'), 'User password reset flood error message shown.');
}
/**
- * Helper function to make assertions about a password reset not triggering user flood control.
+ * Makes assertions about a password reset not triggering user flood control.
*/
public function assertNoPasswordUserFlood() {
$this->assertNoText(t('Too many password recovery requests for this account. It is temporarily blocked. Try again later or contact the site administrator.'), 'User password reset flood error message not shown.');
}
/**
- * Helper function to make assertions about a password reset triggering IP flood cotrol.
+ * Makes assertions about a password reset triggering IP flood control.
*/
public function assertPasswordIpFlood() {
$this->assertText(t('Too many password recovery requests from your IP address. It is temporarily blocked. Try again later or contact the site administrator.'), 'IP password reset flood error message shown.');
}
/**
- * Helper function to make assertions about a password reset not triggering IP flood control.
+ * Makes assertions about a password reset not triggering IP flood control.
*/
public function assertNoPasswordIpFlood() {
$this->assertNoText(t('Too many password recovery requests from your IP address. It is temporarily blocked. Try again later or contact the site administrator.'), 'IP password reset flood error message not shown.');
diff --git a/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php b/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
index 0eb453fc26..df8289797f 100644
--- a/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
@@ -36,7 +36,13 @@ class UserPermissionsTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer account settings']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer permissions',
+ 'access user profiles',
+ 'administer site configuration',
+ 'administer modules',
+ 'administer account settings',
+ ]);
// Find the new role ID.
$all_rids = $this->adminUser->getRoles();
diff --git a/web/core/modules/user/tests/src/Functional/UserPictureTest.php b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
index 7c8c8975ff..0b6940ecee 100644
--- a/web/core/modules/user/tests/src/Functional/UserPictureTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\user\Functional;
use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
use Drupal\Core\StreamWrapper\StreamWrapperManager;
use Drupal\file\Entity\File;
use Drupal\image\Entity\ImageStyle;
@@ -159,4 +160,21 @@ public function saveUserPicture($image) {
return File::load($account->user_picture->target_id);
}
+ /**
+ * Tests user picture field with a non-standard field formatter.
+ *
+ * @see user_user_view_alter()
+ */
+ public function testUserViewAlter() {
+ \Drupal::service('module_installer')->install(['image_module_test']);
+ // Set dummy_image_formatter to the default view mode of user entity.
+ EntityViewDisplay::load('user.user.default')->setComponent('user_picture', [
+ 'region' => 'content',
+ 'type' => 'dummy_image_formatter',
+ ])->save();
+ $this->drupalLogin($this->webUser);
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->pageTextContains('Dummy');
+ }
+
}
diff --git a/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php b/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
index 1ac9f214b8..29b7a6001a 100644
--- a/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
@@ -37,7 +37,10 @@ class UserRoleAdminTest extends BrowserTestBase {
*/
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer permissions', 'administer users']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer permissions',
+ 'administer users',
+ ]);
$this->drupalPlaceBlock('local_tasks_block');
}
diff --git a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index bbda4c7914..c7eb970cb0 100644
--- a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -13,7 +13,10 @@ class UserRolesAssignmentTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
- $admin_user = $this->drupalCreateUser(['administer permissions', 'administer users']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer permissions',
+ 'administer users',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/user/tests/src/Functional/UserSearchTest.php b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
index 1c5aa6ae1f..13c49e0fb4 100644
--- a/web/core/modules/user/tests/src/Functional/UserSearchTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
@@ -28,7 +28,10 @@ public function testUserSearch() {
// Verify that a user without 'administer users' permission cannot search
// for users by email address. Additionally, ensure that the username has a
// plus sign to ensure searching works with that.
- $user1 = $this->drupalCreateUser(['access user profiles', 'search content'], "foo+bar");
+ $user1 = $this->drupalCreateUser([
+ 'access user profiles',
+ 'search content',
+ ], "foo+bar");
$this->drupalLogin($user1);
$keys = $user1->getEmail();
$edit = ['keys' => $keys];
@@ -46,23 +49,27 @@ public function testUserSearch() {
$keys = $user1->getAccountName();
$edit = ['keys' => $keys];
$this->drupalPostForm('search/user', $edit, t('Search'));
- $this->assertLink($keys, 0, 'Search by username worked for non-admin user');
+ $this->assertSession()->linkExists($keys, 0, 'Search by username worked for non-admin user');
// Verify that searching by sub-string works too.
$subkey = substr($keys, 1, 5);
$edit = ['keys' => $subkey];
$this->drupalPostForm('search/user', $edit, t('Search'));
- $this->assertLink($keys, 0, 'Search by username substring worked for non-admin user');
+ $this->assertSession()->linkExists($keys, 0, 'Search by username substring worked for non-admin user');
// Verify that wildcard search works.
$subkey = substr($keys, 0, 2) . '*' . substr($keys, 4, 2);
$edit = ['keys' => $subkey];
$this->drupalPostForm('search/user', $edit, t('Search'));
- $this->assertLink($keys, 0, 'Search with wildcard worked for non-admin user');
+ $this->assertSession()->linkExists($keys, 0, 'Search with wildcard worked for non-admin user');
// Verify that a user with 'administer users' permission can search by
// email.
- $user2 = $this->drupalCreateUser(['administer users', 'access user profiles', 'search content']);
+ $user2 = $this->drupalCreateUser([
+ 'administer users',
+ 'access user profiles',
+ 'search content',
+ ]);
$this->drupalLogin($user2);
$keys = $user2->getEmail();
$edit = ['keys' => $keys];
diff --git a/web/core/modules/user/tests/src/Functional/Views/AccessTestBase.php b/web/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
index 36f2334f11..cc0de2a623 100644
--- a/web/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
+++ b/web/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
@@ -56,7 +56,9 @@ protected function setUp($import_test_views = TRUE) {
$this->webRole = $roles[0];
$this->normalRole = $this->drupalCreateRole([]);
- $this->normalUser = $this->drupalCreateUser(['views_test_data test permission']);
+ $this->normalUser = $this->drupalCreateUser([
+ 'views_test_data test permission',
+ ]);
$this->normalUser->addRole($this->normalRole);
$this->normalUser->save();
// @todo when all the plugin information is cached make a reset function and
diff --git a/web/core/modules/user/tests/src/Functional/Views/BulkFormTest.php b/web/core/modules/user/tests/src/Functional/Views/BulkFormTest.php
index f7cb4f3fe0..87142c1c03 100644
--- a/web/core/modules/user/tests/src/Functional/Views/BulkFormTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/BulkFormTest.php
@@ -114,7 +114,11 @@ public function testBulkForm() {
$this->assertTrue($anonymous_account->isBlocked(), 'Ensure the anonymous user got blocked.');
// Test the list of available actions with a value that contains a dot.
- $this->drupalLogin($this->drupalCreateUser(['administer permissions', 'administer views', 'administer users']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer permissions',
+ 'administer views',
+ 'administer users',
+ ]));
$action_id = 'user_add_role_action.' . $role;
$edit = [
'options[include_exclude]' => 'exclude',
diff --git a/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php b/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
index 1835858583..ad21dd2155 100644
--- a/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
@@ -43,12 +43,15 @@ protected function setUp($import_test_views = TRUE) {
* Tests basic filter handler settings in the UI.
*/
public function testHandlerUI() {
- $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer users']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer views',
+ 'administer users',
+ ]));
$this->drupalGet('admin/structure/views/view/test_filter_permission/edit/default');
// Verify that the handler summary is correctly displaying the selected
// permission.
- $this->assertLink('User: Permission (= View user information)');
+ $this->assertSession()->linkExists('User: Permission (= View user information)');
$this->drupalPostForm(NULL, [], 'Save');
// Verify that we can save the view.
$this->assertNoText('No valid values found on filter: User: Permission.');
@@ -63,7 +66,7 @@ public function testHandlerUI() {
],
];
$this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_permission/default/filter/permission', $edit, 'Apply');
- $this->assertLink('User: Permission (or View us…)');
+ $this->assertSession()->linkExists('User: Permission (or View us…)');
$this->drupalPostForm(NULL, [], 'Save');
// Verify that we can save the view.
$this->assertNoText('No valid values found on filter: User: Permission.');
diff --git a/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php b/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
index dbb8fc56c4..2660593f5e 100644
--- a/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
@@ -90,7 +90,10 @@ public function testUserNameApi() {
* Tests using the user interface.
*/
public function testAdminUserInterface() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$path = 'admin/structure/views/nojs/handler/test_user_name/default/filter/uid';
diff --git a/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php b/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
index 5a41180276..318bbe098c 100644
--- a/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
+++ b/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
@@ -96,24 +96,24 @@ public function testUserTempStore() {
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
$metadata = $stores[0]->getMetadata($key);
$this->assertEqual($users[0], $metadata->owner);
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Another user should get the same result.
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[0], $metadata->owner);
- $this->assertIdenticalObject($this->objects[0], $stores[1]->get($key));
+ $this->assertEquals($this->objects[0], $stores[1]->get($key));
}
// Remove the item and try to set it again.
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// This user can update the object.
$stores[0]->set($key, $this->objects[2]);
- $this->assertIdenticalObject($this->objects[2], $stores[0]->get($key));
+ $this->assertEquals($this->objects[2], $stores[0]->get($key));
// The object is the same when another user loads it.
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get($key));
+ $this->assertEquals($this->objects[2], $stores[1]->get($key));
// This user should be allowed to get, update, delete.
$this->assertTrue($stores[0]->getIfOwner($key) instanceof \stdClass);
@@ -122,8 +122,8 @@ public function testUserTempStore() {
// Another user can update the object and become the owner.
$stores[1]->set($key, $this->objects[3]);
- $this->assertIdenticalObject($this->objects[3], $stores[0]->get($key));
- $this->assertIdenticalObject($this->objects[3], $stores[1]->get($key));
+ $this->assertEquals($this->objects[3], $stores[0]->get($key));
+ $this->assertEquals($this->objects[3], $stores[1]->get($key));
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[1], $metadata->owner);
diff --git a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
index 2e44cf4c25..3c4fbeebc6 100644
--- a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
@@ -135,9 +135,6 @@ protected function buildAccountForm($operation) {
$entity = $this->container->get('entity_type.manager')
->getStorage($entity_type)
->create($fields);
- $this->container->get('entity_type.manager')
- ->getFormObject($entity_type, $operation)
- ->setEntity($entity);
// @see EntityFormBuilder::getForm()
return $this->container->get('entity.form_builder')->getForm($entity, $operation);
diff --git a/web/core/modules/user/tests/src/Kernel/UserInstallTest.php b/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
index 3e9282b5d9..e8f1620856 100644
--- a/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\user\Kernel;
-use Drupal\Core\Database\Database;
use Drupal\KernelTests\KernelTestBase;
/**
@@ -33,22 +32,22 @@ protected function setUp() {
* Test that the initial users have correct values.
*/
public function testUserInstall() {
- $result = Database::getConnection()->query('SELECT u.uid, u.uuid, u.langcode, uf.status FROM {users} u INNER JOIN {users_field_data} uf ON u.uid=uf.uid ORDER BY u.uid')
- ->fetchAllAssoc('uid');
- $anon = $result[0];
- $admin = $result[1];
- $this->assertFalse(empty($anon->uuid), 'Anon user has a UUID');
- $this->assertFalse(empty($admin->uuid), 'Admin user has a UUID');
+ $user_ids = \Drupal::entityQuery('user')->sort('uid')->execute();
+ $users = \Drupal::entityTypeManager()->getStorage('user')->loadMultiple($user_ids);
+ $anon = $users[0];
+ $admin = $users[1];
+ $this->assertNotEmpty($anon->uuid(), 'Anon user has a UUID');
+ $this->assertNotEmpty($admin->uuid(), 'Admin user has a UUID');
// Test that the anonymous and administrators languages are equal to the
// site's default language.
- $this->assertEqual($anon->langcode, \Drupal::languageManager()->getDefaultLanguage()->getId());
- $this->assertEqual($admin->langcode, \Drupal::languageManager()->getDefaultLanguage()->getId());
+ $this->assertEquals('en', $anon->language()->getId());
+ $this->assertEquals('en', $admin->language()->getId());
// Test that the administrator is active.
- $this->assertEqual($admin->status, 1);
+ $this->assertTrue($admin->isActive());
// Test that the anonymous user is blocked.
- $this->assertEqual($anon->status, 0);
+ $this->assertTrue($anon->isBlocked());
}
}
diff --git a/web/core/modules/user/user.module b/web/core/modules/user/user.module
index 74ce5de07c..a76615bc95 100644
--- a/web/core/modules/user/user.module
+++ b/web/core/modules/user/user.module
@@ -19,6 +19,7 @@
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\Core\Site\Settings;
use Drupal\Core\Url;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
use Drupal\system\Entity\Action;
use Drupal\user\Entity\Role;
use Drupal\user\Entity\User;
@@ -414,8 +415,15 @@ function user_user_view(array &$build, UserInterface $account, EntityViewDisplay
* accessibility.
*/
function user_user_view_alter(array &$build, UserInterface $account, EntityViewDisplayInterface $display) {
- if (user_picture_enabled() && !empty($build['user_picture'])) {
+ if (!empty($build['user_picture']) && user_picture_enabled()) {
foreach (Element::children($build['user_picture']) as $key) {
+ if (!isset($build['user_picture'][$key]['#item']) || !($build['user_picture'][$key]['#item'] instanceof ImageItem)) {
+ // User picture field is provided by standard profile install. If the
+ // display is configured to use a different formatter, the #item render
+ // key may not exist, or may not be an image field.
+ continue;
+ }
+ /** @var \Drupal\image\Plugin\Field\FieldType\ImageItem $item */
$item = $build['user_picture'][$key]['#item'];
if (!$item->get('alt')->getValue()) {
$item->get('alt')->setValue(\Drupal::translation()->translate('Profile picture for user @username', ['@username' => $account->getAccountName()]));
diff --git a/web/core/modules/views/src/Plugin/views/field/BulkForm.php b/web/core/modules/views/src/Plugin/views/field/BulkForm.php
index b6f28d4b60..0f11495293 100644
--- a/web/core/modules/views/src/Plugin/views/field/BulkForm.php
+++ b/web/core/modules/views/src/Plugin/views/field/BulkForm.php
@@ -355,6 +355,7 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
*
* @param bool $filtered
* (optional) Whether to filter actions to selected actions.
+ *
* @return array
* An associative array of operations, suitable for a select element.
*/
diff --git a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index c23dccd789..f031a32f6d 100644
--- a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -537,6 +537,7 @@ public function renderGroupingSets($sets) {
* Views 7.x-3.0-rc2. After Views 7.x-3.0 this boolean is only used if
* $groupings is an old-style string or if the rendered option is missing
* for a grouping instruction.
+ *
* @return
* The grouped record set.
* A nested set structure is generated if multiple grouping fields are used.
diff --git a/web/core/modules/views/src/Views.php b/web/core/modules/views/src/Views.php
index 86dcdf7a9a..42ae43118a 100644
--- a/web/core/modules/views/src/Views.php
+++ b/web/core/modules/views/src/Views.php
@@ -115,14 +115,15 @@ public static function handlerManager($type) {
* @param string $id
* The view ID to load.
*
- * @return \Drupal\views\ViewExecutable
- * A view executable instance, from the loaded entity.
+ * @return \Drupal\views\ViewExecutable|null
+ * A view executable instance or NULL if the view does not exist.
*/
public static function getView($id) {
$view = \Drupal::entityTypeManager()->getStorage('view')->load($id);
if ($view) {
return static::executableFactory()->get($view);
}
+ return NULL;
}
/**
diff --git a/web/core/modules/views/src/ViewsConfigUpdater.php b/web/core/modules/views/src/ViewsConfigUpdater.php
index af3260405a..2555dbc97f 100644
--- a/web/core/modules/views/src/ViewsConfigUpdater.php
+++ b/web/core/modules/views/src/ViewsConfigUpdater.php
@@ -8,6 +8,7 @@
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Entity\EntityFieldManagerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
use Drupal\Core\Entity\Sql\DefaultTableMapping;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -285,7 +286,7 @@ protected function getMultivalueBaseFieldUpdateTableInfo() {
$table_info = [];
foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- if ($entity_type->hasHandlerClass('views_data')) {
+ if ($entity_type->hasHandlerClass('views_data') && $entity_type->entityClassImplements(FieldableEntityInterface::class)) {
$base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
$entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
diff --git a/web/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml b/web/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
new file mode 100644
index 0000000000..8ea57d8759
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
@@ -0,0 +1,9 @@
+views_config_entity_test.type.*:
+ type: config_entity
+ label: 'Config entity type with Views data'
+ mapping:
+ id:
+ type: string
+ name:
+ type: label
+ label: 'Name'
diff --git a/web/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php b/web/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
new file mode 100644
index 0000000000..2649e76ad4
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\views_config_entity_test\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+
+/**
+ * Defines a configuration-based entity type used for testing Views data.
+ *
+ * @ConfigEntityType(
+ * id = "views_config_entity_test",
+ * label = @Translation("Test config entity type with Views data"),
+ * handlers = {
+ * "list_builder" = "Drupal\Core\Entity\EntityListBuilder",
+ * "views_data" = "Drupal\views_config_entity_test\ViewsConfigEntityTestViewsData"
+ * },
+ * admin_permission = "administer modules",
+ * config_prefix = "type",
+ * entity_keys = {
+ * "id" = "id",
+ * "label" = "name"
+ * }
+ * )
+ */
+class ViewsConfigEntityTest extends ConfigEntityBase {
+}
diff --git a/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php b/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
new file mode 100644
index 0000000000..97138f1c40
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\views_config_entity_test;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\views\EntityViewsDataInterface;
+
+/**
+ * Provides a view to override views data for config test entity types.
+ */
+class ViewsConfigEntityTestViewsData implements EntityViewsDataInterface {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getViewsData() {
+ return [];
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getViewsTableForEntityType(EntityTypeInterface $entity_type) {
+ return 'views_config_entity_test';
+ }
+
+}
diff --git a/web/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml b/web/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
new file mode 100644
index 0000000000..95962a1262
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
@@ -0,0 +1,5 @@
+name: 'views_config_entity_test'
+description: 'Adds a Config Entity with views data'
+type: module
+package: Testing
+version: VERSION
diff --git a/web/core/modules/views/tests/src/Functional/BulkFormTest.php b/web/core/modules/views/tests/src/Functional/BulkFormTest.php
index 8d72267d54..1a6a8d6aaa 100644
--- a/web/core/modules/views/tests/src/Functional/BulkFormTest.php
+++ b/web/core/modules/views/tests/src/Functional/BulkFormTest.php
@@ -68,7 +68,11 @@ public function testBulkForm() {
// Log in as a user with 'administer nodes' permission to have access to the
// bulk operation.
$this->drupalCreateContentType(['type' => 'page']);
- $admin_user = $this->drupalCreateUser(['administer nodes', 'edit any page content', 'delete any page content']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'edit any page content',
+ 'delete any page content',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('test_bulk_form');
diff --git a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index cb6ce55183..30dcaeb7d3 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -57,7 +57,10 @@ protected function viewsData() {
* Tests the generic UI of a area handler.
*/
public function testUI() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$types = ['header', 'footer', 'empty'];
@@ -158,7 +161,10 @@ public function testAreaAccess() {
* Tests global tokens.
*/
public function testRenderAreaToken() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$view = Views::getView('test_example_area');
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
index 1762ed5a51..2605dd7258 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
@@ -37,7 +37,11 @@ class FieldDropButtonTest extends ViewTestBase {
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
- $admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content overview',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
index 99db5e1adb..c7e89f9630 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
@@ -66,7 +66,11 @@ public function testEntityOperations() {
$entities[$i] = $entity;
}
- $admin_user = $this->drupalCreateUser(['access administration pages', 'administer nodes', 'bypass node access']);
+ $admin_user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer nodes',
+ 'bypass node access',
+ ]);
$this->drupalLogin($this->rootUser);
$this->drupalGet('test-entity-operations');
/** @var $entity \Drupal\entity_test\Entity\EntityTest */
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index b61204e1f9..4d2bb7fd7b 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -125,6 +125,7 @@ protected function clickSortLoadIdsFromOutput() {
* The message to display along with the assertion.
* @param string $group
* The type of assertion - examples are "Browser", "PHP".
+ *
* @return bool
* TRUE if the assertion succeeded, FALSE otherwise.
*/
@@ -143,6 +144,7 @@ protected function assertSubString($haystack, $needle, $message = '', $group = '
* The message to display along with the assertion.
* @param string $group
* The type of assertion - examples are "Browser", "PHP".
+ *
* @return bool
* TRUE if the assertion succeeded, FALSE otherwise.
*/
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
index e1d3f439a9..8d325e5c01 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
@@ -184,7 +184,10 @@ protected function _testBetween() {
*/
protected function _testUiValidation() {
- $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer site configuration']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]));
$this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
$this->drupalGet('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index 1fca2def69..de12c0eb74 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -58,7 +58,9 @@ protected function setUp($import_test_views = TRUE) {
$this->webUser = $this->drupalCreateUser();
$normal_role = $this->drupalCreateRole([]);
- $this->normalUser = $this->drupalCreateUser(['views_test_data test permission']);
+ $this->normalUser = $this->drupalCreateUser([
+ 'views_test_data test permission',
+ ]);
$this->normalUser->addRole($normal_role);
// @todo when all the plugin information is cached make a reset function and
// call it here.
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index 2ee68ea616..1306b92a47 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -91,7 +91,10 @@ public function testArgumentDefaultPlugin() {
* Tests the use of a default argument plugin that provides no options.
*/
public function testArgumentDefaultNoOptions() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
// The current_user plugin has no options form, and should pass validation.
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
index c41edf53c0..508a61a5ea 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
@@ -81,7 +81,10 @@ protected function setUp($import_test_views = TRUE) {
* Tests exposed context.
*/
public function testBlockContext() {
- $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer blocks']));
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer views',
+ 'administer blocks',
+ ]));
// Check if context was correctly propagated to the block.
$definition = $this->container->get('plugin.manager.block')
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index 5f3f3705bb..0f6680af5b 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -38,7 +38,9 @@ protected function setUp($import_test_views = TRUE) {
$this->drupalPlaceBlock('page_title_block');
- $admin_user = $this->drupalCreateUser(['administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 515a9179e3..d828a4ce48 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -136,7 +136,7 @@ public function testDisplayPlugin() {
// Check the new value has been saved by checking the UI summary text.
$this->drupalGet('admin/structure/views/view/test_view/edit/display_test_1');
- $this->assertLink($test_option);
+ $this->assertSession()->linkExists($test_option);
// Test the enable/disable status of a display.
$view->display_handler->setOption('enabled', FALSE);
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php b/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
index 9d58f4a497..f38003126e 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
@@ -53,7 +53,10 @@ protected function setUp($import_test_views = TRUE) {
$this->enableViewsTestModule();
- $this->adminUser = $this->drupalCreateUser(['administer views', 'administer menu']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer views',
+ 'administer menu',
+ ]);
$this->drupalPlaceBlock('system_menu_block:main');
$this->drupalCreateContentType(['type' => 'page']);
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php b/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
index 57a2f8befe..bd29a17328 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
@@ -36,7 +36,10 @@ class NumericFormatPluralTest extends ViewTestBase {
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
- $web_user = $this->drupalCreateUser(['administer views', 'administer languages']);
+ $web_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer languages',
+ ]);
$this->drupalLogin($web_user);
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php b/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
index 81a0fa5048..3cae40c6d1 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
@@ -51,7 +51,10 @@ public function testStorePagerSettings() {
// Show the master display so the override selection is shown.
\Drupal::configFactory()->getEditable('views.settings')->set('ui.show.master_display', TRUE)->save();
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
// Test behavior described in
// https://www.drupal.org/node/652712#comment-2354918.
@@ -384,7 +387,12 @@ public function testPagerConfigTranslation() {
$this->container->get('module_installer')->install(['locale', 'language', 'config_translation']);
$this->resetAll();
- $admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access', 'translate configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'access content overview',
+ 'administer nodes',
+ 'bypass node access',
+ 'translate configuration',
+ ]);
$this->drupalLogin($admin_user);
$langcode = 'nl';
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index bcd8cf8566..e81c213fde 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -211,6 +211,8 @@ public function testGrouping() {
// Ensure that we don't find the caption containing unsafe markup.
$this->assertNoRaw($unsafe_markup, "Didn't find caption containing unsafe markup.");
+ // Ensure that the summary isn't shown.
+ $this->assertEmpty($this->xpath('//caption/details'));
// Ensure that all expected captions are found.
foreach ($expected_captions as $raw_caption) {
diff --git a/web/core/modules/views/tests/src/Functional/SearchIntegrationTest.php b/web/core/modules/views/tests/src/Functional/SearchIntegrationTest.php
index 134417329d..233cbabd48 100644
--- a/web/core/modules/views/tests/src/Functional/SearchIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Functional/SearchIntegrationTest.php
@@ -69,21 +69,21 @@ public function testSearchIntegration() {
// Page with a keyword filter of 'pizza'.
$this->drupalGet('test-filter');
- $this->assertLink('pizza');
- $this->assertNoLink('sandwich');
- $this->assertLink('cola');
+ $this->assertSession()->linkExists('pizza');
+ $this->assertSession()->linkNotExists('sandwich');
+ $this->assertSession()->linkExists('cola');
// Page with a keyword argument, various argument values.
// Verify that the correct nodes are shown, and only once.
$this->drupalGet('test-arg/pizza');
$this->assertOneLink('pizza');
- $this->assertNoLink('sandwich');
+ $this->assertSession()->linkNotExists('sandwich');
$this->assertOneLink('cola');
$this->drupalGet('test-arg/sandwich');
- $this->assertNoLink('pizza');
+ $this->assertSession()->linkNotExists('pizza');
$this->assertOneLink('sandwich');
- $this->assertNoLink('cola');
+ $this->assertSession()->linkNotExists('cola');
$this->drupalGet('test-arg/pizza OR sandwich');
$this->assertOneLink('pizza');
@@ -91,18 +91,18 @@ public function testSearchIntegration() {
$this->assertOneLink('cola');
$this->drupalGet('test-arg/pizza sandwich OR cola');
- $this->assertNoLink('pizza');
- $this->assertNoLink('sandwich');
+ $this->assertSession()->linkNotExists('pizza');
+ $this->assertSession()->linkNotExists('sandwich');
$this->assertOneLink('cola');
$this->drupalGet('test-arg/cola pizza');
- $this->assertNoLink('pizza');
- $this->assertNoLink('sandwich');
+ $this->assertSession()->linkNotExists('pizza');
+ $this->assertSession()->linkNotExists('sandwich');
$this->assertOneLink('cola');
$this->drupalGet('test-arg/"cola is good"');
- $this->assertNoLink('pizza');
- $this->assertNoLink('sandwich');
+ $this->assertSession()->linkNotExists('pizza');
+ $this->assertSession()->linkNotExists('sandwich');
$this->assertOneLink('cola');
// Test sorting.
diff --git a/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php b/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
index d7e209aebd..d2d2fb05d7 100644
--- a/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
+++ b/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
@@ -45,7 +45,14 @@ class SearchMultilingualTest extends ViewTestBase {
public function testMultilingualSearchFilter() {
// Create a user with admin for languages, content, and content types, plus
// the ability to access content and searches.
- $user = $this->drupalCreateUser(['administer nodes', 'administer content types', 'administer languages', 'administer content translation', 'access content', 'search content']);
+ $user = $this->drupalCreateUser([
+ 'administer nodes',
+ 'administer content types',
+ 'administer languages',
+ 'administer content translation',
+ 'access content',
+ 'search content',
+ ]);
$this->drupalLogin($user);
// Add Spanish language programmatically.
@@ -87,8 +94,8 @@ public function testMultilingualSearchFilter() {
// translated node, which has 'pizza' in the title, but not the English
// one, which does not have the word 'pizza' in it.
$this->drupalGet('test-filter');
- $this->assertLink('pizza', 0, 'Found translation with matching title');
- $this->assertNoLink('sandwich', 'Did not find translation with non-matching title');
+ $this->assertSession()->linkExists('pizza', 0, 'Found translation with matching title');
+ $this->assertSession()->linkNotExists('sandwich', 'Did not find translation with non-matching title');
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php b/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
index f35b851ea4..e9483c30df 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
@@ -40,7 +40,7 @@ public function testMenus() {
// expect the main menu to display).
$this->drupalGet('');
$this->assertSession()->statusCodeEquals(200);
- $this->assertLink($view['page[link_properties][title]']);
+ $this->assertSession()->linkExists($view['page[link_properties][title]']);
$this->assertLinkByHref(Url::fromUri('base:' . $view['page[path]'])->toString());
// Make sure the link is associated with the main menu.
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php b/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
index 0178c08c25..482e07de55 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
@@ -20,7 +20,13 @@ protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
// Create and log in a user with administer views permission.
- $views_admin = $this->drupalCreateUser(['administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions']);
+ $views_admin = $this->drupalCreateUser([
+ 'administer views',
+ 'administer blocks',
+ 'bypass node access',
+ 'access user profiles',
+ 'view all revisions',
+ ]);
$this->drupalLogin($views_admin);
$this->drupalPlaceBlock('local_actions_block');
}
diff --git a/web/core/modules/views/tests/src/Kernel/ModuleTest.php b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
index 219d3ae3b8..a37446e24d 100644
--- a/web/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -2,15 +2,19 @@
namespace Drupal\Tests\views\Kernel;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Form\FormState;
+use Drupal\views\Plugin\views\area\Broken as BrokenArea;
+use Drupal\views\Plugin\views\field\Broken as BrokenField;
+use Drupal\views\Plugin\views\filter\Broken as BrokenFilter;
+use Drupal\views\Plugin\views\filter\Standard;
+use Drupal\views\Views;
+
/**
* Tests basic functions from the Views module.
*
* @group views
*/
-use Drupal\views\Plugin\views\filter\Standard;
-use Drupal\views\Views;
-use Drupal\Component\Render\FormattableMarkup;
-
class ModuleTest extends ViewsKernelTestBase {
/**
@@ -42,14 +46,41 @@ class ModuleTest extends ViewsKernelTestBase {
* @see \Drupal\views\Plugin\ViewsHandlerManager::getHandler()
*/
public function testViewsGetHandler() {
- $types = ['field', 'area', 'filter'];
- foreach ($types as $type) {
- $item = [
- 'table' => $this->randomMachineName(),
- 'field' => $this->randomMachineName(),
- ];
- $handler = $this->container->get('plugin.manager.views.' . $type)->getHandler($item);
- $this->assertEqual('Drupal\views\Plugin\views\\' . $type . '\Broken', get_class($handler), new FormattableMarkup('Make sure that a broken handler of type: @type is created.', ['@type' => $type]));
+ $types = [
+ 'field' => BrokenField::class,
+ 'area' => BrokenArea::class,
+ 'filter' => BrokenFilter::class,
+ ];
+ // Test non-existent tables/fields.
+ $items = [
+ [
+ 'table' => 'table_invalid',
+ 'field' => 'id',
+ ],
+ [
+ 'table' => 'views_test_data',
+ 'field' => 'field_invalid',
+ ],
+ ];
+ $form_state = new FormState();
+ $description_top = '<p>' . t('The handler for this item is broken or missing. The following details are available:') . '</p>';
+ $description_bottom = '<p>' . t('Enabling the appropriate module may solve this issue. Otherwise, check to see if there is a module update available.') . '</p>';
+ foreach ($types as $type => $class) {
+ foreach ($items as $item) {
+ $handler = $this->container->get('plugin.manager.views.' . $type)
+ ->getHandler($item);
+ $this->assertTrue($handler instanceof $class);
+ // Make sure details available at edit form.
+ $form = [];
+ $handler->buildOptionsForm($form, $form_state);
+ $this->assertEquals($description_top, $form['description']['description_top']['#markup']);
+ $this->assertEquals($description_bottom, $form['description']['description_bottom']['#markup']);
+ $details = [];
+ foreach ($item as $key => $value) {
+ $details[] = new FormattableMarkup('@key: @value', ['@key' => $key, '@value' => $value]);
+ }
+ $this->assertEquals($details, $form['description']['detail_list']['#items']);
+ }
}
$views_data = $this->viewsData();
@@ -77,61 +108,6 @@ public function testViewsGetHandler() {
];
$handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard');
$this->assertInstanceOf(Standard::class, $handler);
-
- // @todo Reinstate these tests when the debug() in views_get_handler() is
- // restored.
- return;
-
- // Test non-existent tables/fields.
- set_error_handler([$this, 'customErrorHandler']);
- $item = [
- 'table' => 'views_test_data',
- 'field' => 'field_invalid',
- ];
- $this->container->get('plugin.manager.views.field')->getHandler($item);
- $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field']), $this->lastErrorMessage, 'An invalid field name throws a debug message.');
- unset($this->lastErrorMessage);
-
- $item = [
- 'table' => 'table_invalid',
- 'field' => 'id',
- ];
- $this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.');
- unset($this->lastErrorMessage);
-
- $item = [
- 'table' => 'table_invalid',
- 'field' => 'id',
- ];
- $this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.');
- unset($this->lastErrorMessage);
-
- restore_error_handler();
- }
-
- /**
- * Defines an error handler which is used in the test.
- *
- * Because this is registered in set_error_handler(), it has to be public.
- *
- * @param int $error_level
- * The level of the error raised.
- * @param string $message
- * The error message.
- * @param string $filename
- * The filename that the error was raised in.
- * @param int $line
- * The line number the error was raised at.
- * @param array $context
- * An array that points to the active symbol table at the point the error
- * occurred.
- *
- * @see set_error_handler()
- */
- public function customErrorHandler($error_level, $message, $filename, $line, $context) {
- $this->lastErrorMessage = $message;
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
index d17e60ac33..f8c416f95a 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
@@ -19,6 +19,11 @@ class ViewsConfigUpdaterTest extends ViewsKernelTestBase {
*/
protected $configUpdater;
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = ['views_config_entity_test'];
+
/**
* {@inheritdoc}
*/
diff --git a/web/core/modules/views/tests/src/Unit/ViewsTest.php b/web/core/modules/views/tests/src/Unit/ViewsTest.php
index f6dbaadb2a..f14adae271 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\views\Unit;
+use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Tests\UnitTestCase;
use Drupal\views\Views;
@@ -72,6 +73,21 @@ public function testGetView() {
$this->assertEquals(spl_object_hash($view), spl_object_hash($executable->storage));
}
+ /**
+ * Tests the getView() method against a non-existent view.
+ *
+ * @covers ::getView
+ */
+ public function testGetNonExistentView() {
+ $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+ $storage = $this->prophesize(EntityStorageInterface::class);
+ $storage->load('test_view_non_existent')->willReturn(NULL);
+ $entity_type_manager->getStorage('view')->willReturn($storage->reveal());
+ $this->container->set('entity_type.manager', $entity_type_manager->reveal());
+ $executable_does_not_exist = Views::getView('test_view_non_existent');
+ $this->assertNull($executable_does_not_exist);
+ }
+
/**
* @covers ::getApplicableViews
*
diff --git a/web/core/modules/views/views.module b/web/core/modules/views/views.module
index 398b670f68..f9f2946c5d 100644
--- a/web/core/modules/views/views.module
+++ b/web/core/modules/views/views.module
@@ -624,6 +624,7 @@ function views_disable_view(View $view) {
* @param array $element
* An associative array containing the properties of the element.
* Properties used: #substitutions, #children.
+ *
* @return array
* The $element with prepared variables ready for #theme 'form'
* in views_form_views_form.
@@ -777,6 +778,7 @@ function views_embed_view($name, $display_id = 'default') {
* Everything after #views-tab- is the display ID, e.g. page_1.
* @param ...
* Any additional parameters will be passed as arguments.
+ *
* @return array
* An array containing an object for each view item.
*/
diff --git a/web/core/modules/views/views.theme.inc b/web/core/modules/views/views.theme.inc
index ba95597608..019899ada4 100644
--- a/web/core/modules/views/views.theme.inc
+++ b/web/core/modules/views/views.theme.inc
@@ -664,20 +664,22 @@ function template_preprocess_views_view_table(&$variables) {
// variables, although core templates now all use 'summary_element' instead.
$variables['summary'] = $handler->options['summary'];
$variables['description'] = $handler->options['description'];
- $variables['summary_element'] = [
- '#type' => 'details',
- '#title' => $handler->options['summary'],
- // To ensure that the description is properly escaped during rendering, use
- // an 'inline_template' to let Twig do its magic, instead of 'markup'.
- 'description' => [
- '#type' => 'inline_template',
- '#template' => '{{ description }}',
- '#context' => [
- 'description' => $handler->options['description'],
+ if (!empty($handler->options['summary']) || !empty($handler->options['description'])) {
+ $variables['summary_element'] = [
+ '#type' => 'details',
+ '#title' => $handler->options['summary'],
+ // To ensure that the description is properly escaped during rendering,
+ // use an 'inline_template' to let Twig do its magic, instead of 'markup'.
+ 'description' => [
+ '#type' => 'inline_template',
+ '#template' => '{{ description }}',
+ '#context' => [
+ 'description' => $handler->options['description'],
+ ],
],
- ],
- ];
- $variables['caption_needed'] |= !empty($variables['summary']) || !empty($variables['description']);
+ ];
+ $variables['caption_needed'] = TRUE;
+ }
$variables['responsive'] = FALSE;
// If the table has headers and it should react responsively to columns hidden
diff --git a/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php b/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
index 2ad5adc5f2..fcf0d850fc 100644
--- a/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
@@ -35,7 +35,7 @@ public function testAnalyzeBasic() {
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/structure/views/view/test_view/edit');
- $this->assertLink(t('Analyze view'));
+ $this->assertSession()->linkExists(t('Analyze view'));
// This redirects the user to the analyze form.
$this->clickLink(t('Analyze view'));
diff --git a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index 6a5a75f036..7a356d00c2 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -53,7 +53,7 @@ public function testDefaultViews() {
// It should not be possible to revert the view yet.
// @todo Figure out how to handle this with the new configuration system.
- // $this->assertNoLink(t('Revert'));
+ // $this->assertSession()->linkNotExists(t('Revert'));
// $revert_href = 'admin/structure/views/view/glossary/revert';
// $this->assertNoLinkByHref($revert_href);
@@ -81,7 +81,7 @@ public function testDefaultViews() {
// It should now be possible to revert the view. Do that, and make sure the
// view title we added above no longer is displayed.
// $this->drupalGet('admin/structure/views');
- // $this->assertLink(t('Revert'));
+ // $this->assertSession()->linkExists(t('Revert'));
// $this->assertLinkByHref($revert_href);
// $this->drupalPostForm($revert_href, array(), t('Revert'));
// $this->drupalGet('glossary');
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
index b24efd5e87..f510041484 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
@@ -47,8 +47,8 @@ public function testAddDisplay() {
$this->drupalPostForm(NULL, [], 'Add Page');
$this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI');
- $this->assertNoLink('Master*', 'Make sure the master display is not marked as changed.');
- $this->assertLink('Page*', 0, 'Make sure the added display is marked as changed.');
+ $this->assertSession()->linkNotExists('Master*', 'Make sure the master display is not marked as changed.');
+ $this->assertSession()->linkExists('Page*', 0, 'Make sure the added display is marked as changed.');
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", ['path' => 'test/path'], t('Apply'));
$this->drupalPostForm(NULL, [], t('Save'));
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php
index 9a4edbc3b6..5b01e7f591 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayExtenderUITest.php
@@ -38,7 +38,7 @@ public function testDisplayExtenderUI() {
$random_text = $this->randomMachineName();
$this->drupalPostForm($display_option_url, ['test_extender_test_option' => $random_text], t('Apply'));
- $this->assertLink($random_text);
+ $this->assertSession()->linkExists($random_text);
$this->drupalPostForm(NULL, [], t('Save'));
$view = Views::getView($view->storage->id());
$view->initDisplay();
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index e4ba28fad8..d73df00a33 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -57,7 +57,7 @@ protected function doBasicPathUITest() {
// Add a new page display and check the appearing text.
$this->drupalPostForm(NULL, [], 'Add Page');
$this->assertText(t('No path is set'), 'The right text appears if no path was set.');
- $this->assertNoLink(t('View @display', ['@display' => 'page']), 'No view page link found on the page.');
+ $this->assertSession()->linkNotExists(t('View @display', ['@display' => 'page']), 'No view page link found on the page.');
// Save a path and make sure the summary appears as expected.
$random_path = $this->randomMachineName();
@@ -68,7 +68,7 @@ protected function doBasicPathUITest() {
$this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => $random_path], t('Apply'));
$this->assertText('/' . $random_path, 'The custom path appears in the summary.');
$display_link_text = t('View @display', ['@display' => 'Page']);
- $this->assertLink($display_link_text, 0, 'view page link found on the page.');
+ $this->assertSession()->linkExists($display_link_text, 0, 'view page link found on the page.');
$this->clickLink($display_link_text);
$this->assertUrl($random_path);
}
@@ -159,7 +159,7 @@ public function testMenuOptions() {
$this->assertUrl('admin/structure/views/view/test_view/edit/page_1');
$this->drupalGet('admin/structure/views/view/test_view');
- $this->assertLink(t('Tab: @title', ['@title' => 'Test tab title']));
+ $this->assertSession()->linkExists(t('Tab: @title', ['@title' => 'Test tab title']));
// If it's a default tab, it should also have an additional settings link.
$this->assertLinkByHref('admin/structure/views/nojs/display/test_view/page_1/tab_options');
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index d2b03327eb..d3577f8a1f 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -173,7 +173,7 @@ public function testLinkDisplay() {
// The form redirects to the master display.
$this->drupalGet($path);
- $this->assertLink(t('Custom URL'), 0, 'The link option has custom URL as summary.');
+ $this->assertSession()->linkExists(t('Custom URL'), 0, 'The link option has custom URL as summary.');
// Test the default link_url value for new display
$this->drupalPostForm(NULL, [], t('Add Block'));
diff --git a/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php b/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php
index 6422bb4863..dc43ab9993 100644
--- a/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/FilterUITest.php
@@ -41,7 +41,10 @@ protected function setUp($import_test_views = TRUE) {
* Tests that an option for a filter is saved as expected from the UI.
*/
public function testFilterInOperatorUi() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
@@ -64,12 +67,15 @@ public function testFilterInOperatorUi() {
* Tests the filters from the UI.
*/
public function testFiltersUI() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/structure/views/view/test_filter_groups');
- $this->assertLink('Content: ID (= 1)', 0, 'Content: ID (= 1) link appears correctly.');
+ $this->assertSession()->linkExists('Content: ID (= 1)', 0, 'Content: ID (= 1) link appears correctly.');
// Tests that we can create a new filter group from UI.
$this->drupalGet('admin/structure/views/nojs/rearrange-filter/test_filter_groups/page');
@@ -96,7 +102,10 @@ public function testFiltersUI() {
* Tests the identifier settings and restrictions.
*/
public function testFilterIdentifier() {
- $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
+ $admin_user = $this->drupalCreateUser([
+ 'administer views',
+ 'administer site configuration',
+ ]);
$this->drupalLogin($admin_user);
$path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
diff --git a/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php b/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php
index e79ff9d208..b393411d69 100644
--- a/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/GroupByTest.php
@@ -42,7 +42,7 @@ public function testGroupBySave() {
// Change the groupby type in the UI.
$this->drupalPostForm($edit_groupby_url, ['options[group_type]' => 'count'], t('Apply'));
- $this->assertLink('COUNT(Views test: ID)', 0, 'The count setting is displayed in the UI');
+ $this->assertSession()->linkExists('COUNT(Views test: ID)', 0, 'The count setting is displayed in the UI');
$this->drupalPostForm(NULL, [], t('Save'));
diff --git a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
index 53c74ea4dd..bff992f567 100644
--- a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
@@ -52,7 +52,7 @@ public function testRowUI() {
$this->assertFieldByName('row_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.');
$this->drupalPostForm($view_edit_url, [], t('Save'));
- $this->assertLink(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI');
+ $this->assertSession()->linkExists(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI');
$view = Views::getView($view_name);
$view->initDisplay();
diff --git a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index 955a7c1814..436c43bc91 100644
--- a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -74,7 +74,7 @@ public function testEditUI() {
$view['id'] = strtolower($this->randomMachineName());
$this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
- $this->assertNoLink(t('Master'));
+ $this->assertSession()->linkNotExists(t('Master'));
// Configure to always show the advanced settings.
// @todo It doesn't seem to be a way to test this as this works just on js.
diff --git a/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php b/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php
index 0bd7e98639..b85c65c56a 100644
--- a/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/StyleUITest.php
@@ -51,7 +51,7 @@ public function testStyleUI() {
$this->assertFieldByName('style_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.');
$this->drupalPostForm($view_edit_url, [], t('Save'));
- $this->assertLink(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI');
+ $this->assertSession()->linkExists(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI');
$view = Views::getView($view_name);
$view->initDisplay();
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
index c5cef7402c..029ac924ef 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
@@ -29,7 +29,7 @@ class ViewEditTest extends UITestBase {
*/
public function testDeleteLink() {
$this->drupalGet('admin/structure/views/view/test_view');
- $this->assertLink(t('Delete view'), 0, 'Ensure that the view delete link appears');
+ $this->assertSession()->linkExists(t('Delete view'), 0, 'Ensure that the view delete link appears');
$view = $this->container->get('entity_type.manager')->getStorage('view')->load('test_view');
$this->assertInstanceOf(View::class, $view);
@@ -59,7 +59,7 @@ public function testOtherOptions() {
// Change the machine name for the display from page_1 to test_1.
$edit = ['display_id' => 'test_1'];
$this->drupalPostForm('admin/structure/views/nojs/display/test_view/attachment_1/display_id', $edit, 'Apply');
- $this->assertLink(t('test_1'));
+ $this->assertSession()->linkExists(t('test_1'));
// Save the view, and test the new ID has been saved.
$this->drupalPostForm(NULL, [], 'Save');
@@ -73,7 +73,7 @@ public function testOtherOptions() {
$edit = ['display_id' => 'test_1'];
$this->drupalPostForm('admin/structure/views/nojs/display/test_view/test_1/display_id', $edit, 'Apply');
$this->drupalPostForm(NULL, [], 'Save');
- $this->assertLink(t('test_1'));
+ $this->assertSession()->linkExists(t('test_1'));
// Test the form validation with invalid IDs.
$machine_name_edit_url = 'admin/structure/views/nojs/display/test_view/test_1/display_id';
@@ -103,7 +103,7 @@ public function testOtherOptions() {
// Test that the display ID has not been changed.
$this->drupalGet('admin/structure/views/view/test_view/edit/test_1');
- $this->assertLink(t('test_1'));
+ $this->assertSession()->linkExists(t('test_1'));
// Test that validation does not run on cancel.
$this->drupalGet('admin/structure/views/view/test_view');
@@ -136,7 +136,7 @@ public function testEditFormLanguageOptions() {
$langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
$this->assertNoLinkByHref($langcode_url);
$assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')]));
- $this->assertNoLink(t('Content language of view row'));
+ $this->assertSession()->linkNotExists(t('Content language of view row'));
}
// Make the site multilingual and test the options again.
@@ -153,12 +153,12 @@ public function testEditFormLanguageOptions() {
if ($view_name == 'test_view') {
$this->assertNoLinkByHref($langcode_url);
$assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')]));
- $this->assertNoLink(t('Content language of view row'));
+ $this->assertSession()->linkNotExists(t('Content language of view row'));
}
else {
$this->assertLinkByHref($langcode_url);
$assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')]));
- $this->assertLink(t('Content language of view row'));
+ $this->assertSession()->linkExists(t('Content language of view row'));
}
$this->drupalGet($langcode_url);
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
index d5ac50f793..ac4ebb4680 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
@@ -50,7 +50,7 @@ public function testViewsListLimit() {
// Check if we can access the main views admin page.
$this->drupalGet('admin/structure/views');
$this->assertSession()->statusCodeEquals(200);
- $this->assertLink(t('Add view'));
+ $this->assertSession()->linkExists(t('Add view'));
// Check that there is a link to the content view without a destination
// parameter.
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
index 2dd089da7b..7c2d9d3660 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
@@ -40,7 +40,10 @@ class ViewsUITourTest extends TourTestBase {
protected function setUp() {
parent::setUp();
- $this->adminUser = $this->drupalCreateUser(['administer views', 'access tour']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer views',
+ 'access tour',
+ ]);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/XssTest.php b/web/core/modules/views_ui/tests/src/Functional/XssTest.php
index 3e7fc34b14..1af89e392f 100644
--- a/web/core/modules/views_ui/tests/src/Functional/XssTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/XssTest.php
@@ -23,11 +23,13 @@ class XssTest extends UITestBase {
public function testViewsUi() {
$this->drupalGet('admin/structure/views/view/sa_contrib_2013_035');
- $this->assertEscaped('<marquee>test</marquee>', 'Field admin label is properly escaped.');
+ // Verify that the field admin label is properly escaped.
+ $this->assertEscaped('<marquee>test</marquee>');
$this->drupalGet('admin/structure/views/nojs/handler/sa_contrib_2013_035/page_1/header/area');
- $this->assertEscaped('{{ title }} == <marquee>test</marquee>', 'Token label is properly escaped.');
- $this->assertEscaped('{{ title_1 }} == <script>alert("XSS")</script>', 'Token label is properly escaped.');
+ // Verify that the token label is properly escaped.
+ $this->assertEscaped('{{ title }} == <marquee>test</marquee>');
+ $this->assertEscaped('{{ title_1 }} == <script>alert("XSS")</script>');
}
/**
diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
index f6a9976dcf..8d839e3c43 100644
--- a/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
+++ b/web/core/modules/views_ui/tests/src/FunctionalJavascript/ViewsListingTest.php
@@ -133,6 +133,7 @@ public function testFilterViewsListing() {
* Removes any non-visible elements from the passed array.
*
* @param array $elements
+ *
* @return array
*/
protected function filterVisibleElements($elements) {
diff --git a/web/core/modules/workspaces/src/ViewsQueryAlter.php b/web/core/modules/workspaces/src/ViewsQueryAlter.php
index 485f51a81e..2548db4efe 100644
--- a/web/core/modules/workspaces/src/ViewsQueryAlter.php
+++ b/web/core/modules/workspaces/src/ViewsQueryAlter.php
@@ -378,6 +378,7 @@ protected function ensureRevisionTable(EntityTypeInterface $entity_type, Sql $qu
*
* @return \Drupal\views\Plugin\views\join\JoinPluginInterface
* An adjusted views join object to add to the query.
+ *
* @throws \Drupal\Component\Plugin\Exception\PluginException
*/
protected function getRevisionTableJoin($relationship, $table, $field, $workspace_association_table, EntityTypeInterface $entity_type) {
diff --git a/web/core/phpcs.xml.dist b/web/core/phpcs.xml.dist
index 645e4e0f2d..623ef14cc9 100644
--- a/web/core/phpcs.xml.dist
+++ b/web/core/phpcs.xml.dist
@@ -59,7 +59,6 @@
<exclude name="Drupal.Commenting.DocComment.TagsNotGrouped"/>
<exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
<exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
- <exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
<exclude name="Drupal.Commenting.DocComment.MissingShort"/>
</rule>
<rule ref="Drupal.Commenting.DocCommentStar"/>
diff --git a/web/core/profiles/demo_umami/tests/src/Functional/UmamiMultilingualInstallTest.php b/web/core/profiles/demo_umami/tests/src/Functional/UmamiMultilingualInstallTest.php
index 1f70df4581..4736be9f36 100644
--- a/web/core/profiles/demo_umami/tests/src/Functional/UmamiMultilingualInstallTest.php
+++ b/web/core/profiles/demo_umami/tests/src/Functional/UmamiMultilingualInstallTest.php
@@ -46,6 +46,7 @@ protected function setUpLanguage() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php b/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
index 48894a13b7..6b3baa14df 100644
--- a/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
+++ b/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
@@ -28,12 +28,15 @@ class MinimalTest extends BrowserTestBase {
public function testMinimal() {
$this->drupalGet('');
// Check the login block is present.
- $this->assertLink(t('Create new account'));
+ $this->assertSession()->linkExists(t('Create new account'));
$this->assertSession()->statusCodeEquals(200);
// Create a user to test tools and navigation blocks for logged in users
// with appropriate permissions.
- $user = $this->drupalCreateUser(['access administration pages', 'administer content types']);
+ $user = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer content types',
+ ]);
$this->drupalLogin($user);
$this->drupalGet('');
$this->assertText(t('Tools'));
diff --git a/web/core/profiles/standard/tests/src/Functional/StandardTest.php b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
index 2acd63c7bb..82d1632626 100644
--- a/web/core/profiles/standard/tests/src/Functional/StandardTest.php
+++ b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -38,7 +38,7 @@ class StandardTest extends BrowserTestBase {
*/
public function testStandard() {
$this->drupalGet('');
- $this->assertLink(t('Contact'));
+ $this->assertSession()->linkExists(t('Contact'));
$this->clickLink(t('Contact'));
$this->assertSession()->statusCodeEquals(200);
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
index ef57bd72af..1933778d3f 100644
--- a/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
@@ -46,7 +46,9 @@ protected function setUp() {
'id' => 'default',
'label' => 'Default',
])->save();
- $this->account = $this->drupalCreateUser(['administer entity_test content']);
+ $this->account = $this->drupalCreateUser([
+ 'administer entity_test content',
+ ]);
$this->drupalLogin($this->account);
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
index 7345b744c0..c7508811a6 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
@@ -128,6 +128,7 @@ public function testInstalled() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
index c6eadd6ea6..0a0f66f875 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
@@ -119,6 +119,7 @@ public function testInstalled() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
index 0f06d17a5c..19d8513590 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -38,6 +38,7 @@ protected function setUpLanguage() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
index b94647ee13..4601653bdc 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
@@ -72,6 +72,7 @@ public function testInstaller() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
index 1eec26e7fb..fb69ea772d 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
@@ -134,6 +134,7 @@ public function testInstaller() {
*
* @param string $langcode
* The language code.
+ *
* @return string
* Contents for the test .po file.
*/
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php
index a5532b24ad..b961f2ffae 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php
@@ -43,7 +43,11 @@ public function testMixedCasePaths() {
$this->assertSession()->pageTextMatches('/Log in/');
// Tests paths defined by routes from the Views module.
- $admin = $this->drupalCreateUser(['access administration pages', 'administer nodes', 'access content overview']);
+ $admin = $this->drupalCreateUser([
+ 'access administration pages',
+ 'administer nodes',
+ 'access content overview',
+ ]);
$this->drupalLogin($admin);
$this->drupalGet('admin/content');
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
index 43e5845306..20ddb1dfd9 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
@@ -39,7 +39,11 @@ protected function setUp() {
parent::setUp();
// Create and log in user.
- $this->adminUser = $this->drupalCreateUser(['administer blocks', 'administer languages', 'access administration pages']);
+ $this->adminUser = $this->drupalCreateUser([
+ 'administer blocks',
+ 'administer languages',
+ 'access administration pages',
+ ]);
$this->drupalLogin($this->adminUser);
// Add language.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
index 885498fcd2..3bc2c8f6ca 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/EndOfTransactionQueriesTest.php
@@ -31,12 +31,14 @@ class EndOfTransactionQueriesTest extends KernelTestBase {
* {@inheritdoc}
*/
protected function setUp() {
+ parent::setUp();
+
+ // This can only be checked after installing Drupal as it requires functions
+ // from bootstrap.inc.
if (!class_exists($this->getDatabaseConnectionInfo()['default']['namespace'] . '\Connection')) {
$this->markTestSkipped(sprintf('No logging override exists for the %s database driver. Create it, subclass this test class and override ::getDatabaseConnectionInfo().', $this->getDatabaseConnectionInfo()['default']['driver']));
}
- parent::setUp();
-
$this->installSchema('system', 'sequences');
$this->installEntitySchema('entity_test');
$this->installEntitySchema('user');
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
index a0b5af5fca..e10520b2f5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
@@ -98,11 +98,11 @@ public function testFileCheckDirectoryHandling() {
// Make directory read only.
@$file_system->chmod($directory, 0444);
- $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writeable directory.', 'File');
+ $this->assertFalse($file_system->prepareDirectory($directory, 0), 'Error reported for a non-writable directory.', 'File');
// Test directory permission modification.
$this->setSetting('file_chmod_directory', 0777);
- $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writeable.', 'File');
+ $this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::MODIFY_PERMISSIONS), 'No error reported when making directory writable.', 'File');
}
// Test that the directory has the correct permissions.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
index 27a78a1e98..e17e427cbf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
@@ -153,6 +153,7 @@ public function assertDirectoryPermissions($directory, $expected_mode, $message
* @param $path
* Optional string with a directory path. If none is provided, a random
* name in the site's files directory will be used.
+ *
* @return
* The path to the directory.
*/
@@ -178,6 +179,7 @@ public function createDirectory($path = NULL) {
* @param $scheme
* Optional string indicating the stream scheme to use. Drupal core includes
* public, private, and temporary. The public wrapper is the default.
+ *
* @return
* File URI.
*/
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
index 892fa3c600..644375a029 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
@@ -66,16 +66,16 @@ public function testMungeIgnoreInsecure() {
}
/**
- * White listed extensions are ignored by file_munge_filename().
+ * Tests that allowed extensions are ignored by file_munge_filename().
*/
- public function testMungeIgnoreWhitelisted() {
- // Declare our extension as whitelisted. The declared extensions should
- // be case insensitive so test using one with a different case.
+ public function testMungeIgnoreAllowedExtensions() {
+ // Declare that our extension is allowed. The declared extensions should be
+ // case insensitive, so test using one with a different case.
$munged_name = file_munge_filename($this->nameWithUcExt, $this->badExtension);
- $this->assertSame($munged_name, $this->nameWithUcExt, new FormattableMarkup('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', ['%munged' => $munged_name, '%original' => $this->nameWithUcExt]));
+ $this->assertSame($munged_name, $this->nameWithUcExt);
// The allowed extensions should also be normalized.
$munged_name = file_munge_filename($this->name, strtoupper($this->badExtension));
- $this->assertSame($munged_name, $this->name, new FormattableMarkup('The new filename (%munged) matches the original (%original) also when the whitelisted extension is in uppercase.', ['%munged' => $munged_name, '%original' => $this->name]));
+ $this->assertSame($munged_name, $this->name);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
index e87abcb846..23d1f00afe 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -44,20 +44,20 @@ public function testCRUDWithExpiration() {
// Verify that an item can be stored with setWithExpire().
// Use a random expiration in each test.
$stores[0]->setWithExpire('foo', $this->objects[0], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[0], $stores[0]->get('foo'));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that an item can be updated with setWithExpire().
$stores[0]->setWithExpire('foo', $this->objects[1], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that the expirable data key is unique.
$stores[1]->setWithExpire('foo', $this->objects[2], rand(500, 100000));
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
// Verify that multiple items can be stored with setMultipleWithExpire().
$values = [
@@ -67,11 +67,11 @@ public function testCRUDWithExpiration() {
$stores[0]->setMultipleWithExpire($values, rand(500, 100000));
$result = $stores[0]->getMultiple(['foo', 'bar']);
foreach ($values as $j => $value) {
- $this->assertIdenticalObject($value, $result[$j]);
+ $this->assertEquals($value, $result[$j]);
}
// Verify that the other collection was not affected.
- $this->assertIdenticalObject($stores[1]->get('foo'), $this->objects[2]);
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
$this->assertNull($stores[1]->get('bar'));
// Verify that all items in a collection can be retrieved.
@@ -93,7 +93,7 @@ public function testCRUDWithExpiration() {
$this->assertNull($stores[0]->get('bar'));
$this->assertEmpty($stores[0]->getMultiple(['foo', 'bar']));
// Verify that the item in the other collection still exists.
- $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[5], $stores[1]->get('foo'));
// Test that setWithExpireIfNotExists() succeeds only the first time.
$key = $this->randomMachineName();
@@ -101,7 +101,7 @@ public function testCRUDWithExpiration() {
// setWithExpireIfNotExists() should be TRUE the first time (when $i is
// 0) and FALSE the second time (when $i is 1).
$this->assertEqual(!$i, $stores[0]->setWithExpireIfNotExists($key, $this->objects[$i], rand(500, 100000)));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get($key));
}
@@ -110,7 +110,7 @@ public function testCRUDWithExpiration() {
$stores[0]->delete($key);
$stores[0]->setWithExpireIfNotExists($key, $this->objects[1], rand(500, 100000));
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get($key));
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
index c7ba82478e..78e6ca83f3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
@@ -54,21 +54,21 @@ public function testCRUD() {
// Verify that an item can be stored.
$stores[0]->set('foo', $this->objects[0]);
$this->assertTrue($stores[0]->has('foo'));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[0], $stores[0]->get('foo'));
// Verify that the other collection is not affected.
$this->assertFalse($stores[1]->has('foo'));
$this->assertNull($stores[1]->get('foo'));
// Verify that an item can be updated.
$stores[0]->set('foo', $this->objects[1]);
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get('foo'));
// Verify that a collection/name pair is unique.
$stores[1]->set('foo', $this->objects[2]);
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[1], $stores[0]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
// Verify that an item can be deleted.
$stores[0]->delete('foo');
@@ -77,7 +77,7 @@ public function testCRUD() {
// Verify that the other collection is not affected.
$this->assertTrue($stores[1]->has('foo'));
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[2], $stores[1]->get('foo'));
$stores[1]->delete('foo');
$this->assertNull($stores[1]->get('foo'));
@@ -91,7 +91,7 @@ public function testCRUD() {
// Verify that multiple items can be retrieved.
$result = $stores[0]->getMultiple(['foo', 'bar']);
foreach ($values as $j => $value) {
- $this->assertIdenticalObject($value, $result[$j]);
+ $this->assertEquals($value, $result[$j]);
}
// Verify that the other collection was not affected.
@@ -119,7 +119,7 @@ public function testCRUD() {
// Verify that deleting no items does not cause an error.
$stores[0]->deleteMultiple([]);
// Verify that the item in the other collection still exists.
- $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
+ $this->assertEquals($this->objects[5], $stores[1]->get('foo'));
}
@@ -163,7 +163,7 @@ public function testSetIfNotExists() {
// setIfNotExists() should be TRUE the first time (when $i is 0) and
// FALSE the second time (when $i is 1).
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Verify that the other collection is not affected.
$this->assertNull($stores[1]->get($key));
}
@@ -172,7 +172,7 @@ public function testSetIfNotExists() {
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// Verify that the other collection is still not affected.
$this->assertNull($stores[1]->get($key));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
index 0b955fd1c2..d13829b8b2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
@@ -128,6 +128,7 @@ public function testExceptionResponseGeneratedForOriginalRequest() {
* Sets the given path to use as the 404 page and triggers a 404.
*
* @param string $path
+ *
* @return \Drupal\Core\Render\HtmlResponse
*
* @see \Drupal\system\Tests\Routing\ExceptionHandlingTest::testExceptionResponseGeneratedForOriginalRequest()
diff --git a/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php b/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
index b4c8a4000e..da24101dce 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
@@ -87,24 +87,24 @@ public function testSharedTempStore() {
$this->assertEqual(!$i, $stores[0]->setIfNotExists($key, $this->objects[$i]));
$metadata = $stores[0]->getMetadata($key);
$this->assertEqual($users[0], $metadata->getOwnerId());
- $this->assertIdenticalObject($this->objects[0], $stores[0]->get($key));
+ $this->assertEquals($this->objects[0], $stores[0]->get($key));
// Another user should get the same result.
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[0], $metadata->getOwnerId());
- $this->assertIdenticalObject($this->objects[0], $stores[1]->get($key));
+ $this->assertEquals($this->objects[0], $stores[1]->get($key));
}
// Remove the item and try to set it again.
$stores[0]->delete($key);
$stores[0]->setIfNotExists($key, $this->objects[1]);
// This time it should succeed.
- $this->assertIdenticalObject($this->objects[1], $stores[0]->get($key));
+ $this->assertEquals($this->objects[1], $stores[0]->get($key));
// This user can update the object.
$stores[0]->set($key, $this->objects[2]);
- $this->assertIdenticalObject($this->objects[2], $stores[0]->get($key));
+ $this->assertEquals($this->objects[2], $stores[0]->get($key));
// The object is the same when another user loads it.
- $this->assertIdenticalObject($this->objects[2], $stores[1]->get($key));
+ $this->assertEquals($this->objects[2], $stores[1]->get($key));
// This user should be allowed to get, update, delete.
$this->assertInstanceOf(\stdClass::class, $stores[0]->getIfOwner($key));
@@ -113,8 +113,8 @@ public function testSharedTempStore() {
// Another user can update the object and become the owner.
$stores[1]->set($key, $this->objects[3]);
- $this->assertIdenticalObject($this->objects[3], $stores[0]->get($key));
- $this->assertIdenticalObject($this->objects[3], $stores[1]->get($key));
+ $this->assertEquals($this->objects[3], $stores[0]->get($key));
+ $this->assertEquals($this->objects[3], $stores[1]->get($key));
$metadata = $stores[1]->getMetadata($key);
$this->assertEqual($users[1], $metadata->getOwnerId());
diff --git a/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php b/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php
index 02d63841e2..c955289fcf 100644
--- a/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php
+++ b/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php
@@ -14,9 +14,10 @@ trait FileSystemModuleDiscoveryDataProviderTrait {
* An array of module names to test.
*/
public function coreModuleListDataProvider() {
- $module_dirs = array_keys(iterator_to_array(new \FilesystemIterator(__DIR__ . '/../../../modules/')));
- $module_names = array_map(function ($path) {
- return str_replace(__DIR__ . '/../../../modules/', '', $path);
+ $prefix = dirname(__DIR__, 3) . DIRECTORY_SEPARATOR . 'modules';
+ $module_dirs = array_keys(iterator_to_array(new \FilesystemIterator($prefix)));
+ $module_names = array_map(function ($path) use ($prefix) {
+ return str_replace($prefix . DIRECTORY_SEPARATOR, '', $path);
}, $module_dirs);
$modules_keyed = array_combine($module_names, $module_names);
diff --git a/web/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php b/web/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
index d942764005..554ed8dbec 100644
--- a/web/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Annotation/PluginTest.php
@@ -20,6 +20,7 @@ public function testGet() {
// Assert all values are accepted through constructor and default value is
// used for non existent but defined property.
$plugin = new PluginStub([
+ 1 => 'oak',
'foo' => 'bar',
'biz' => [
'baz' => 'boom',
@@ -32,6 +33,7 @@ public function testGet() {
// This property wasn't in our definition but is defined as a property on
// our plugin class.
'defaultProperty' => 'testvalue',
+ 1 => 'oak',
'foo' => 'bar',
'biz' => [
'baz' => 'boom',
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
index b5af25fc6b..f21cf5bf53 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
@@ -103,6 +103,7 @@ public function testScaffoldUpgrade() {
* Path to location to create git repository.
* @param string $version
* Version to tag the repository with.
+ *
* @return string
* Path to temporary git repository.
*/
diff --git a/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index 89294f3a44..5c33b4e08e 100644
--- a/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -20,6 +20,19 @@ public function testComposerLockHash() {
$content_hash = self::getContentHash(file_get_contents($this->root . '/composer.json'));
$lock = json_decode(file_get_contents($this->root . '/composer.lock'), TRUE);
$this->assertSame($content_hash, $lock['content-hash']);
+
+ // @see \Composer\Repository\PathRepository::initialize()
+ $core_lock_file_hash = '';
+ $options = [];
+ foreach ($lock['packages'] as $package) {
+ if ($package['name'] === 'drupal/core') {
+ $core_lock_file_hash = $package['dist']['reference'];
+ $options = $package['transport-options'] ?? [];
+ break;
+ }
+ }
+ $core_content_hash = sha1(file_get_contents($this->root . '/core/composer.json') . serialize($options));
+ $this->assertSame($core_content_hash, $core_lock_file_hash);
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
index 4e273b2910..e0ac9089c5 100644
--- a/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
@@ -113,11 +113,20 @@ public function testSetErrorMessage() {
* @covers ::setFile
*/
public function testSetFile() {
+ $filename = dirname(__DIR__, 6) . '/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc';
+ $this->assertIsNotCallable('_batch_test_callback_1');
+ $this->assertIsNotCallable('_batch_test_finished_1');
+
$batch = (new BatchBuilder())
- ->setFile('filename.php')
+ ->setFile($filename)
+ ->setFinishCallback('_batch_test_finished_1')
+ ->addOperation('_batch_test_callback_1', [])
->toArray();
-
- $this->assertEquals('filename.php', $batch['file']);
+ $this->assertEquals($filename, $batch['file']);
+ $this->assertEquals([['_batch_test_callback_1', []]], $batch['operations']);
+ $this->assertEquals('_batch_test_finished_1', $batch['finished']);
+ $this->assertIsCallable('_batch_test_callback_1');
+ $this->assertIsCallable('_batch_test_finished_1');
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
index a77ad09164..fa4cde6456 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
@@ -97,6 +97,7 @@ public function providerTestProcess() {
* bag so the setParameter() call effects the parent container as well.
*
* @param $service
+ *
* @return \Symfony\Component\DependencyInjection\ContainerBuilder
*/
protected function getSqliteContainer($service) {
@@ -115,6 +116,7 @@ protected function getSqliteContainer($service) {
* bag so the setParameter() call effects the parent container as well.
*
* @param $service
+ *
* @return \Symfony\Component\DependencyInjection\ContainerBuilder
*/
protected function getMysqlContainer($service) {
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index daa9dcb56a..4ac74d78ef 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -112,6 +112,7 @@ public function testAccessWithDifferentRouteParameters() {
*
* @param object $object
* Any object, including prophesized mocks based on interfaces.
+ *
* @return \Drupal\Core\Routing\RouteMatchInterface
* A prophesized RouteMatchInterface.
*/
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/RssResponseRelativeUrlFilterTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/RssResponseRelativeUrlFilterTest.php
index e9c9549f2b..3a1f5f2ecf 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/RssResponseRelativeUrlFilterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/RssResponseRelativeUrlFilterTest.php
@@ -25,7 +25,7 @@ public function providerTestOnResponse() {
<title>Drupal.org</title>
<link>https://www.drupal.org</link>
<description>Come for the software, stay for the community
-D rupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
+Drupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
<language>en</language>
<item>
<title>Drupal 8 turns one!</title>
@@ -44,7 +44,7 @@ public function providerTestOnResponse() {
<title>Drupal.org</title>
<link>https://www.drupal.org</link>
<description>Come for the software, stay for the community
-D rupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
+Drupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
<language>en</language>
<item>
<title>Drupal 8 turns one!</title>
@@ -66,7 +66,7 @@ public function providerTestOnResponse() {
<title>Drupal.org</title>
<link>https://www.drupal.org</link>
<description>Come for the software, stay for the community
-D rupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
+Drupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world.</description>
<language>en</language>
<item>
<title>Drupal 8 turns one!</title>
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
index 353b21d48a..1bb64cc5cc 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
@@ -13,6 +13,7 @@ class TestDerivativeDiscoveryWithObject implements DeriverInterface {
* {@inheritdoc}
* @param string $derivative_id
* @param array $base_plugin_definition
+ *
* @return array
*/
public function getDerivativeDefinition($derivative_id, $base_plugin_definition) {
@@ -23,6 +24,7 @@ public function getDerivativeDefinition($derivative_id, $base_plugin_definition)
/**
* {@inheritdoc}
* @param array $base_plugin_definition
+ *
* @return array
*/
public function getDerivativeDefinitions($base_plugin_definition) {
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
index a47ec73210..6f9848a7ed 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
@@ -22,6 +22,7 @@ abstract class RouteMatchTestBase extends UnitTestCase {
* Parameters array
* @param $raw_parameters
* Raw parameters array
+ *
* @return \Drupal\Core\Routing\RouteMatchInterface
*/
abstract protected function getRouteMatch($name, Route $route, array $parameters, array $raw_parameters);
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php b/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
index f0511e0c49..3da4c01272 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
@@ -99,6 +99,7 @@ public function providerTestAssembleWithExternalUrl() {
'override-query' => ['https://example.com/test?foo=1#bar', ['query' => ['foo' => 2]], 'https://example.com/test?foo=2#bar'],
'override-query-merge' => ['https://example.com/test?foo=1#bar', ['query' => ['bar' => 2]], 'https://example.com/test?foo=1&bar=2#bar'],
'override-deep-query-merge' => ['https://example.com/test?foo=1#bar', ['query' => ['bar' => ['baz' => 'foo']]], 'https://example.com/test?foo=1&bar%5Bbaz%5D=foo#bar'],
+ 'override-deep-query-merge-int-ket' => ['https://example.com/test?120=1', ['query' => ['bar' => ['baz' => 'foo']]], 'https://example.com/test?120=1&bar%5Bbaz%5D=foo'],
'override-fragment' => ['https://example.com/test?foo=1#bar', ['fragment' => 'baz'], 'https://example.com/test?foo=1#baz'],
['//www.drupal.org', [], '//www.drupal.org'],
];
diff --git a/web/core/tests/Drupal/Tests/EntityViewTrait.php b/web/core/tests/Drupal/Tests/EntityViewTrait.php
index 155d2b6fb2..41581a5f30 100644
--- a/web/core/tests/Drupal/Tests/EntityViewTrait.php
+++ b/web/core/tests/Drupal/Tests/EntityViewTrait.php
@@ -30,6 +30,7 @@ trait EntityViewTrait {
* the current content language.
* @param bool $reset
* (optional) Whether to clear the cache for this entity.
+ *
* @return array
*
* @see \Drupal\Core\Render\RendererInterface::render()
diff --git a/web/core/tests/bootstrap.php b/web/core/tests/bootstrap.php
index 6d27ec01da..a77a991191 100644
--- a/web/core/tests/bootstrap.php
+++ b/web/core/tests/bootstrap.php
@@ -25,6 +25,7 @@
*
* @param string $scan_directory
* The directory that should be recursively scanned.
+ *
* @return array
* An associative array of extension directories found within the scanned
* directory, keyed by extension name.
diff --git a/web/core/themes/claro/css/components/form.css b/web/core/themes/claro/css/components/form.css
index ca6f8f302f..78dc419d1c 100644
--- a/web/core/themes/claro/css/components/form.css
+++ b/web/core/themes/claro/css/components/form.css
@@ -185,6 +185,19 @@ tr .form-item,
color: #82828c;
}
+/* Add some spacing so that the focus ring and suffix don't overlap. */
+
+@media screen and (min-width: 601px) {
+ .form-item__suffix {
+ margin-left: 0.5rem; /* LTR */
+ }
+
+ [dir="rtl"] .form-item__suffix {
+ margin-right: 0.5rem;
+ margin-left: 0;
+ }
+}
+
/**
* Form actions.
*/
diff --git a/web/core/themes/claro/css/components/form.pcss.css b/web/core/themes/claro/css/components/form.pcss.css
index a39ea94255..554df9c9d1 100644
--- a/web/core/themes/claro/css/components/form.pcss.css
+++ b/web/core/themes/claro/css/components/form.pcss.css
@@ -114,6 +114,18 @@ tr .form-item,
color: var(--input--disabled-fg-color);
}
+/* Add some spacing so that the focus ring and suffix don't overlap. */
+@media screen and (min-width: 601px) {
+ .form-item__suffix {
+ margin-left: var(--space-xs); /* LTR */
+ }
+
+ [dir="rtl"] .form-item__suffix {
+ margin-right: var(--space-xs);
+ margin-left: 0;
+ }
+}
+
/**
* Form actions.
*/
--
GitLab