From 20ba6bbd18981e707c57b0af96efb9d305c937f1 Mon Sep 17 00:00:00 2001 From: Tim Plunkett Date: Sun, 7 Oct 2012 18:53:31 -0400 Subject: [PATCH] Issue #1805996 by tim.plunkett: Move Views integration for core to their respective modules. --- .../block/Plugin/views/display/Block.php | 4 +- .../modules => comment}/comment.views.inc | 0 .../comment/Plugin/views/argument/UserUid.php | 4 +- .../comment/Plugin/views/field/Comment.php | 4 +- .../comment/Plugin/views/field/Depth.php | 4 +- .../Plugin/views/field/LastTimestamp.php | 4 +- .../comment/Plugin/views/field/Link.php | 4 +- .../Plugin/views/field/LinkApprove.php | 4 +- .../comment/Plugin/views/field/LinkDelete.php | 4 +- .../comment/Plugin/views/field/LinkEdit.php | 4 +- .../comment/Plugin/views/field/LinkReply.php | 4 +- .../Plugin/views/field/NcsLastCommentName.php | 4 +- .../Plugin/views/field/NcsLastUpdated.php | 4 +- .../Plugin/views/field/NodeComment.php | 4 +- .../comment/Plugin/views/field/NodeLink.php | 4 +- .../Plugin/views/field/NodeNewComments.php | 4 +- .../comment/Plugin/views/field/Username.php | 4 +- .../Plugin/views/filter/NcsLastUpdated.php | 4 +- .../Plugin/views/filter/NodeComment.php | 4 +- .../comment/Plugin/views/filter/UserUid.php | 4 +- .../Drupal}/comment/Plugin/views/row/Rss.php | 4 +- .../Drupal}/comment/Plugin/views/row/View.php | 12 +- .../Plugin/views/sort/NcsLastCommentName.php | 4 +- .../Plugin/views/sort/NcsLastUpdated.php | 4 +- .../comment/Plugin/views/sort/Thread.php | 4 +- .../comment/Plugin/views/wizard/Comment.php | 4 +- .../{views/modules => field}/field.views.inc | 0 .../field/Plugin/views/argument/FieldList.php | 2 +- .../Plugin/views/argument/ListString.php | 4 +- .../field/Plugin/views/field/Field.php | 4 +- .../field/Plugin/views/filter/FieldList.php | 4 +- .../views/relationship/EntityReverse.php | 4 +- .../{views/modules => file}/file.views.inc | 0 .../file/Plugin/views/argument/Fid.php | 4 +- .../file/Plugin/views/field/Extension.php | 2 +- .../Drupal}/file/Plugin/views/field/File.php | 4 +- .../file/Plugin/views/field/FileMime.php | 4 +- .../file/Plugin/views/field/Status.php | 4 +- .../Drupal}/file/Plugin/views/field/Uri.php | 4 +- .../file/Plugin/views/filter/Status.php | 4 +- .../Drupal}/file/Plugin/views/wizard/File.php | 4 +- .../{views/modules => image}/image.views.inc | 0 .../node/Plugin/views/argument/CreatedDay.php | 4 +- .../Plugin/views/argument/CreatedFullDate.php | 4 +- .../Plugin/views/argument/CreatedMonth.php | 4 +- .../Plugin/views/argument/CreatedWeek.php | 4 +- .../Plugin/views/argument/CreatedYear.php | 4 +- .../views/argument/CreatedYearMonth.php | 4 +- .../node/Plugin/views/argument/Nid.php | 4 +- .../node/Plugin/views/argument/Type.php | 4 +- .../Plugin/views/argument/UidRevision.php | 6 +- .../node/Plugin/views/argument/Vid.php | 4 +- .../Plugin/views/argument_default/Node.php | 4 +- .../Plugin/views/argument_validator/Node.php | 4 +- .../views/field/HistoryUserTimestamp.php | 6 +- .../node/Plugin/views/field/Language.php | 6 +- .../Drupal}/node/Plugin/views/field/Link.php | 4 +- .../node/Plugin/views/field/LinkDelete.php | 6 +- .../node/Plugin/views/field/LinkEdit.php | 4 +- .../Drupal}/node/Plugin/views/field/Node.php | 4 +- .../Drupal}/node/Plugin/views/field/Path.php | 4 +- .../node/Plugin/views/field/Revision.php | 6 +- .../node/Plugin/views/field/RevisionLink.php | 6 +- .../Plugin/views/field/RevisionLinkDelete.php | 6 +- .../Plugin/views/field/RevisionLinkRevert.php | 6 +- .../Drupal}/node/Plugin/views/field/Type.php | 6 +- .../node/Plugin/views/filter/Access.php | 4 +- .../views/filter/HistoryUserTimestamp.php | 4 +- .../node/Plugin/views/filter/Status.php | 4 +- .../Drupal}/node/Plugin/views/filter/Type.php | 4 +- .../node/Plugin/views/filter/UidRevision.php | 6 +- .../lib/Drupal}/node/Plugin/views/row/Rss.php | 4 +- .../Drupal}/node/Plugin/views/row/View.php | 10 +- .../Drupal}/node/Plugin/views/wizard/Node.php | 4 +- .../node/Plugin/views/wizard/NodeRevision.php | 4 +- .../{views/modules => node}/node.views.inc | 0 .../search/Plugin/views/argument/Search.php | 6 +- .../search/Plugin/views/field/Score.php | 4 +- .../search/Plugin/views/filter/Search.php | 8 +- .../Drupal}/search/Plugin/views/row/View.php | 4 +- .../search/Plugin/views/sort/Score.php | 4 +- .../lib/Drupal}/search/ViewsSearchQuery.php | 8 +- .../system/Plugin/views/row/Entity.php | 4 +- .../Plugin/views/argument/IndexTid.php | 4 +- .../Plugin/views/argument/IndexTidDepth.php | 4 +- .../views/argument/IndexTidDepthModifier.php | 4 +- .../Plugin/views/argument/Taxonomy.php | 4 +- .../views/argument/VocabularyMachineName.php | 4 +- .../Plugin/views/argument/VocabularyVid.php | 4 +- .../Plugin/views/argument_default/Tid.php | 4 +- .../Plugin/views/argument_validator/Term.php | 4 +- .../taxonomy/Plugin/views/field/Language.php | 6 +- .../taxonomy/Plugin/views/field/LinkEdit.php | 4 +- .../taxonomy/Plugin/views/field/Taxonomy.php | 4 +- .../Plugin/views/field/TaxonomyIndexTid.php | 4 +- .../Plugin/views/filter/TaxonomyIndexTid.php | 2 +- .../views/filter/TaxonomyIndexTidDepth.php | 4 +- .../views/filter/VocabularyMachineName.php | 4 +- .../Plugin/views/filter/VocabularyVid.php | 4 +- .../views/relationship/NodeTermData.php | 4 +- .../Plugin/views/wizard/TaxonomyTerm.php | 4 +- .../modules => taxonomy}/taxonomy.views.inc | 0 .../user/Plugin/views/access/Permission.php | 4 +- .../Drupal}/user/Plugin/views/access/Role.php | 4 +- .../user/Plugin/views/argument/RolesRid.php | 2 +- .../user/Plugin/views/argument/Uid.php | 4 +- .../views/argument_default/CurrentUser.php | 4 +- .../Plugin/views/argument_default/User.php | 4 +- .../Plugin/views/argument_validator/User.php | 4 +- .../user/Plugin/views/field/Language.php | 4 +- .../Drupal}/user/Plugin/views/field/Link.php | 4 +- .../user/Plugin/views/field/LinkCancel.php | 4 +- .../user/Plugin/views/field/LinkEdit.php | 4 +- .../Drupal}/user/Plugin/views/field/Mail.php | 4 +- .../Drupal}/user/Plugin/views/field/Name.php | 6 +- .../user/Plugin/views/field/Permissions.php | 4 +- .../user/Plugin/views/field/Picture.php | 4 +- .../Drupal}/user/Plugin/views/field/Roles.php | 4 +- .../Drupal}/user/Plugin/views/field/User.php | 4 +- .../user/Plugin/views/filter/Current.php | 2 +- .../Drupal}/user/Plugin/views/filter/Name.php | 4 +- .../user/Plugin/views/filter/Permissions.php | 4 +- .../user/Plugin/views/filter/Roles.php | 4 +- .../Drupal}/user/Plugin/views/row/View.php | 8 +- .../user/Plugin/views/wizard/Users.php | 4 +- .../{views/modules => user}/user.views.inc | 0 core/modules/views/includes/cache.inc | 1 - .../Drupal/views/Plugin/Type/JoinManager.php | 27 +- .../views/Plugin/Type/PluginManager.php | 34 +- .../views/Plugin/Type/WizardManager.php | 27 +- .../Drupal/views/Tests/Comment/WizardTest.php | 2 +- .../views/Tests/Language/ArgumentLanguage.php | 47 --- .../views/Tests/Language/FieldLanguage.php | 42 -- .../views/Tests/Language/FilterLanguage.php | 48 --- .../views/Tests/Language/LanguageTestBase.php | 78 ---- .../Drupal/views/Tests/Node/FieldTypeTest.php | 4 +- .../views/Tests/User/AccessPermissionTest.php | 14 +- .../views/Tests/User/AccessRoleTest.php | 14 +- .../lib/Drupal/views/Tests/ViewTestBase.php | 6 - .../Plugin/views/argument/CategoryCid.php | 41 -- .../aggregator/Plugin/views/argument/Fid.php | 42 -- .../aggregator/Plugin/views/argument/Iid.php | 42 -- .../Plugin/views/field/Category.php | 74 ---- .../Plugin/views/field/TitleLink.php | 72 ---- .../aggregator/Plugin/views/field/Xss.php | 30 -- .../Plugin/views/filter/CategoryCid.php | 39 -- .../Views/aggregator/Plugin/views/row/Rss.php | 92 ----- .../Plugin/views/argument_default/Root.php | 36 -- .../Plugin/views/field/ContactLink.php | 68 ---- .../filter/Plugin/views/field/FormatName.php | 53 --- .../Plugin/views/argument/Language.php | 46 --- .../language/Plugin/views/field/Language.php | 50 --- .../language/Plugin/views/filter/Language.php | 38 -- .../locale/Plugin/views/field/LinkEdit.php | 77 ---- .../locale/Plugin/views/filter/Version.php | 42 -- .../Plugin/views/field/AccesslogPath.php | 71 ---- .../Plugin/views/argument/NodeTnid.php | 41 -- .../Plugin/views/field/NodeLinkTranslate.php | 41 -- .../views/field/NodeTranslationLink.php | 66 ---- .../Plugin/views/filter/NodeTnid.php | 58 --- .../Plugin/views/filter/NodeTnidChild.php | 36 -- .../Plugin/views/relationship/Translation.php | 113 ------ .../views/modules/aggregator.views.inc | 358 ------------------ core/modules/views/modules/book.views.inc | 113 ------ core/modules/views/modules/contact.views.inc | 21 - core/modules/views/modules/filter.views.inc | 31 -- core/modules/views/modules/language.views.inc | 91 ----- core/modules/views/modules/locale.views.inc | 192 ---------- core/modules/views/modules/poll.views.inc | 46 --- core/modules/views/modules/search.views.inc | 141 ------- .../views/modules/statistics.views.inc | 259 ------------- .../views/modules/translation.views.inc | 120 ------ .../views_test_data/views_test_data.module | 10 - core/modules/views/views.module | 202 +--------- .../views/{modules => }/views.views.inc | 0 .../views_ui/lib/Drupal/views_ui/ViewUI.php | 3 - 176 files changed, 291 insertions(+), 3426 deletions(-) rename core/modules/{views/lib/Views => block/lib/Drupal}/block/Plugin/views/display/Block.php (98%) rename core/modules/{views/modules => comment}/comment.views.inc (100%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/argument/UserUid.php (93%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/Comment.php (95%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/Depth.php (83%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/LastTimestamp.php (88%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/Link.php (94%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/LinkApprove.php (90%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/LinkDelete.php (87%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/LinkEdit.php (92%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/LinkReply.php (87%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/NcsLastCommentName.php (94%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/NcsLastUpdated.php (85%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/NodeComment.php (84%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/NodeLink.php (93%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/NodeNewComments.php (96%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/field/Username.php (94%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/filter/NcsLastUpdated.php (86%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/filter/NodeComment.php (82%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/filter/UserUid.php (88%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/row/Rss.php (97%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/row/View.php (77%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/sort/NcsLastCommentName.php (92%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/sort/NcsLastUpdated.php (86%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/sort/Thread.php (90%) rename core/modules/{views/lib/Views => comment/lib/Drupal}/comment/Plugin/views/wizard/Comment.php (98%) rename core/modules/{views/modules => field}/field.views.inc (100%) rename core/modules/{views/lib/Views => field/lib/Drupal}/field/Plugin/views/argument/FieldList.php (97%) rename core/modules/{views/lib/Views => field/lib/Drupal}/field/Plugin/views/argument/ListString.php (94%) rename core/modules/{views/lib/Views => field/lib/Drupal}/field/Plugin/views/field/Field.php (99%) rename core/modules/{views/lib/Views => field/lib/Drupal}/field/Plugin/views/filter/FieldList.php (81%) rename core/modules/{views/lib/Views => field/lib/Drupal}/field/Plugin/views/relationship/EntityReverse.php (95%) rename core/modules/{views/modules => file}/file.views.inc (100%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/argument/Fid.php (86%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/field/Extension.php (93%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/field/File.php (94%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/field/FileMime.php (92%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/field/Status.php (81%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/field/Uri.php (92%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/filter/Status.php (80%) rename core/modules/{views/lib/Views => file/lib/Drupal}/file/Plugin/views/wizard/File.php (95%) rename core/modules/{views/modules => image}/image.views.inc (100%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedDay.php (92%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedFullDate.php (89%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedMonth.php (91%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedWeek.php (86%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedYear.php (81%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/CreatedYearMonth.php (90%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/Nid.php (84%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/Type.php (88%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/UidRevision.php (80%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument/Vid.php (90%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument_default/Node.php (86%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/argument_validator/Node.php (97%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/HistoryUserTimestamp.php (94%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Language.php (89%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Link.php (93%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/LinkDelete.php (83%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/LinkEdit.php (90%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Node.php (96%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Path.php (94%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Revision.php (93%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/RevisionLink.php (93%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/RevisionLinkDelete.php (85%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/RevisionLinkRevert.php (85%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/field/Type.php (90%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/filter/Access.php (91%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/filter/HistoryUserTimestamp.php (96%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/filter/Status.php (87%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/filter/Type.php (86%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/filter/UidRevision.php (83%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/row/Rss.php (98%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/row/View.php (82%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/wizard/Node.php (99%) rename core/modules/{views/lib/Views => node/lib/Drupal}/node/Plugin/views/wizard/NodeRevision.php (97%) rename core/modules/{views/modules => node}/node.views.inc (100%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/Plugin/views/argument/Search.php (95%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/Plugin/views/field/Score.php (96%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/Plugin/views/filter/Search.php (96%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/Plugin/views/row/View.php (91%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/Plugin/views/sort/Score.php (92%) rename core/modules/{views/lib/Views => search/lib/Drupal}/search/ViewsSearchQuery.php (91%) rename core/modules/{views/lib/Views => system/lib/Drupal}/system/Plugin/views/row/Entity.php (97%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/IndexTid.php (93%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/IndexTidDepth.php (97%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php (92%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/Taxonomy.php (85%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/VocabularyMachineName.php (85%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument/VocabularyVid.php (85%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument_default/Tid.php (97%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/argument_validator/Term.php (98%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/field/Language.php (72%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/field/LinkEdit.php (95%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/field/Taxonomy.php (96%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/field/TaxonomyIndexTid.php (97%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php (99%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php (96%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/filter/VocabularyMachineName.php (83%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/filter/VocabularyVid.php (83%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/relationship/NodeTermData.php (96%) rename core/modules/{views/lib/Views => taxonomy/lib/Drupal}/taxonomy/Plugin/views/wizard/TaxonomyTerm.php (94%) rename core/modules/{views/modules => taxonomy}/taxonomy.views.inc (100%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/access/Permission.php (95%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/access/Role.php (95%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/argument/RolesRid.php (93%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/argument/Uid.php (87%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/argument_default/CurrentUser.php (82%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/argument_default/User.php (94%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/argument_validator/User.php (97%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Language.php (90%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Link.php (94%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/LinkCancel.php (89%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/LinkEdit.php (88%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Mail.php (92%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Name.php (95%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Permissions.php (95%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Picture.php (97%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/Roles.php (95%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/field/User.php (94%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/filter/Current.php (96%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/filter/Name.php (97%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/filter/Permissions.php (91%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/filter/Roles.php (88%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/row/View.php (74%) rename core/modules/{views/lib/Views => user/lib/Drupal}/user/Plugin/views/wizard/Users.php (96%) rename core/modules/{views/modules => user}/user.views.inc (100%) delete mode 100644 core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php delete mode 100644 core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php delete mode 100644 core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php delete mode 100644 core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/argument/Fid.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/argument/Iid.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/field/Category.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/field/TitleLink.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/field/Xss.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php delete mode 100644 core/modules/views/lib/Views/aggregator/Plugin/views/row/Rss.php delete mode 100644 core/modules/views/lib/Views/book/Plugin/views/argument_default/Root.php delete mode 100644 core/modules/views/lib/Views/contact/Plugin/views/field/ContactLink.php delete mode 100644 core/modules/views/lib/Views/filter/Plugin/views/field/FormatName.php delete mode 100644 core/modules/views/lib/Views/language/Plugin/views/argument/Language.php delete mode 100644 core/modules/views/lib/Views/language/Plugin/views/field/Language.php delete mode 100644 core/modules/views/lib/Views/language/Plugin/views/filter/Language.php delete mode 100644 core/modules/views/lib/Views/locale/Plugin/views/field/LinkEdit.php delete mode 100644 core/modules/views/lib/Views/locale/Plugin/views/filter/Version.php delete mode 100644 core/modules/views/lib/Views/statistics/Plugin/views/field/AccesslogPath.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/argument/NodeTnid.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnid.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php delete mode 100644 core/modules/views/lib/Views/translation/Plugin/views/relationship/Translation.php delete mode 100644 core/modules/views/modules/aggregator.views.inc delete mode 100644 core/modules/views/modules/book.views.inc delete mode 100644 core/modules/views/modules/contact.views.inc delete mode 100644 core/modules/views/modules/filter.views.inc delete mode 100644 core/modules/views/modules/language.views.inc delete mode 100644 core/modules/views/modules/locale.views.inc delete mode 100644 core/modules/views/modules/poll.views.inc delete mode 100644 core/modules/views/modules/search.views.inc delete mode 100644 core/modules/views/modules/statistics.views.inc delete mode 100644 core/modules/views/modules/translation.views.inc rename core/modules/views/{modules => }/views.views.inc (100%) diff --git a/core/modules/views/lib/Views/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php similarity index 98% rename from core/modules/views/lib/Views/block/Plugin/views/display/Block.php rename to core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php index a1d205aff4c..cb8208102f2 100644 --- a/core/modules/views/lib/Views/block/Plugin/views/display/Block.php +++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php @@ -3,10 +3,10 @@ /** * @file * Definition of Drupal\views\Plugin\views\display\Block. - * Definition of Views\block\Plugin\views\display\Block. + * Definition of Drupal\block\Plugin\views\display\Block. */ -namespace Views\block\Plugin\views\display; +namespace Drupal\block\Plugin\views\display; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/modules/comment.views.inc b/core/modules/comment/comment.views.inc similarity index 100% rename from core/modules/views/modules/comment.views.inc rename to core/modules/comment/comment.views.inc diff --git a/core/modules/views/lib/Views/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php similarity index 93% rename from core/modules/views/lib/Views/comment/Plugin/views/argument/UserUid.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php index d11d011ea34..521e45abcb0 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/argument/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\argument\UserUid. + * Definition of Drupal\comment\Plugin\views\argument\UserUid. */ -namespace Views\comment\Plugin\views\argument; +namespace Drupal\comment\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php similarity index 95% rename from core/modules/views/lib/Views/comment/Plugin/views/field/Comment.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php index fe151ad4628..eadc0b576ab 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\Comment. + * Definition of Drupal\comment\Plugin\views\field\Comment. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php similarity index 83% rename from core/modules/views/lib/Views/comment/Plugin/views/field/Depth.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php index 5d0224895c8..1713bd7f506 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/Depth.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\Depth. + * Definition of Drupal\comment\Plugin\views\field\Depth. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php similarity index 88% rename from core/modules/views/lib/Views/comment/Plugin/views/field/LastTimestamp.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php index e6319532d18..1f148031727 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/LastTimestamp.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\LastTimestamp. + * Definition of Drupal\comment\Plugin\views\field\LastTimestamp. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\Date; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/Link.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php similarity index 94% rename from core/modules/views/lib/Views/comment/Plugin/views/field/Link.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php index 6ba3c8eb1ec..d11e7a58f2b 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/Link.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\Link. + * Definition of Drupal\comment\Plugin\views\field\Link. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php similarity index 90% rename from core/modules/views/lib/Views/comment/Plugin/views/field/LinkApprove.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php index 6bdb3c09f82..5eb2195c46e 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkApprove.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\LinkApprove. + * Definition of Drupal\comment\Plugin\views\field\LinkApprove. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php similarity index 87% rename from core/modules/views/lib/Views/comment/Plugin/views/field/LinkDelete.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php index a445a6f9573..fbe08158633 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkDelete.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\LinkDelete. + * Definition of Drupal\comment\Plugin\views\field\LinkDelete. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php similarity index 92% rename from core/modules/views/lib/Views/comment/Plugin/views/field/LinkEdit.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php index 7b8c1f24674..4a17fe73a4a 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkEdit.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\LinkEdit. + * Definition of Drupal\comment\Plugin\views\field\LinkEdit. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php similarity index 87% rename from core/modules/views/lib/Views/comment/Plugin/views/field/LinkReply.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php index 8ddfd79ecb3..bee231c2414 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/LinkReply.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\LinkReply. + * Definition of Drupal\comment\Plugin\views\field\LinkReply. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php similarity index 94% rename from core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php index 8ae50781304..e52caa4e648 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\NcsLastCommentName. + * Definition of Drupal\comment\Plugin\views\field\NcsLastCommentName. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php similarity index 85% rename from core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php index b9f1c950257..da21adf0ccc 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\NcsLastUpdated. + * Definition of Drupal\comment\Plugin\views\field\NcsLastUpdated. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\Date; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php similarity index 84% rename from core/modules/views/lib/Views/comment/Plugin/views/field/NodeComment.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php index 99029724001..e0b3f9075ad 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\NodeComment. + * Definition of Drupal\comment\Plugin\views\field\NodeComment. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeLink.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php similarity index 93% rename from core/modules/views/lib/Views/comment/Plugin/views/field/NodeLink.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php index c59940305ee..21e0102d553 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeLink.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\NodeLink. + * Definition of Drupal\comment\Plugin\views\field\NodeLink. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php similarity index 96% rename from core/modules/views/lib/Views/comment/Plugin/views/field/NodeNewComments.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php index fbc49793f84..fe24f524830 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\NodeNewComments. + * Definition of Drupal\comment\Plugin\views\field\NodeNewComments. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\Numeric; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php similarity index 94% rename from core/modules/views/lib/Views/comment/Plugin/views/field/Username.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php index 52e8851a006..42a7590fe88 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/field/Username.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\field\Username. + * Definition of Drupal\comment\Plugin\views\field\Username. */ -namespace Views\comment\Plugin\views\field; +namespace Drupal\comment\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php similarity index 86% rename from core/modules/views/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php index 2c4cd6b8408..9b96a6a6dac 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\filter\NcsLastUpdated. + * Definition of Drupal\comment\Plugin\views\filter\NcsLastUpdated. */ -namespace Views\comment\Plugin\views\filter; +namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\Date; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php similarity index 82% rename from core/modules/views/lib/Views/comment/Plugin/views/filter/NodeComment.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php index 43ee9f9820b..1eae8c9cc14 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/filter/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\filter\NodeComment. + * Definition of Drupal\comment\Plugin\views\filter\NodeComment. */ -namespace Views\comment\Plugin\views\filter; +namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php similarity index 88% rename from core/modules/views/lib/Views/comment/Plugin/views/filter/UserUid.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php index 1aa3083d3d6..32eae9c3ecc 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/filter/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\filter\UserUid. + * Definition of Drupal\comment\Plugin\views\filter\UserUid. */ -namespace Views\comment\Plugin\views\filter; +namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php similarity index 97% rename from core/modules/views/lib/Views/comment/Plugin/views/row/Rss.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php index 323df24c337..d1409631f4f 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/row/Rss.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\row\Rss. + * Definition of Drupal\comment\Plugin\views\row\Rss. */ -namespace Views\comment\Plugin\views\row; +namespace Drupal\comment\Plugin\views\row; use Drupal\views\Plugin\views\row\RowPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/row/View.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php similarity index 77% rename from core/modules/views/lib/Views/comment/Plugin/views/row/View.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php index 094971b5fc3..56a3afb4755 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/row/View.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\comment\Plugin\views\row\View. + * Definition of Drupal\comment\Plugin\views\row\View. */ -namespace Views\comment\Plugin\views\row; +namespace Drupal\comment\Plugin\views\row; -use Views\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\Entity; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; @@ -28,7 +28,7 @@ use Drupal\Core\Annotation\Translation; class View extends Entity { /** - * Overrides Views\system\Plugin\views\row\Entity::defineOptions(). + * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions(). */ protected function defineOptions() { $options = parent::defineOptions(); @@ -38,7 +38,7 @@ class View extends Entity { } /** - * Overrides Views\system\Plugin\views\row\Entity::buildOptionsForm(). + * Overrides Drupal\system\Plugin\views\row\Entity::buildOptionsForm(). */ public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); @@ -51,7 +51,7 @@ class View extends Entity { } /** - * Overrides Views\system\Plugin\views\row\Entity::render(). + * Overrides Drupal\system\Plugin\views\row\Entity::render(). */ function render($row) { $entity_id = $row->{$this->field_alias}; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php similarity index 92% rename from core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php index 8ba5d596316..de3511e1113 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\sort\NcsLastCommentName. + * Definition of Drupal\comment\Plugin\views\sort\NcsLastCommentName. */ -namespace Views\comment\Plugin\views\sort; +namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php similarity index 86% rename from core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php index ff60bd645bf..db4ddc82d37 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\sort\NcsLastUpdated. + * Definition of Drupal\comment\Plugin\views\sort\NcsLastUpdated. */ -namespace Views\comment\Plugin\views\sort; +namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\Date; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/sort/Thread.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php similarity index 90% rename from core/modules/views/lib/Views/comment/Plugin/views/sort/Thread.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php index 4377ea41e58..b562e85dffb 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/sort/Thread.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\comment\Plugin\views\sort\Thread. + * Definition of Drupal\comment\Plugin\views\sort\Thread. */ -namespace Views\comment\Plugin\views\sort; +namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php similarity index 98% rename from core/modules/views/lib/Views/comment/Plugin/views/wizard/Comment.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php index dd67c520e32..d079af4f83f 100644 --- a/core/modules/views/lib/Views/comment/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\wizard\Comment. + * Definition of Drupal\node\Plugin\views\wizard\Comment. */ -namespace Views\comment\Plugin\views\wizard; +namespace Drupal\comment\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/modules/field.views.inc b/core/modules/field/field.views.inc similarity index 100% rename from core/modules/views/modules/field.views.inc rename to core/modules/field/field.views.inc diff --git a/core/modules/views/lib/Views/field/Plugin/views/argument/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php similarity index 97% rename from core/modules/views/lib/Views/field/Plugin/views/argument/FieldList.php rename to core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php index f3b486b824c..f1b0d352e11 100644 --- a/core/modules/views/lib/Views/field/Plugin/views/argument/FieldList.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php @@ -5,7 +5,7 @@ * Definition of views_handler_argument_field_list. */ -namespace Views\field\Plugin\views\argument; +namespace Drupal\field\Plugin\views\argument; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\argument\Numeric; diff --git a/core/modules/views/lib/Views/field/Plugin/views/argument/ListString.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php similarity index 94% rename from core/modules/views/lib/Views/field/Plugin/views/argument/ListString.php rename to core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php index 6ac3f8d5c57..596d73e3db5 100644 --- a/core/modules/views/lib/Views/field/Plugin/views/argument/ListString.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\field\Plugin\views\argument\ListString. + * Definition of Drupal\field\Plugin\views\argument\ListString. */ -namespace Views\field\Plugin\views\argument; +namespace Drupal\field\Plugin\views\argument; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\argument\String; diff --git a/core/modules/views/lib/Views/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php similarity index 99% rename from core/modules/views/lib/Views/field/Plugin/views/field/Field.php rename to core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index 670c0df7b6b..4c5e5da3d12 100644 --- a/core/modules/views/lib/Views/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\field\Plugin\views\field\Field. + * Definition of Drupal\field\Plugin\views\field\Field. */ -namespace Views\field\Plugin\views\field; +namespace Drupal\field\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php similarity index 81% rename from core/modules/views/lib/Views/field/Plugin/views/filter/FieldList.php rename to core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php index d5acfcdf0d0..6dbd16a828d 100644 --- a/core/modules/views/lib/Views/field/Plugin/views/filter/FieldList.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\field\Plugin\views\filter\FieldList. + * Definition of Drupal\field\Plugin\views\filter\FieldList. */ -namespace Views\field\Plugin\views\filter; +namespace Drupal\field\Plugin\views\filter; use Drupal\views\Plugin\views\filter\ManyToOne; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php similarity index 95% rename from core/modules/views/lib/Views/field/Plugin/views/relationship/EntityReverse.php rename to core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php index e98a7423338..75ad5335851 100644 --- a/core/modules/views/lib/Views/field/Plugin/views/relationship/EntityReverse.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\field\Plugin\views\relationship\EntityReverse. + * Definition of Drupal\field\Plugin\views\relationship\EntityReverse. */ -namespace Views\field\Plugin\views\relationship; +namespace Drupal\field\Plugin\views\relationship; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\relationship\RelationshipPluginBase; diff --git a/core/modules/views/modules/file.views.inc b/core/modules/file/file.views.inc similarity index 100% rename from core/modules/views/modules/file.views.inc rename to core/modules/file/file.views.inc diff --git a/core/modules/views/lib/Views/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php similarity index 86% rename from core/modules/views/lib/Views/file/Plugin/views/argument/Fid.php rename to core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php index cf9c9d213ca..16de71be2a3 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/argument/Fid.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\argument\Fid. + * Definition of Drupal\file\Plugin\views\argument\Fid. */ -namespace Views\file\Plugin\views\argument; +namespace Drupal\file\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; diff --git a/core/modules/views/lib/Views/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php similarity index 93% rename from core/modules/views/lib/Views/file/Plugin/views/field/Extension.php rename to core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php index 792bb137214..012b895eaef 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/field/Extension.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php @@ -5,7 +5,7 @@ * Definition of views_handler_field_file_extension. */ -namespace Views\file\Plugin\views\field; +namespace Drupal\file\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php similarity index 94% rename from core/modules/views/lib/Views/file/Plugin/views/field/File.php rename to core/modules/file/lib/Drupal/file/Plugin/views/field/File.php index a10f88db9d8..facf8a5ebda 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/field/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\field\File. + * Definition of Drupal\file\Plugin\views\field\File. */ -namespace Views\file\Plugin\views\field; +namespace Drupal\file\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php similarity index 92% rename from core/modules/views/lib/Views/file/Plugin/views/field/FileMime.php rename to core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php index ebef8cb75e3..74cec34d3d6 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/field/FileMime.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\field\FileMime. + * Definition of Drupal\file\Plugin\views\field\FileMime. */ -namespace Views\file\Plugin\views\field; +namespace Drupal\file\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/file/Plugin/views/field/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php similarity index 81% rename from core/modules/views/lib/Views/file/Plugin/views/field/Status.php rename to core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php index a90e07131c9..afb773a38dc 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/field/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\field\Status. + * Definition of Drupal\file\Plugin\views\field\Status. */ -namespace Views\file\Plugin\views\field; +namespace Drupal\file\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php similarity index 92% rename from core/modules/views/lib/Views/file/Plugin/views/field/Uri.php rename to core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php index 9a804aa4b5d..78e07c046c9 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/field/Uri.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\field\Uri. + * Definition of Drupal\file\Plugin\views\field\Uri. */ -namespace Views\file\Plugin\views\field; +namespace Drupal\file\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php similarity index 80% rename from core/modules/views/lib/Views/file/Plugin/views/filter/Status.php rename to core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php index 914e9db509a..4a1c7372f35 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/filter/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\filter\Status. + * Definition of Drupal\file\Plugin\views\filter\Status. */ -namespace Views\file\Plugin\views\filter; +namespace Drupal\file\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; diff --git a/core/modules/views/lib/Views/file/Plugin/views/wizard/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php similarity index 95% rename from core/modules/views/lib/Views/file/Plugin/views/wizard/File.php rename to core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php index 0408617610e..00d451f9558 100644 --- a/core/modules/views/lib/Views/file/Plugin/views/wizard/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\file\Plugin\views\wizard\File. + * Definition of Drupal\file\Plugin\views\wizard\File. */ -namespace Views\file\Plugin\views\wizard; +namespace Drupal\file\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/modules/image.views.inc b/core/modules/image/image.views.inc similarity index 100% rename from core/modules/views/modules/image.views.inc rename to core/modules/image/image.views.inc diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedDay.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php similarity index 92% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedDay.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php index 0d6b4240feb..1601302e7eb 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedDay.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedDay. + * Definition of Drupal\node\Plugin\views\argument\CreatedDay. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedFullDate.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php similarity index 89% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedFullDate.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php index ac3e1d9f5f0..17f53ef2037 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedFullDate.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedFullDate. + * Definition of Drupal\node\Plugin\views\argument\CreatedFullDate. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedMonth.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php similarity index 91% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedMonth.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php index 22fb87fc36c..f521e9f06ae 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedMonth.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedMonth. + * Definition of Drupal\node\Plugin\views\argument\CreatedMonth. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedWeek.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php similarity index 86% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedWeek.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php index e68c4681aaa..1b75912515a 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedWeek.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedWeek. + * Definition of Drupal\node\Plugin\views\argument\CreatedWeek. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYear.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php similarity index 81% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYear.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php index fd92735bdae..0a666c83d7e 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYear.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedYear. + * Definition of Drupal\node\Plugin\views\argument\CreatedYear. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php similarity index 90% rename from core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php index 5e0b8927254..a0241185231 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\CreatedYearMonth. + * Definition of Drupal\node\Plugin\views\argument\CreatedYearMonth. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/Nid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php similarity index 84% rename from core/modules/views/lib/Views/node/Plugin/views/argument/Nid.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php index a804363694e..bda334dd051 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/Nid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\Nid. + * Definition of Drupal\node\Plugin\views\argument\Nid. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php similarity index 88% rename from core/modules/views/lib/Views/node/Plugin/views/argument/Type.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php index f496cc81d05..1a11b22f81e 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\Type. + * Definition of Drupal\node\Plugin\views\argument\Type. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\String; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php similarity index 80% rename from core/modules/views/lib/Views/node/Plugin/views/argument/UidRevision.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php index 704f1313724..d93611e8cfb 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\UidRevision. + * Definition of Drupal\node\Plugin\views\argument\UidRevision. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; -use Views\user\Plugin\views\argument\Uid; +use Drupal\user\Plugin\views\argument\Uid; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php similarity index 90% rename from core/modules/views/lib/Views/node/Plugin/views/argument/Vid.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php index 48376152a0b..d24c31471c0 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument/Vid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument\Vid. + * Definition of Drupal\node\Plugin\views\argument\Vid. */ -namespace Views\node\Plugin\views\argument; +namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument_default/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php similarity index 86% rename from core/modules/views/lib/Views/node/Plugin/views/argument_default/Node.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php index ff32cd5aeb3..690dd31eeb2 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument_default/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument_default\Node. + * Definition of Drupal\node\Plugin\views\argument_default\Node. */ -namespace Views\node\Plugin\views\argument_default; +namespace Drupal\node\Plugin\views\argument_default; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/node/Plugin/views/argument_validator/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php similarity index 97% rename from core/modules/views/lib/Views/node/Plugin/views/argument_validator/Node.php rename to core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php index 5066977410b..4607e770a78 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/argument_validator/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\argument_validator\Node. + * Definition of Drupal\node\Plugin\views\argument_validator\Node. */ -namespace Views\node\Plugin\views\argument_validator; +namespace Drupal\node\Plugin\views\argument_validator; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php similarity index 94% rename from core/modules/views/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php index c45d62be415..3617bc605ba 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php @@ -2,13 +2,13 @@ /** * @file - * Definition of Views\node\Plugin\views\field\HistoryUserTimestamp. + * Definition of Drupal\node\Plugin\views\field\HistoryUserTimestamp. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; use Drupal\views\ViewExecutable; -use Views\node\Plugin\views\field\Node; +use Drupal\node\Plugin\views\field\Node; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Language.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php similarity index 89% rename from core/modules/views/lib/Views/node/Plugin/views/field/Language.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php index c4dff1bdf8d..3fb43fb9b33 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Language.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Language. + * Definition of Drupal\node\Plugin\views\field\Language. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\Node; +use Drupal\node\Plugin\views\field\Node; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php similarity index 93% rename from core/modules/views/lib/Views/node/Plugin/views/field/Link.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php index 0491889c2a1..83c489aef16 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Link.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Link. + * Definition of Drupal\node\Plugin\views\field\Link. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/LinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php similarity index 83% rename from core/modules/views/lib/Views/node/Plugin/views/field/LinkDelete.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php index f9d56719fb1..6a394ff126d 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/LinkDelete.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\LinkDelete. + * Definition of Drupal\node\Plugin\views\field\LinkDelete. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\Link; +use Drupal\node\Plugin\views\field\Link; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/LinkEdit.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php similarity index 90% rename from core/modules/views/lib/Views/node/Plugin/views/field/LinkEdit.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php index 1e59566b299..bf27a9bb01a 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/LinkEdit.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php @@ -5,9 +5,9 @@ * Definition of views_handler_field_node_link_edit. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\Link; +use Drupal\node\Plugin\views\field\Link; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php similarity index 96% rename from core/modules/views/lib/Views/node/Plugin/views/field/Node.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php index 974c6be4d65..b78e9f0288f 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Node. + * Definition of Drupal\node\Plugin\views\field\Node. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php similarity index 94% rename from core/modules/views/lib/Views/node/Plugin/views/field/Path.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php index 01a8c525d7d..1fca3d3b7d5 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Path.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Path. + * Definition of Drupal\node\Plugin\views\field\Path. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php similarity index 93% rename from core/modules/views/lib/Views/node/Plugin/views/field/Revision.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php index 2e1b12a2a29..163c9f37564 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Revision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php @@ -2,13 +2,13 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Revision. + * Definition of Drupal\node\Plugin\views\field\Revision. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; use Drupal\views\ViewExecutable; -use Views\node\Plugin\views\field\Node; +use Drupal\node\Plugin\views\field\Node; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php similarity index 93% rename from core/modules/views/lib/Views/node/Plugin/views/field/RevisionLink.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php index 8f9c2b31c26..07012344de4 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLink.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\RevisionLink. + * Definition of Drupal\node\Plugin\views\field\RevisionLink. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\Link; +use Drupal\node\Plugin\views\field\Link; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php similarity index 85% rename from core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php index ecb92084080..2bb53f1a3df 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\RevisionLinkDelete. + * Definition of Drupal\node\Plugin\views\field\RevisionLinkDelete. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\RevisionLink; +use Drupal\node\Plugin\views\field\RevisionLink; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php similarity index 85% rename from core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php index bad0e2ec95a..11e66ffc54a 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\RevisionLinkRevert. + * Definition of Drupal\node\Plugin\views\field\RevisionLinkRevert. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\RevisionLink; +use Drupal\node\Plugin\views\field\RevisionLink; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/field/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php similarity index 90% rename from core/modules/views/lib/Views/node/Plugin/views/field/Type.php rename to core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php index 38f7f1aadc9..e444a2e5538 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/field/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\field\Type. + * Definition of Drupal\node\Plugin\views\field\Type. */ -namespace Views\node\Plugin\views\field; +namespace Drupal\node\Plugin\views\field; -use Views\node\Plugin\views\field\Node; +use Drupal\node\Plugin\views\field\Node; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php similarity index 91% rename from core/modules/views/lib/Views/node/Plugin/views/filter/Access.php rename to core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php index a532c50879f..af9c38a865c 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/filter/Access.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\filter\Access. + * Definition of Drupal\node\Plugin\views\filter\Access. */ -namespace Views\node\Plugin\views\filter; +namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php similarity index 96% rename from core/modules/views/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php rename to core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php index 7e9c61323c3..57cb781924e 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\filter\HistoryUserTimestamp. + * Definition of Drupal\node\Plugin\views\filter\HistoryUserTimestamp. */ -namespace Views\node\Plugin\views\filter; +namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php similarity index 87% rename from core/modules/views/lib/Views/node/Plugin/views/filter/Status.php rename to core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php index 3297ae6c7d3..49fdb974698 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/filter/Status.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugins\views\filter\Status. + * Definition of Drupal\node\Plugins\views\filter\Status. */ -namespace Views\node\Plugin\views\filter; +namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/filter/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php similarity index 86% rename from core/modules/views/lib/Views/node/Plugin/views/filter/Type.php rename to core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php index 19657fbdff3..87f70051d73 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/filter/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\filter\Type. + * Definition of Drupal\node\Plugin\views\filter\Type. */ -namespace Views\node\Plugin\views\filter; +namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php similarity index 83% rename from core/modules/views/lib/Views/node/Plugin/views/filter/UidRevision.php rename to core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php index c33818ecd92..f435e4dafa2 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/filter/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\node\Plugin\views\filter\UidRevision. + * Definition of Drupal\node\Plugin\views\filter\UidRevision. */ -namespace Views\node\Plugin\views\filter; +namespace Drupal\node\Plugin\views\filter; -use Views\user\Plugin\views\filter\Name; +use Drupal\user\Plugin\views\filter\Name; use Drupal\Core\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Views/node/Plugin/views/row/Rss.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php similarity index 98% rename from core/modules/views/lib/Views/node/Plugin/views/row/Rss.php rename to core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php index 0d5a8df31bf..8dddd32cf01 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/row/Rss.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\row\Rss. + * Definition of Drupal\node\Plugin\views\row\Rss. */ -namespace Views\node\Plugin\views\row; +namespace Drupal\node\Plugin\views\row; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/node/Plugin/views/row/View.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/View.php similarity index 82% rename from core/modules/views/lib/Views/node/Plugin/views/row/View.php rename to core/modules/node/lib/Drupal/node/Plugin/views/row/View.php index ef7cb17bdcb..327fa106498 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/row/View.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/View.php @@ -2,15 +2,15 @@ /** * @file - * Definition of Views\node\Plugin\views\row\View. + * Definition of Drupal\node\Plugin\views\row\View. */ -namespace Views\node\Plugin\views\row; +namespace Drupal\node\Plugin\views\row; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; -use Views\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\Entity; /** * Plugin which performs a node_view on the resulting object. @@ -32,7 +32,7 @@ use Views\system\Plugin\views\row\Entity; class View extends Entity { /** - * Overrides Views\system\Plugin\views\row\Entity::defineOptions(). + * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions(). */ protected function defineOptions() { $options = parent::defineOptions(); @@ -46,7 +46,7 @@ class View extends Entity { } /** - * Overrides Views\system\Plugin\views\row\Entity::buildOptionsForm(). + * Overrides Drupal\system\Plugin\views\row\Entity::buildOptionsForm(). */ public function buildOptionsForm(&$form, &$form_state) { parent::buildOptionsForm($form, $form_state); diff --git a/core/modules/views/lib/Views/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php similarity index 99% rename from core/modules/views/lib/Views/node/Plugin/views/wizard/Node.php rename to core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index 74da6acb377..af28e1a42cd 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\wizard\Node. + * Definition of Drupal\node\Plugin\views\wizard\Node. */ -namespace Views\node\Plugin\views\wizard; +namespace Drupal\node\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php similarity index 97% rename from core/modules/views/lib/Views/node/Plugin/views/wizard/NodeRevision.php rename to core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php index 8e3f3c38868..9c5073f43c2 100644 --- a/core/modules/views/lib/Views/node/Plugin/views/wizard/NodeRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\node\Plugin\views\wizard\NodeRevision. + * Definition of Drupal\node\Plugin\views\wizard\NodeRevision. */ -namespace Views\node\Plugin\views\wizard; +namespace Drupal\node\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/modules/node.views.inc b/core/modules/node/node.views.inc similarity index 100% rename from core/modules/views/modules/node.views.inc rename to core/modules/node/node.views.inc diff --git a/core/modules/views/lib/Views/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php similarity index 95% rename from core/modules/views/lib/Views/search/Plugin/views/argument/Search.php rename to core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php index 04091f66391..8409349caad 100644 --- a/core/modules/views/lib/Views/search/Plugin/views/argument/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\search\Plugin\views\argument\Search. + * Definition of Drupal\search\Plugin\views\argument\Search. */ -namespace Views\search\Plugin\views\argument; +namespace Drupal\search\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; use Drupal\Core\Annotation\Plugin; @@ -30,7 +30,7 @@ class Search extends ArgumentPluginBase { */ function query_parse_search_expression($input) { if (!isset($this->search_query)) { - $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('Views\search\ViewsSearchQuery'); + $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('Drupal\search\ViewsSearchQuery'); $this->search_query->searchExpression($input, $this->view->base_table); $this->search_query->publicParseSearchExpression(); } diff --git a/core/modules/views/lib/Views/search/Plugin/views/field/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php similarity index 96% rename from core/modules/views/lib/Views/search/Plugin/views/field/Score.php rename to core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php index d8bfaef319b..4db578b43f2 100644 --- a/core/modules/views/lib/Views/search/Plugin/views/field/Score.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\search\Plugin\views\field\Score. + * Definition of Drupal\search\Plugin\views\field\Score. */ -namespace Views\search\Plugin\views\field; +namespace Drupal\search\Plugin\views\field; use Drupal\views\Plugin\views\field\Numeric; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php similarity index 96% rename from core/modules/views/lib/Views/search/Plugin/views/filter/Search.php rename to core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php index a35e9423005..6fc2f8caf24 100644 --- a/core/modules/views/lib/Views/search/Plugin/views/filter/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\search\Plugin\views\filter\Search. + * Definition of Drupal\search\Plugin\views\filter\Search. */ -namespace Views\search\Plugin\views\filter; +namespace Drupal\search\Plugin\views\filter; use Drupal\search\SearchQuery; use Drupal\views\Plugin\views\filter\FilterPluginBase; @@ -31,7 +31,7 @@ class Search extends FilterPluginBase { * This value extends the query extender to be able to provide methods * which returns the protected values. * - * @var Views\search\ViewsSearchQuery + * @var Drupal\search\ViewsSearchQuery */ var $search_query = NULL; @@ -102,7 +102,7 @@ class Search extends FilterPluginBase { function query_parse_search_expression($input) { if (!isset($this->search_query)) { $this->parsed = TRUE; - $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('Views\search\ViewsSearchQuery'); + $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('Drupal\search\ViewsSearchQuery'); $this->search_query->searchExpression($input, $this->view->base_table); $this->search_query->publicParseSearchExpression(); } diff --git a/core/modules/views/lib/Views/search/Plugin/views/row/View.php b/core/modules/search/lib/Drupal/search/Plugin/views/row/View.php similarity index 91% rename from core/modules/views/lib/Views/search/Plugin/views/row/View.php rename to core/modules/search/lib/Drupal/search/Plugin/views/row/View.php index fe3f6839fdd..86eaecb964b 100644 --- a/core/modules/views/lib/Views/search/Plugin/views/row/View.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/row/View.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\search\Plugin\views\row\View. + * Definition of Drupal\search\Plugin\views\row\View. */ -namespace Views\search\Plugin\views\row; +namespace Drupal\search\Plugin\views\row; use Drupal\views\Plugin\views\row\RowPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/search/Plugin/views/sort/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php similarity index 92% rename from core/modules/views/lib/Views/search/Plugin/views/sort/Score.php rename to core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php index 152dec4ed3d..c8712817207 100644 --- a/core/modules/views/lib/Views/search/Plugin/views/sort/Score.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\search\Plugin\views\sort\Score. + * Definition of Drupal\search\Plugin\views\sort\Score. */ -namespace Views\search\Plugin\views\sort; +namespace Drupal\search\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/search/ViewsSearchQuery.php b/core/modules/search/lib/Drupal/search/ViewsSearchQuery.php similarity index 91% rename from core/modules/views/lib/Views/search/ViewsSearchQuery.php rename to core/modules/search/lib/Drupal/search/ViewsSearchQuery.php index 5b3508c59b7..8f6b295d125 100644 --- a/core/modules/views/lib/Views/search/ViewsSearchQuery.php +++ b/core/modules/search/lib/Drupal/search/ViewsSearchQuery.php @@ -2,10 +2,12 @@ /** * @file - * Definition of Views\search\ViewsSearchQuery. + * Definition of Drupal\search\ViewsSearchQuery. */ -namespace Views\search; +namespace Drupal\search; + +use Drupal\Core\Database\Query\Condition; /** * Extends the core SearchQuery to be able to gets it's protected values. @@ -66,7 +68,7 @@ class ViewsSearchQuery extends SearchQuery { * The query condition in which the string is replaced. */ function condition_replace_string($search, $replace, &$condition) { - if ($condition['field'] instanceof DatabaseCondition) { + if ($condition['field'] instanceof Condition) { $conditions =& $condition['field']->conditions(); foreach ($conditions as $key => &$subcondition) { if (is_numeric($key)) { diff --git a/core/modules/views/lib/Views/system/Plugin/views/row/Entity.php b/core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php similarity index 97% rename from core/modules/views/lib/Views/system/Plugin/views/row/Entity.php rename to core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php index cec930f0a56..025a3f0da90 100644 --- a/core/modules/views/lib/Views/system/Plugin/views/row/Entity.php +++ b/core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\system\Plugin\views\row\Entity. + * Definition of Drupal\system\Plugin\views\row\Entity. */ -namespace Views\system\Plugin\views\row; +namespace Drupal\system\Plugin\views\row; use Drupal\views\Plugin\views\row\RowPluginBase; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php similarity index 93% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php index e58b94dab61..955f80ba3cc 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\IndexTid. + * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTid. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\ManyToOne; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php similarity index 97% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php index 54591257add..b5ab7131366 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\IndexTidDepth. + * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTidDepth. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php similarity index 92% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php index a10fed4215a..86608cb2059 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\IndexTidDepthModifier. + * Definition of Drupal\taxonomy\Plugin\views\argument\IndexTidDepthModifier. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php similarity index 85% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php index a8c84f387ab..33a93d324a9 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/Taxonomy.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\Taxonomy. + * Definition of Drupal\taxonomy\Plugin\views\argument\Taxonomy. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php similarity index 85% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php index 71e7227a06b..c36e406b295 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyMachineName.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\VocabularyMachineName. + * Definition of Drupal\taxonomy\Plugin\views\argument\VocabularyMachineName. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\String; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php similarity index 85% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php index 7613f06257a..f479f66a665 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument/VocabularyVid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument\VocabularyVid. + * Definition of Drupal\taxonomy\Plugin\views\argument\VocabularyVid. */ -namespace Views\taxonomy\Plugin\views\argument; +namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php similarity index 97% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php index 583a0303e33..e657ea6381c 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument_default/Tid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument_default\Tid. + * Definition of Drupal\taxonomy\Plugin\views\argument_default\Tid. */ -namespace Views\taxonomy\Plugin\views\argument_default; +namespace Drupal\taxonomy\Plugin\views\argument_default; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php similarity index 98% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php index a4e250cf162..955be616d79 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\argument_validator\Term. + * Definition of Drupal\taxonomy\Plugin\views\argument_validator\Term. */ -namespace Views\taxonomy\Plugin\views\argument_validator; +namespace Drupal\taxonomy\Plugin\views\argument_validator; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php similarity index 72% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/field/Language.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php index d5ec05f0958..7f2319aba5d 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/Language.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\field\Language. + * Definition of Drupal\taxonomy\Plugin\views\field\Language. */ -namespace Views\taxonomy\Plugin\views\field; +namespace Drupal\taxonomy\Plugin\views\field; use Drupal\Core\Annotation\Plugin; @@ -19,7 +19,7 @@ use Drupal\Core\Annotation\Plugin; class Language extends Taxonomy { /** - * Overrides Views\taxonomy\Plugin\views\field\Taxonomy::render(). + * Overrides Drupal\taxonomy\Plugin\views\field\Taxonomy::render(). */ public function render($values) { $value = $this->get_value($values); diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php similarity index 95% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php index 8a0854a9d55..fcdd258dd67 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\field\LinkEdit. + * Definition of Drupal\taxonomy\Plugin\views\field\LinkEdit. */ -namespace Views\taxonomy\Plugin\views\field; +namespace Drupal\taxonomy\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php similarity index 96% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php index 90e73ad62ab..ec56116756f 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\field\Taxonomy. + * Definition of Drupal\taxonomy\Plugin\views\field\Taxonomy. */ -namespace Views\taxonomy\Plugin\views\field; +namespace Drupal\taxonomy\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php similarity index 97% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php index 8da53dde52e..0b496988f95 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/field/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\field\TaxonomyIndexTid. + * Definition of Drupal\taxonomy\Plugin\views\field\TaxonomyIndexTid. */ -namespace Views\taxonomy\Plugin\views\field; +namespace Drupal\taxonomy\Plugin\views\field; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\PrerenderList; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php similarity index 99% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index f4300b08256..fa8f3de8dd4 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -5,7 +5,7 @@ * Definition of views_handler_filter_term_node_tid. */ -namespace Views\taxonomy\Plugin\views\filter; +namespace Drupal\taxonomy\Plugin\views\filter; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php similarity index 96% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php index 53100068be7..ba96a52aa57 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\filter\TaxonomyIndexTidDepth. + * Definition of Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTidDepth. */ -namespace Views\taxonomy\Plugin\views\filter; +namespace Drupal\taxonomy\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php similarity index 83% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php index 96ef9ba9aa7..8be71e6a426 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyMachineName.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\filter\VocabularyMachineName. + * Definition of Drupal\taxonomy\Plugin\views\filter\VocabularyMachineName. */ -namespace Views\taxonomy\Plugin\views\filter; +namespace Drupal\taxonomy\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php similarity index 83% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php index 22b1a0af2ab..126431991ce 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/filter/VocabularyVid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\filter\VocabularyVid. + * Definition of Drupal\taxonomy\Plugin\views\filter\VocabularyVid. */ -namespace Views\taxonomy\Plugin\views\filter; +namespace Drupal\taxonomy\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php similarity index 96% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php index c4feb13c98b..ab2021a11e1 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/relationship/NodeTermData.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\relationship\NodeTermData. + * Definition of Drupal\taxonomy\Plugin\views\relationship\NodeTermData. */ -namespace Views\taxonomy\Plugin\views\relationship; +namespace Drupal\taxonomy\Plugin\views\relationship; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\relationship\RelationshipPluginBase; diff --git a/core/modules/views/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php similarity index 94% rename from core/modules/views/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php rename to core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php index 465ba46a7eb..984f5332a63 100644 --- a/core/modules/views/lib/Views/taxonomy/Plugin/views/wizard/TaxonomyTerm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\taxonomy\Plugin\views\wizard\TaxonomyTerm. + * Definition of Drupal\taxonomy\Plugin\views\wizard\TaxonomyTerm. */ -namespace Views\taxonomy\Plugin\views\wizard; +namespace Drupal\taxonomy\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/modules/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc similarity index 100% rename from core/modules/views/modules/taxonomy.views.inc rename to core/modules/taxonomy/taxonomy.views.inc diff --git a/core/modules/views/lib/Views/user/Plugin/views/access/Permission.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php similarity index 95% rename from core/modules/views/lib/Views/user/Plugin/views/access/Permission.php rename to core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php index 92819e6b7cf..571a2553354 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/access/Permission.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\access\Permission. + * Definition of Drupal\user\Plugin\views\access\Permission. */ -namespace Views\user\Plugin\views\access; +namespace Drupal\user\Plugin\views\access; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\access\AccessPluginBase; diff --git a/core/modules/views/lib/Views/user/Plugin/views/access/Role.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php similarity index 95% rename from core/modules/views/lib/Views/user/Plugin/views/access/Role.php rename to core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php index 985a9ddc6b6..2a07d792037 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/access/Role.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\access\Role. + * Definition of Drupal\user\Plugin\views\access\Role. */ -namespace Views\user\Plugin\views\access; +namespace Drupal\user\Plugin\views\access; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\access\AccessPluginBase; diff --git a/core/modules/views/lib/Views/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php similarity index 93% rename from core/modules/views/lib/Views/user/Plugin/views/argument/RolesRid.php rename to core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php index 80c7c67408c..634307e0d1e 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/argument/RolesRid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php @@ -5,7 +5,7 @@ * Definition of views_handler_argument_users_roles_rid. */ -namespace Views\user\Plugin\views\argument; +namespace Drupal\user\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\ManyToOne; diff --git a/core/modules/views/lib/Views/user/Plugin/views/argument/Uid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php similarity index 87% rename from core/modules/views/lib/Views/user/Plugin/views/argument/Uid.php rename to core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php index 655bc9363e1..02341c1400a 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/argument/Uid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\argument\Uid. + * Definition of Drupal\user\Plugin\views\argument\Uid. */ -namespace Views\user\Plugin\views\argument; +namespace Drupal\user\Plugin\views\argument; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; diff --git a/core/modules/views/lib/Views/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php similarity index 82% rename from core/modules/views/lib/Views/user/Plugin/views/argument_default/CurrentUser.php rename to core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php index 90e4b1a4a03..8ba91b54bb2 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/argument_default/CurrentUser.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\argument_default\CurrentUser. + * Definition of Drupal\user\Plugin\views\argument_default\CurrentUser. */ -namespace Views\user\Plugin\views\argument_default; +namespace Drupal\user\Plugin\views\argument_default; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/user/Plugin/views/argument_default/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php similarity index 94% rename from core/modules/views/lib/Views/user/Plugin/views/argument_default/User.php rename to core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php index c12d6537677..70daaa7290b 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/argument_default/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\argument_default\User. + * Definition of Drupal\user\Plugin\views\argument_default\User. */ -namespace Views\user\Plugin\views\argument_default; +namespace Drupal\user\Plugin\views\argument_default; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php similarity index 97% rename from core/modules/views/lib/Views/user/Plugin/views/argument_validator/User.php rename to core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php index 3ef3ed62d3a..a31b0af7586 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/argument_validator/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\argument_validator\User. + * Definition of Drupal\user\Plugin\views\argument_validator\User. */ -namespace Views\user\Plugin\views\argument_validator; +namespace Drupal\user\Plugin\views\argument_validator; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Language.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php similarity index 90% rename from core/modules/views/lib/Views/user/Plugin/views/field/Language.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php index 0a4c160f363..3fb9b23788d 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Language.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Language. + * Definition of Drupal\user\Plugin\views\field\Language. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Link.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php similarity index 94% rename from core/modules/views/lib/Views/user/Plugin/views/field/Link.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php index 8166515ef2d..c7f0561aac9 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Link.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Link. + * Definition of Drupal\user\Plugin\views\field\Link. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php similarity index 89% rename from core/modules/views/lib/Views/user/Plugin/views/field/LinkCancel.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php index fb6cc4c5c15..d1ce197ad34 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/LinkCancel.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\LinkCancel. + * Definition of Drupal\user\Plugin\views\field\LinkCancel. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php similarity index 88% rename from core/modules/views/lib/Views/user/Plugin/views/field/LinkEdit.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php index f9b91f6e802..4d85c7f8479 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/LinkEdit.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\LinkEdit. + * Definition of Drupal\user\Plugin\views\field\LinkEdit. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Mail.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php similarity index 92% rename from core/modules/views/lib/Views/user/Plugin/views/field/Mail.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php index 64ad0f01c76..713d42a8f74 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Mail.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Mail. + * Definition of Drupal\user\Plugin\views\field\Mail. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php similarity index 95% rename from core/modules/views/lib/Views/user/Plugin/views/field/Name.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php index 8ce583d0111..5b7a101a3f1 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Name. + * Definition of Drupal\user\Plugin\views\field\Name. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; -use Views\user\Plugin\views\field\User; +use Drupal\user\Plugin\views\field\User; use Drupal\Core\Annotation\Plugin; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php similarity index 95% rename from core/modules/views/lib/Views/user/Plugin/views/field/Permissions.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php index 382162f7130..98cb02149ab 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Permissions. + * Definition of Drupal\user\Plugin\views\field\Permissions. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Picture.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php similarity index 97% rename from core/modules/views/lib/Views/user/Plugin/views/field/Picture.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php index 2774cfb9a98..8446facae6b 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Picture.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Picture. + * Definition of Drupal\user\Plugin\views\field\Picture. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php similarity index 95% rename from core/modules/views/lib/Views/user/Plugin/views/field/Roles.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php index f80988e3dd8..947175aca3b 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\Roles. + * Definition of Drupal\user\Plugin\views\field\Roles. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\Core\Annotation\Plugin; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php similarity index 94% rename from core/modules/views/lib/Views/user/Plugin/views/field/User.php rename to core/modules/user/lib/Drupal/user/Plugin/views/field/User.php index 1fee9d2fd60..b958d3e9312 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/field/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\field\User. + * Definition of Drupal\user\Plugin\views\field\User. */ -namespace Views\user\Plugin\views\field; +namespace Drupal\user\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/filter/Current.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php similarity index 96% rename from core/modules/views/lib/Views/user/Plugin/views/filter/Current.php rename to core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php index 874e871a853..b24e658b481 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/filter/Current.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php @@ -5,7 +5,7 @@ * Definition of views_handler_filter_user_current. */ -namespace Views\user\Plugin\views\filter; +namespace Drupal\user\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Views/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php similarity index 97% rename from core/modules/views/lib/Views/user/Plugin/views/filter/Name.php rename to core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php index 857a1df7242..b12eb0780d2 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/filter/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\filter\Name. + * Definition of Drupal\user\Plugin\views\filter\Name. */ -namespace Views\user\Plugin\views\filter; +namespace Drupal\user\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/lib/Views/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php similarity index 91% rename from core/modules/views/lib/Views/user/Plugin/views/filter/Permissions.php rename to core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php index a53835cf6d6..7f26db94037 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/filter/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\filter\Permissions. + * Definition of Drupal\user\Plugin\views\filter\Permissions. */ -namespace Views\user\Plugin\views\filter; +namespace Drupal\user\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; diff --git a/core/modules/views/lib/Views/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php similarity index 88% rename from core/modules/views/lib/Views/user/Plugin/views/filter/Roles.php rename to core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php index 8b17873945a..8ee3569dbd6 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/filter/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\filter\Roles. + * Definition of Drupal\user\Plugin\views\filter\Roles. */ -namespace Views\user\Plugin\views\filter; +namespace Drupal\user\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; diff --git a/core/modules/views/lib/Views/user/Plugin/views/row/View.php b/core/modules/user/lib/Drupal/user/Plugin/views/row/View.php similarity index 74% rename from core/modules/views/lib/Views/user/Plugin/views/row/View.php rename to core/modules/user/lib/Drupal/user/Plugin/views/row/View.php index 17375b9ab72..44bd31701ff 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/row/View.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/row/View.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Views\user\Plugin\views\row\View + * Definition of Drupal\user\Plugin\views\row\View */ -namespace Views\user\Plugin\views\row; +namespace Drupal\user\Plugin\views\row; -use Views\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\Entity; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; @@ -29,7 +29,7 @@ use Drupal\Core\Annotation\Translation; class View extends Entity { /** - * Overrides Views\system\Plugin\views\row\Entity::defineOptions(). + * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions(). */ protected function defineOptions() { $options = parent::defineOptions(); diff --git a/core/modules/views/lib/Views/user/Plugin/views/wizard/Users.php b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php similarity index 96% rename from core/modules/views/lib/Views/user/Plugin/views/wizard/Users.php rename to core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php index 2597f5bf0e5..9a334c16c57 100644 --- a/core/modules/views/lib/Views/user/Plugin/views/wizard/Users.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Views\user\Plugin\views\wizard\Users. + * Definition of Drupal\user\Plugin\views\wizard\Users. */ -namespace Views\user\Plugin\views\wizard; +namespace Drupal\user\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; use Drupal\Core\Annotation\Plugin; diff --git a/core/modules/views/modules/user.views.inc b/core/modules/user/user.views.inc similarity index 100% rename from core/modules/views/modules/user.views.inc rename to core/modules/user/user.views.inc diff --git a/core/modules/views/includes/cache.inc b/core/modules/views/includes/cache.inc index 95d23222f4a..135787ffb51 100644 --- a/core/modules/views/includes/cache.inc +++ b/core/modules/views/includes/cache.inc @@ -71,7 +71,6 @@ function _views_fetch_data($table = NULL, $reset = FALSE) { * The views_data of all tables. */ function _views_fetch_data_build() { - views_include_handlers(); $cache = module_invoke_all('views_data'); foreach (module_implements('views_data_alter') as $module) { $function = $module . '_views_data_alter'; diff --git a/core/modules/views/lib/Drupal/views/Plugin/Type/JoinManager.php b/core/modules/views/lib/Drupal/views/Plugin/Type/JoinManager.php index b8608e8faf7..eac395b8026 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Type/JoinManager.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Type/JoinManager.php @@ -15,37 +15,14 @@ use Drupal\Core\Plugin\Discovery\CacheDecorator; class JoinManager extends PluginManagerBase { - /** - * A list of Drupal core modules. - * - * @var array - */ - protected $coreModules = array(); - /** * Constructs a JoinManager object. */ public function __construct() { - // @todo Remove this hack in http://drupal.org/node/1708404. - views_init(); - $this->discovery = new CacheDecorator(new AlterDecorator(new AnnotatedClassDiscovery('views', 'join'), 'views_plugins_join'), 'views:join', 'views_info'); $this->factory = new DefaultFactory($this); - - $this->coreModules = views_core_modules(); - } - - /** - * Overrides Drupal\Component\Plugin\PluginManagerBase::processDefinition(). - */ - public function processDefinition(&$definition, $plugin_id) { - parent::processDefinition($definition, $plugin_id); - - $module = isset($definition['module']) ? $definition['module'] : 'views'; - $module_dir = in_array($module, $this->coreModules) ? 'views' : $module; - - $definition += array( - 'module' => $module_dir, + $this->defaults = array( + 'module' => 'views', ); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php b/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php index 19df7a849bf..f5f6f6e6b54 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Type/PluginManager.php @@ -15,26 +15,16 @@ use Drupal\Core\Plugin\Discovery\CacheDecorator; class PluginManager extends PluginManagerBase { - /** - * A list of Drupal core modules. - * - * @var array - */ - protected $coreModules = array(); - /** * Constructs a PluginManager object. */ public function __construct($type) { - // @todo Remove this hack in http://drupal.org/node/1708404. - views_init(); - $this->discovery = new CacheDecorator(new AlterDecorator(new AnnotatedClassDiscovery('views', $type), 'views_plugins_' . $type), 'views:' . $type, 'views_info'); $this->factory = new DefaultFactory($this); - $this->coreModules = views_core_modules(); $this->defaults += array( 'parent' => 'parent', 'plugin_type' => $type, + 'module' => 'views', ); } @@ -44,25 +34,13 @@ class PluginManager extends PluginManagerBase { public function processDefinition(&$definition, $plugin_id) { parent::processDefinition($definition, $plugin_id); - $module = isset($definition['module']) ? $definition['module'] : 'views'; - // If this module is a core module, use views as the module directory. - $module_dir = in_array($module, $this->coreModules) ? 'views' : $module; - $theme_path = drupal_get_path('module', $module_dir); - // Setup automatic path/file finding for theme registration. - if ($module_dir == 'views') { - $theme_path .= '/theme'; - $theme_file = 'theme.inc'; + if ($definition['module'] == 'views' || isset($definition['theme'])) { + $definition += array( + 'theme path' => drupal_get_path('module', 'views') . '/theme', + 'theme file' => 'theme.inc', + ); } - else { - $theme_file = "$module.views.inc"; - } - - $definition += array( - 'module' => $module_dir, - 'theme path' => $theme_path, - 'theme file' => $theme_file, - ); } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/Type/WizardManager.php b/core/modules/views/lib/Drupal/views/Plugin/Type/WizardManager.php index 1586e130fc5..96b544f9906 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Type/WizardManager.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Type/WizardManager.php @@ -15,37 +15,14 @@ use Drupal\Core\Plugin\Discovery\CacheDecorator; class WizardManager extends PluginManagerBase { - /** - * A list of Drupal core modules. - * - * @var array - */ - protected $coreModules = array(); - /** * Constructs a WizardManager object. */ public function __construct() { - // @todo Remove this hack in http://drupal.org/node/1708404. - views_init(); - $this->discovery = new CacheDecorator(new AlterDecorator(new AnnotatedClassDiscovery('views', 'wizard'), 'views_plugins_wizard'), 'views:wizard', 'views_info'); $this->factory = new DefaultFactory($this); - - $this->coreModules = views_core_modules(); - } - - /** - * Overrides Drupal\Component\Plugin\PluginManagerBase::processDefinition(). - */ - public function processDefinition(&$definition, $plugin_id) { - parent::processDefinition($definition, $plugin_id); - - $module = isset($definition['module']) ? $definition['module'] : 'views'; - $module_dir = in_array($module, $this->coreModules) ? 'views' : $module; - - $definition += array( - 'module' => $module_dir, + $this->defaults = array( + 'module' => 'views', ); } diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php b/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php index 1a64d99fdb1..05f3862dd81 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Comment/WizardTest.php @@ -12,7 +12,7 @@ use Drupal\views\Tests\Wizard\WizardTestBase; /** * Tests the comment module integration into the wizard. * - * @see Views\comment\Plugin\views\wizard\Comment + * @see Drupal\comment\Plugin\views\wizard\Comment */ class WizardTest extends WizardTestBase { diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php deleted file mode 100644 index 73490af97e6..00000000000 --- a/core/modules/views/lib/Drupal/views/Tests/Language/ArgumentLanguage.php +++ /dev/null @@ -1,47 +0,0 @@ - 'Argument: Language', - 'description' => 'Tests the argument language handler.', - 'group' => 'Views Handlers' - ); - } - - public function testFilter() { - foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) { - $view = $this->getView(); - $view->displayHandlers['default']->overrideOption('arguments', array( - 'langcode' => array( - 'id' => 'langcode', - 'table' => 'views_test_data', - 'field' => 'langcode', - ), - )); - $this->executeView($view, array($langcode)); - - $expected = array(array( - 'name' => $name, - )); - $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name')); - $view->destroy(); - } - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php deleted file mode 100644 index 0d282c608a2..00000000000 --- a/core/modules/views/lib/Drupal/views/Tests/Language/FieldLanguage.php +++ /dev/null @@ -1,42 +0,0 @@ - 'Field: Language', - 'description' => 'Tests the field language handler.', - 'group' => 'Views Handlers', - ); - } - - public function testField() { - $view = $this->getView(); - $view->displayHandlers['default']->overrideOption('fields', array( - 'langcode' => array( - 'id' => 'langcode', - 'table' => 'views_test_data', - 'field' => 'langcode', - ), - )); - $this->executeView($view); - - $this->assertEqual($view->field['langcode']->advanced_render($view->result[0]), 'English'); - $this->assertEqual($view->field['langcode']->advanced_render($view->result[1]), 'Lolspeak'); - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php b/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php deleted file mode 100644 index 5d7b5487d21..00000000000 --- a/core/modules/views/lib/Drupal/views/Tests/Language/FilterLanguage.php +++ /dev/null @@ -1,48 +0,0 @@ - 'Filter: Language', - 'description' => 'Tests the filter language handler.', - 'group' => 'Views Handlers' - ); - } - - public function testFilter() { - foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) { - $view = $this->getView(); - $view->displayHandlers['default']->overrideOption('filters', array( - 'langcode' => array( - 'id' => 'langcode', - 'table' => 'views_test_data', - 'field' => 'langcode', - 'value' => array($langcode), - ), - )); - $this->executeView($view); - - $expected = array(array( - 'name' => $name, - )); - $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name')); - $view->destroy(); - } - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php b/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php deleted file mode 100644 index 5cd0bfdfd61..00000000000 --- a/core/modules/views/lib/Drupal/views/Tests/Language/LanguageTestBase.php +++ /dev/null @@ -1,78 +0,0 @@ -enableViewsTestModule(); - - // Create another language beside english. - $language = new Language(array('langcode' => 'xx-lolspeak', 'name' => 'Lolspeak')); - language_save($language); - } - - - protected function schemaDefinition() { - $schema = parent::schemaDefinition(); - $schema['views_test_data']['fields']['langcode'] = array( - 'description' => 'The {language}.langcode of this beatle.', - 'type' => 'varchar', - 'length' => 12, - 'default' => '', - ); - - return $schema; - } - - protected function viewsData() { - $data = parent::viewsData(); - $data['views_test_data']['langcode'] = array( - 'title' => t('Langcode'), - 'help' => t('Langcode'), - 'field' => array( - 'id' => 'language', - ), - 'argument' => array( - 'id' => 'language', - ), - 'filter' => array( - 'id' => 'language', - ), - ); - - return $data; - } - - protected function dataSet() { - $data = parent::dataSet(); - $data[0]['langcode'] = 'en'; - $data[1]['langcode'] = 'xx-lolspeak'; - $data[2]['langcode'] = ''; - $data[3]['langcode'] = ''; - $data[4]['langcode'] = ''; - - return $data; - } - -} diff --git a/core/modules/views/lib/Drupal/views/Tests/Node/FieldTypeTest.php b/core/modules/views/lib/Drupal/views/Tests/Node/FieldTypeTest.php index 301e4be1b95..3c52c22a959 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Node/FieldTypeTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Node/FieldTypeTest.php @@ -8,14 +8,14 @@ namespace Drupal\views\Tests\Node; /** - * Tests the Views\node\Plugin\views\field\Type handler. + * Tests the Drupal\node\Plugin\views\field\Type handler. */ class FieldTypeTest extends NodeTestBase { public static function getInfo() { return array( 'name' => 'Node: Node Type field', - 'description' => 'Tests the Views\node\Plugin\views\field\Type handler.', + 'description' => 'Tests the Drupal\node\Plugin\views\field\Type handler.', 'group' => 'Views Modules', ); } diff --git a/core/modules/views/lib/Drupal/views/Tests/User/AccessPermissionTest.php b/core/modules/views/lib/Drupal/views/Tests/User/AccessPermissionTest.php index 07c9b41285f..302979bb550 100644 --- a/core/modules/views/lib/Drupal/views/Tests/User/AccessPermissionTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/User/AccessPermissionTest.php @@ -1,16 +1,18 @@ createViewFromConfig('test_access_perm'); $access_plugin = $view->display_handler->getPlugin('access'); - $this->assertTrue($access_plugin instanceof \Views\user\Plugin\views\access\Permission, 'Make sure the right class got instantiated.'); + $this->assertTrue($access_plugin instanceof Permission, 'Make sure the right class got instantiated.'); $this->assertTrue($view->display_handler->access($this->adminUser), t('Admin-Account should be able to access the view everytime')); $this->assertFalse($view->display_handler->access($this->webUser)); diff --git a/core/modules/views/lib/Drupal/views/Tests/User/AccessRoleTest.php b/core/modules/views/lib/Drupal/views/Tests/User/AccessRoleTest.php index 610913a3257..16bcf6dc995 100644 --- a/core/modules/views/lib/Drupal/views/Tests/User/AccessRoleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/User/AccessRoleTest.php @@ -1,16 +1,18 @@ display_handler->getPlugin('access'); - $this->assertTrue($access_plugin instanceof \Views\user\Plugin\views\access\Role, 'Make sure the right class got instantiated.'); + $this->assertTrue($access_plugin instanceof Role, 'Make sure the right class got instantiated.'); $this->assertTrue($view->display_handler->access($this->adminUser), t('Admin-Account should be able to access the view everytime')); diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php index 408d9392311..0da4c1fc93d 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php @@ -31,15 +31,9 @@ abstract class ViewTestBase extends WebTestBase { protected function setUp() { parent::setUp(); - // @todo Remove this hack or move it to child classes. - views_init(); - views_get_all_views(TRUE); - menu_router_rebuild(); - $this->view = $this->getBasicView(); } - /** * Sets up the views_test_data.module. * diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php b/core/modules/views/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php deleted file mode 100644 index 2be3fdd438e..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php +++ /dev/null @@ -1,41 +0,0 @@ -addField('c', 'title'); - $query->condition('c.cid', $this->value); - $result = $query->execute(); - foreach ($result as $term) { - $titles[] = check_plain($term->title); - } - return $titles; - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Fid.php b/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Fid.php deleted file mode 100644 index 2561098e6df..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Fid.php +++ /dev/null @@ -1,42 +0,0 @@ - $this->value)); - $query = db_select('aggregator_feed', 'f'); - $query->addField('f', 'title'); - $query->condition('f.fid', $this->value); - $result = $query->execute(); - foreach ($result as $term) { - $titles[] = check_plain($term->title); - } - return $titles; - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Iid.php b/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Iid.php deleted file mode 100644 index c97b6c412d2..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/argument/Iid.php +++ /dev/null @@ -1,42 +0,0 @@ -value), '%d')); - - $result = db_select('aggregator_item') - ->condition('iid', $this->value, 'IN') - ->fields(array('title')) - ->execute(); - foreach ($result as $term) { - $titles[] = check_plain($term->title); - } - return $titles; - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/field/Category.php b/core/modules/views/lib/Views/aggregator/Plugin/views/field/Category.php deleted file mode 100644 index 42632137289..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/field/Category.php +++ /dev/null @@ -1,74 +0,0 @@ -additional_fields['cid'] = 'cid'; - } - - protected function defineOptions() { - $options = parent::defineOptions(); - $options['link_to_category'] = array('default' => FALSE, 'bool' => TRUE); - return $options; - } - - /** - * Provide link to category option - */ - public function buildOptionsForm(&$form, &$form_state) { - $form['link_to_category'] = array( - '#title' => t('Link this field to its aggregator category page'), - '#description' => t('This will override any other link you have set.'), - '#type' => 'checkbox', - '#default_value' => !empty($this->options['link_to_category']), - ); - parent::buildOptionsForm($form, $form_state); - } - - /** - * Render whatever the data is as a link to the category. - * - * Data should be made XSS safe prior to calling this function. - */ - function render_link($data, $values) { - $cid = $this->get_value($values, 'cid'); - if (!empty($this->options['link_to_category']) && !empty($cid) && $data !== NULL && $data !== '') { - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = "aggregator/category/$cid"; - } - return $data; - } - - function render($values) { - $value = $this->get_value($values); - return $this->render_link($this->sanitizeValue($value), $values); - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/field/TitleLink.php b/core/modules/views/lib/Views/aggregator/Plugin/views/field/TitleLink.php deleted file mode 100644 index 5f3616d0987..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/field/TitleLink.php +++ /dev/null @@ -1,72 +0,0 @@ -additional_fields['link'] = 'link'; - } - - protected function defineOptions() { - $options = parent::defineOptions(); - - $options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE); - - return $options; - } - - /** - * Provide link to the page being visited. - */ - public function buildOptionsForm(&$form, &$form_state) { - $form['display_as_link'] = array( - '#title' => t('Display as link'), - '#type' => 'checkbox', - '#default_value' => !empty($this->options['display_as_link']), - ); - parent::buildOptionsForm($form, $form_state); - } - - function render($values) { - $value = $this->get_value($values); - return $this->render_link($this->sanitizeValue($value), $values); - } - - function render_link($data, $values) { - $link = $this->get_value($values, 'link'); - if (!empty($this->options['display_as_link'])) { - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = $link; - $this->options['alter']['html'] = TRUE; - } - - return $data; - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/field/Xss.php b/core/modules/views/lib/Views/aggregator/Plugin/views/field/Xss.php deleted file mode 100644 index 4cea7aaf19e..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/field/Xss.php +++ /dev/null @@ -1,30 +0,0 @@ -get_value($values); - return aggregator_filter_xss($value); - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php b/core/modules/views/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php deleted file mode 100644 index c676ba48587..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php +++ /dev/null @@ -1,39 +0,0 @@ -value_options)) { - return; - } - - $this->value_options = array(); - // Uses db_query() rather than db_select() because the query is static and - // does not include any variables. - $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title'); - foreach ($result as $category) { - $this->value_options[$category->cid] = $category->title; - } - } - -} diff --git a/core/modules/views/lib/Views/aggregator/Plugin/views/row/Rss.php b/core/modules/views/lib/Views/aggregator/Plugin/views/row/Rss.php deleted file mode 100644 index 4a5b6590faf..00000000000 --- a/core/modules/views/lib/Views/aggregator/Plugin/views/row/Rss.php +++ /dev/null @@ -1,92 +0,0 @@ - 'default'); - - return $options; - } - - public function buildOptionsForm(&$form, &$form_state) { - $form['item_length'] = array( - '#type' => 'select', - '#title' => t('Display type'), - '#options' => array( - 'fulltext' => t('Full text'), - 'teaser' => t('Title plus teaser'), - 'title' => t('Title only'), - 'default' => t('Use default RSS settings'), - ), - '#default_value' => $this->options['item_length'], - ); - } - - function render($row) { - $iid = $row->{$this->field_alias}; - $query = db_select('aggregator_item', 'ai'); - $query->leftJoin('aggregator_feed', 'af', 'ai.fid = af.fid'); - $query->fields('ai'); - $query->addExpression('af.title', 'feed_title'); - $query->addExpression('ai.link', 'feed_LINK'); - $query->condition('iid', $iid); - $result = $query->execute(); - - $item->elements = array( - array( - 'key' => 'pubDate', - 'value' => gmdate('r', $item->timestamp), - ), - array( - 'key' => 'dc:creator', - 'value' => $item->author, - ), - array( - 'key' => 'guid', - 'value' => $item->guid, - 'attributes' => array('isPermaLink' => 'false') - ), - ); - - foreach ($item->elements as $element) { - if (isset($element['namespace'])) { - $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $element['namespace']); - } - } - - return theme($this->themeFunctions(), array( - 'view' => $this->view, - 'options' => $this->options, - 'row' => $item - )); - } - -} diff --git a/core/modules/views/lib/Views/book/Plugin/views/argument_default/Root.php b/core/modules/views/lib/Views/book/Plugin/views/argument_default/Root.php deleted file mode 100644 index 9fa8e4fea41..00000000000 --- a/core/modules/views/lib/Views/book/Plugin/views/argument_default/Root.php +++ /dev/null @@ -1,36 +0,0 @@ -book['bid'])) { - return $node->book['bid']; - } - } - } - -} diff --git a/core/modules/views/lib/Views/contact/Plugin/views/field/ContactLink.php b/core/modules/views/lib/Views/contact/Plugin/views/field/ContactLink.php deleted file mode 100644 index 39b5c717e9e..00000000000 --- a/core/modules/views/lib/Views/contact/Plugin/views/field/ContactLink.php +++ /dev/null @@ -1,68 +0,0 @@ -options['text']) ? t('contact') : $this->options['text']; - parent::buildOptionsForm($form, $form_state); - } - - // An example of field level access control. - // We must override the access method in the parent class, as that requires - // the 'access user profiles' permission, which the contact form does not. - public function access() { - return user_access('access user contact forms'); - } - - function render_link($data, $values) { - global $user; - $uid = $this->get_value($values, 'uid'); - - if (empty($uid)) { - return; - } - - $account = user_load($uid); - if (empty($account)) { - return; - } - - // Check access when we pull up the user account so we know - // if the user has made the contact page available. - $menu_item = menu_get_item("user/$uid/contact"); - if (!$menu_item['access'] || empty($account->data['contact'])) { - return; - } - - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = 'user/' . $account->uid . '/contact'; - $this->options['alter']['attributes'] = array('title' => t('Contact %user', array('%user' => $account->name))); - - $text = $this->options['text']; - - return $text; - } - -} diff --git a/core/modules/views/lib/Views/filter/Plugin/views/field/FormatName.php b/core/modules/views/lib/Views/filter/Plugin/views/field/FormatName.php deleted file mode 100644 index 81fd0bd2ed2..00000000000 --- a/core/modules/views/lib/Views/filter/Plugin/views/field/FormatName.php +++ /dev/null @@ -1,53 +0,0 @@ -additional_fields['name'] = array('table' => 'filter_formats', 'field' => 'name'); - } - - public function query() { - $this->ensureMyTable(); - $this->add_additional_fields(); - } - - function render($values) { - $format_name = $this->get_value($values, 'name'); - if (!$format_name) { - // Default or invalid input format. - // filter_formats() will reliably return the default format even if the - // current user is unprivileged. - $format = filter_formats(filter_default_format()); - return $this->sanitizeValue($format->name); - } - return $this->sanitizeValue($format_name); - } - -} diff --git a/core/modules/views/lib/Views/language/Plugin/views/argument/Language.php b/core/modules/views/lib/Views/language/Plugin/views/argument/Language.php deleted file mode 100644 index f53041d1019..00000000000 --- a/core/modules/views/lib/Views/language/Plugin/views/argument/Language.php +++ /dev/null @@ -1,46 +0,0 @@ -language($data->{$this->name_alias}); - } - - /** - * Override the behavior of title(). Get the user friendly version - * of the language. - */ - function title() { - return $this->language($this->argument); - } - - function language($langcode) { - $languages = views_language_list(); - return isset($languages[$langcode]) ? $languages[$langcode] : t('Unknown language'); - } - -} diff --git a/core/modules/views/lib/Views/language/Plugin/views/field/Language.php b/core/modules/views/lib/Views/language/Plugin/views/field/Language.php deleted file mode 100644 index 104ae3f34e2..00000000000 --- a/core/modules/views/lib/Views/language/Plugin/views/field/Language.php +++ /dev/null @@ -1,50 +0,0 @@ - FALSE, 'bool' => TRUE); - - return $options; - } - - public function buildOptionsForm(&$form, &$form_state) { - parent::buildOptionsForm($form, $form_state); - $form['native_language'] = array( - '#title' => t('Native language'), - '#type' => 'checkbox', - '#default_value' => $this->options['native_language'], - '#description' => t('If enabled, the native name of the language will be displayed'), - ); - } - - function render($values) { - // @todo: Drupal Core dropped native language until config translation is - // ready, see http://drupal.org/node/1616594. - $value = $this->get_value($values); - $language = language_load($value); - return $language ? $language->name : ''; - } - -} diff --git a/core/modules/views/lib/Views/language/Plugin/views/filter/Language.php b/core/modules/views/lib/Views/language/Plugin/views/filter/Language.php deleted file mode 100644 index 294690c9701..00000000000 --- a/core/modules/views/lib/Views/language/Plugin/views/filter/Language.php +++ /dev/null @@ -1,38 +0,0 @@ -value_options)) { - $this->value_title = t('Language'); - $languages = array( - '***CURRENT_LANGUAGE***' => t("Current user's language"), - '***DEFAULT_LANGUAGE***' => t("Default site language"), - LANGUAGE_NOT_SPECIFIED => t('No language') - ); - $languages = array_merge($languages, views_language_list()); - $this->value_options = $languages; - } - } - -} diff --git a/core/modules/views/lib/Views/locale/Plugin/views/field/LinkEdit.php b/core/modules/views/lib/Views/locale/Plugin/views/field/LinkEdit.php deleted file mode 100644 index 55f891fb2c8..00000000000 --- a/core/modules/views/lib/Views/locale/Plugin/views/field/LinkEdit.php +++ /dev/null @@ -1,77 +0,0 @@ -additional_fields['lid'] = 'lid'; - } - - protected function defineOptions() { - $options = parent::defineOptions(); - - $options['text'] = array('default' => '', 'translatable' => TRUE); - - return $options; - } - - public function buildOptionsForm(&$form, &$form_state) { - $form['text'] = array( - '#type' => 'textfield', - '#title' => t('Text to display'), - '#default_value' => $this->options['text'], - ); - parent::buildOptionsForm($form, $form_state); - } - - public function query() { - $this->ensureMyTable(); - $this->add_additional_fields(); - } - - public function access() { - // Ensure user has access to edit translations. - return user_access('translate interface'); - } - - function render($values) { - $value = $this->get_value($values, 'lid'); - return $this->render_link($this->sanitizeValue($value), $values); - } - - function render_link($data, $values) { - $text = !empty($this->options['text']) ? $this->options['text'] : t('edit'); - - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = 'admin/build/translate/edit/' . $data; - $this->options['alter']['query'] = drupal_get_destination(); - - return $text; - } - -} diff --git a/core/modules/views/lib/Views/locale/Plugin/views/filter/Version.php b/core/modules/views/lib/Views/locale/Plugin/views/filter/Version.php deleted file mode 100644 index a450317ea59..00000000000 --- a/core/modules/views/lib/Views/locale/Plugin/views/filter/Version.php +++ /dev/null @@ -1,42 +0,0 @@ -value_options)) { - $this->value_title = t('Version'); - // Enable filtering by the current installed Drupal version. - $versions = array('***CURRENT_VERSION***' => t('Current installed version')); - // Uses db_query() rather than db_select() because the query is static and - // does not include any variables. - $result = db_query('SELECT DISTINCT(version) FROM {locales_source} ORDER BY version'); - foreach ($result as $row) { - if (!empty($row->version)) { - $versions[$row->version] = $row->version; - } - } - $this->value_options = $versions; - } - } - -} diff --git a/core/modules/views/lib/Views/statistics/Plugin/views/field/AccesslogPath.php b/core/modules/views/lib/Views/statistics/Plugin/views/field/AccesslogPath.php deleted file mode 100644 index 4b16e204cbb..00000000000 --- a/core/modules/views/lib/Views/statistics/Plugin/views/field/AccesslogPath.php +++ /dev/null @@ -1,71 +0,0 @@ -options['display_as_link'])) { - $this->additional_fields['path'] = 'path'; - } - } - - protected function defineOptions() { - $options = parent::defineOptions(); - - $options['display_as_link'] = array('default' => TRUE, 'bool' => TRUE); - - return $options; - } - - /** - * Provide link to the page being visited. - */ - public function buildOptionsForm(&$form, &$form_state) { - $form['display_as_link'] = array( - '#title' => t('Display as link'), - '#type' => 'checkbox', - '#default_value' => !empty($this->options['display_as_link']), - ); - parent::buildOptionsForm($form, $form_state); - } - - function render($values) { - $value = $this->get_value($values); - return $this->render_link($this->sanitizeValue($value), $values); - } - - function render_link($data, $values) { - if (!empty($this->options['display_as_link'])) { - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = $this->get_value($values, 'path'); - $this->options['alter']['html'] = TRUE; - } - - return $data; - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/argument/NodeTnid.php b/core/modules/views/lib/Views/translation/Plugin/views/argument/NodeTnid.php deleted file mode 100644 index 53d60fc85c4..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/argument/NodeTnid.php +++ /dev/null @@ -1,41 +0,0 @@ -addField('n', 'title'); - $query->condition('n.tnid', $this->value); - $result = $query->execute(); - foreach ($result as $term) { - $titles[] = check_plain($term->title); - } - return $titles; - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php b/core/modules/views/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php deleted file mode 100644 index b915c403ba4..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/field/NodeLinkTranslate.php +++ /dev/null @@ -1,41 +0,0 @@ -get_value($values); - $node->status = 1; // unpublished nodes ignore access control - if (empty($node->langcode) || !translation_supported_type($node->type) || !node_access('view', $node) || !user_access('translate content')) { - return; - } - - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = "node/$node->nid/translate"; - $this->options['alter']['query'] = drupal_get_destination(); - - $text = !empty($this->options['text']) ? $this->options['text'] : t('translate'); - return $text; - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php b/core/modules/views/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php deleted file mode 100644 index cb5252ba6d1..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/field/NodeTranslationLink.php +++ /dev/null @@ -1,66 +0,0 @@ -additional_fields['nid'] = 'nid'; - $this->additional_fields['tnid'] = 'tnid'; - $this->additional_fields['title'] = 'title'; - $this->additional_fields['langcode'] = 'langcode'; - } - - public function query() { - $this->ensureMyTable(); - $this->add_additional_fields(); - } - - function render($values) { - $value = $this->get_value($values, 'tnid'); - return $this->render_link($this->sanitizeValue($value), $values); - } - - function render_link($data, $values) { - $language_interface = language(LANGUAGE_TYPE_INTERFACE); - - $tnid = $this->get_value($values, 'tnid'); - // Only load translations if the node isn't in the current language. - if ($this->get_value($values, 'langcode') != $language_interface->langcode) { - $translations = translation_node_get_translations($tnid); - if (isset($translations[$language_interface->langcode])) { - $values->{$this->aliases['nid']} = $translations[$language_interface->langcode]->nid; - $values->{$this->aliases['title']} = $translations[$language_interface->langcode]->title; - } - } - - $this->options['alter']['make_link'] = TRUE; - $this->options['alter']['path'] = "node/" . $this->get_value($values, 'nid'); - return $this->get_value($values, 'title'); - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnid.php b/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnid.php deleted file mode 100644 index af11db0cf84..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnid.php +++ /dev/null @@ -1,58 +0,0 @@ - 'radios', - '#title' => t('Include untranslated content'), - '#default_value' => $this->operator, - '#options' => array( - 1 => t('Yes'), - 0 => t('No'), - ), - ); - } - - public function canExpose() { return FALSE; } - - public function query() { - $table = $this->ensureMyTable(); - // Select for source translations (tnid = nid). Conditionally, also accept either untranslated nodes (tnid = 0). - $this->query->add_where_expression($this->options['group'], "$table.tnid = $table.nid" . ($this->operator ? " OR $table.tnid = 0" : '')); - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php b/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php deleted file mode 100644 index f0560625734..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/filter/NodeTnidChild.php +++ /dev/null @@ -1,36 +0,0 @@ -ensureMyTable(); - $this->query->add_where_expression($this->options['group'], "$table.tnid <> $table.nid AND $table.tnid > 0"); - } - -} diff --git a/core/modules/views/lib/Views/translation/Plugin/views/relationship/Translation.php b/core/modules/views/lib/Views/translation/Plugin/views/relationship/Translation.php deleted file mode 100644 index b4821b3f966..00000000000 --- a/core/modules/views/lib/Views/translation/Plugin/views/relationship/Translation.php +++ /dev/null @@ -1,113 +0,0 @@ - 'current'); - - return $options; - } - - /** - * Add a translation selector. - */ - public function buildOptionsForm(&$form, &$form_state) { - parent::buildOptionsForm($form, $form_state); - - $options = array( - 'all' => t('All'), - 'current' => t('Current language'), - 'default' => t('Default language'), - ); - $options = array_merge($options, views_language_list()); - $form['language'] = array( - '#type' => 'select', - '#options' => $options, - '#default_value' => $this->options['language'], - '#title' => t('Translation option'), - '#description' => t('The translation options allows you to select which translation or translations in a translation set join on. Select "Current language" or "Default language" to join on the translation in the current or default language respectively. Select a specific language to join on a translation in that language. If you select "All", each translation will create a new row, which may appear to cause duplicates.'), - ); - } - - /** - * Called to implement a relationship in a query. - */ - public function query() { - // Figure out what base table this relationship brings to the party. - $table_data = views_fetch_data($this->definition['base']); - $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field']; - - $this->ensureMyTable(); - - $def = $this->definition; - $def['table'] = $this->definition['base']; - $def['field'] = $base_field; - $def['left_table'] = $this->tableAlias; - $def['left_field'] = $this->field; - $def['adjusted'] = TRUE; - if (!empty($this->options['required'])) { - $def['type'] = 'INNER'; - } - - $def['extra'] = array(); - if ($this->options['language'] != 'all') { - switch ($this->options['language']) { - case 'current': - $def['extra'][] = array( - 'field' => 'langcode', - 'value' => '***CURRENT_LANGUAGE***', - ); - break; - case 'default': - $def['extra'][] = array( - 'field' => 'langcode', - 'value' => '***DEFAULT_LANGUAGE***', - ); - break; - // Other values will be the language codes. - default: - $def['extra'][] = array( - 'field' => 'langcode', - 'value' => $this->options['language'], - ); - break; - } - } - - if (!empty($def['join_id'])) { - $id = $def['join_id']; - } - else { - $id = 'standard'; - } - $join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $def); - - // use a short alias for this: - $alias = $def['table'] . '_' . $this->table; - - $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship); - } - -} diff --git a/core/modules/views/modules/aggregator.views.inc b/core/modules/views/modules/aggregator.views.inc deleted file mode 100644 index a61025360b8..00000000000 --- a/core/modules/views/modules/aggregator.views.inc +++ /dev/null @@ -1,358 +0,0 @@ - 'iid', - 'title' => t('Aggregator item'), - 'help' => t("Aggregator items are imported from external RSS and Atom news feeds."), - ); - - // Fields - - // iid - $data['aggregator_item']['iid'] = array( - 'title' => t('Item ID'), - 'help' => t('The unique ID of the aggregator item.'), // The help that appears on the UI, - // Information for displaying the iid - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - // Information for accepting a iid as an argument - 'argument' => array( - 'id' => 'aggregator_iid', - 'name field' => 'title', // the field to display in the summary. - 'numeric' => TRUE, - ), - // Information for accepting a nid as a filter - 'filter' => array( - 'id' => 'numeric', - ), - // Information for sorting on a nid. - 'sort' => array( - 'id' => 'standard', - ), - ); - - // title - $data['aggregator_item']['title'] = array( - 'title' => t('Title'), // The item it appears as on the UI, - 'help' => t('The title of the aggregator item.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'aggregator_title_link', - 'extra' => array('link'), - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - ); - - // link - $data['aggregator_item']['link'] = array( - 'title' => t('Link'), // The item it appears as on the UI, - 'help' => t('The link to the original source URL of the item.'), - 'field' => array( - 'id' => 'url', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - ); - - // author - $data['aggregator_item']['author'] = array( - 'title' => t('Author'), // The item it appears as on the UI, - 'help' => t('The author of the original imported item.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'aggregator_xss', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - // guid - $data['aggregator_item']['guid'] = array( - 'title' => t('GUID'), // The item it appears as on the UI, - 'help' => t('The guid of the original imported item.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'xss', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - // feed body - $data['aggregator_item']['description'] = array( - 'title' => t('Body'), // The item it appears as on the UI, - 'help' => t('The actual content of the imported item.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'aggregator_xss', - 'click sortable' => FALSE, - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - ); - - // item timestamp - $data['aggregator_item']['timestamp'] = array( - 'title' => t('Timestamp'), // The item it appears as on the UI, - 'help' => t('The date the original feed item was posted. (With some feeds, this will be the date it was imported.)'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'date', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'date', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'date', - ), - 'argument' => array( - 'id' => 'date', - ), - ); - - // Aggregator feed table - - $data['aggregator_feed']['table']['group'] = t('Aggregator feed'); - - // Explain how this table joins to others. - $data['aggregator_feed']['table']['join'] = array( - 'aggregator_item' => array( - 'left_field' => 'fid', - 'field' => 'fid', - ), - ); - - // fid - $data['aggregator_feed']['fid'] = array( - 'title' => t('Feed ID'), - 'help' => t('The unique ID of the aggregator feed.'), // The help that appears on the UI, - // Information for displaying the fid - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - // Information for accepting a fid as an argument - 'argument' => array( - 'id' => 'aggregator_fid', - 'name field' => 'title', // the field to display in the summary. - 'numeric' => TRUE, - ), - // Information for accepting a nid as a filter - 'filter' => array( - 'id' => 'numeric', - ), - // Information for sorting on a fid. - 'sort' => array( - 'id' => 'standard', - ), - ); - - // title - $data['aggregator_feed']['title'] = array( - 'title' => t('Title'), // The item it appears as on the UI, - 'help' => t('The title of the aggregator feed.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'aggregator_title_link', - 'extra' => array('link'), - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'string', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - // link - $data['aggregator_feed']['link'] = array( - 'title' => t('Link'), // The item it appears as on the UI, - 'help' => t('The link to the source URL of the feed.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'url', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - // feed last updated - $data['aggregator_feed']['checked'] = array( - 'title' => t('Last checked'), // The item it appears as on the UI, - 'help' => t('The date the feed was last checked for new content.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'date', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'date', - ), - 'filter' => array( - 'id' => 'date', - ), - 'argument' => array( - 'id' => 'date', - ), - ); - - // feed description - $data['aggregator_feed']['description'] = array( - 'title' => t('Description'), // The item it appears as on the UI, - 'help' => t('The description of the aggregator feed.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'xss', - 'click sortable' => FALSE, - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - // feed last updated - $data['aggregator_feed']['modified'] = array( - 'title' => t('Last modified'), // The item it appears as on the UI, - 'help' => t('The date of the most recent new content on the feed.'), - // Information for displaying a title as a field - 'field' => array( - 'id' => 'date', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'date', - ), - // Information for accepting a title as a filter - 'filter' => array( - 'id' => 'date', - ), - 'argument' => array( - 'id' => 'date', - ), - ); - - // Aggregator category feed table - - $data['aggregator_category_feed']['table']['join'] = array( - 'aggregator_item' => array( - 'left_field' => 'fid', - 'field' => 'fid', - ), - ); - - // Aggregator category table - - $data['aggregator_category']['table']['group'] = t('Aggregator category'); - - $data['aggregator_category']['table']['join'] = array( - 'aggregator_item' => array( - 'left_table' => 'aggregator_category_feed', - 'left_field' => 'cid', - 'field' => 'cid', - ), - ); - - // cid - $data['aggregator_category']['cid'] = array( - 'title' => t('Category ID'), - 'help' => t('The unique ID of the aggregator category.'), - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'argument' => array( - 'id' => 'aggregator_category_cid', - 'name field' => 'title', - 'numeric' => TRUE, - ), - 'filter' => array( - 'id' => 'aggregator_category_cid', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // title - $data['aggregator_category']['title'] = array( - 'title' => t('Category'), - 'help' => t('The title of the aggregator category.'), - 'field' => array( - 'id' => 'aggregator_category', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/book.views.inc b/core/modules/views/modules/book.views.inc deleted file mode 100644 index 6e2b890a8e5..00000000000 --- a/core/modules/views/modules/book.views.inc +++ /dev/null @@ -1,113 +0,0 @@ - array( - 'left_field' => 'nid', - 'field' => 'nid', - ), - ); - - $data['book']['bid'] = array( - 'title' => t('Top level book'), - 'help' => t('The book the node is in.'), - 'relationship' => array( - 'base' => 'node', - 'id' => 'standard', - 'label' => t('Book'), - ), - // There is no argument here; if you need an argument, add the relationship - // and use the node: nid argument. - ); - - // menu_links table -- this is aliased so we can get just book relations - - // Book hierarchy and weight data are now in {menu_links}. - $data['book_menu_links']['table']['group'] = t('Book'); - $data['book_menu_links']['table']['join'] = array( - 'node' => array( - 'table' => 'menu_links', - 'left_table' => 'book', - 'left_field' => 'mlid', - 'field' => 'mlid', - ), - ); - - $data['book_menu_links']['weight'] = array( - 'title' => t('Weight'), - 'help' => t('The weight of the book page.'), - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - $data['book_menu_links']['depth'] = array( - 'title' => t('Depth'), - 'help' => t('The depth of the book page in the hierarchy; top level books have a depth of 1.'), - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'argument' => array( - 'id' => 'standard', - ), - ); - - $data['book_menu_links']['p'] = array( - 'title' => t('Hierarchy'), - 'help' => t('The order of pages in the book hierarchy.'), - 'sort' => array( - 'id' => 'menu_hierarchy', - ), - ); - - // book_parent table -- this is an alias of the book table which - // represents the parent book. - - // The {book} record for the parent node. - $data['book_parent']['table']['group'] = t('Book'); - $data['book_parent']['table']['join'] = array( - 'node' => array( - 'table' => 'book', - 'left_table' => 'book_menu_links', - 'left_field' => 'plid', - 'field' => 'mlid', - ), - ); - - $data['book_parent']['nid'] = array( - 'title' => t('Parent'), - 'help' => t('The parent book node.'), - 'relationship' => array( - 'base' => 'node', - 'base field' => 'nid', - 'id' => 'standard', - 'label' => t('Book parent'), - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/contact.views.inc b/core/modules/views/modules/contact.views.inc deleted file mode 100644 index 307ffbc176d..00000000000 --- a/core/modules/views/modules/contact.views.inc +++ /dev/null @@ -1,21 +0,0 @@ - array( - 'title' => t('Link to contact page'), - 'help' => t('Provide a simple link to the user contact page.'), - 'id' => 'contact_link', - ), - ); -} diff --git a/core/modules/views/modules/filter.views.inc b/core/modules/views/modules/filter.views.inc deleted file mode 100644 index 941ae3a78d3..00000000000 --- a/core/modules/views/modules/filter.views.inc +++ /dev/null @@ -1,31 +0,0 @@ - array( - 'left_field' => 'format', - 'field' => 'format', - ), - 'node' => array( - 'left_table' => 'node_revision', - 'left_field' => 'format', - 'field' => 'format', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/language.views.inc b/core/modules/views/modules/language.views.inc deleted file mode 100644 index 7521d52c6ff..00000000000 --- a/core/modules/views/modules/language.views.inc +++ /dev/null @@ -1,91 +0,0 @@ - 'langcode', - 'title' => t('Language'), - 'help' => t('A language used in drupal.'), - ); - - $data['language']['langcode'] = array( - 'title' => t('Language code'), - 'help' => t("Language code, e.g. 'de' or 'en-US'."), - 'field' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string' - ), - 'argument' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - $data['language']['name'] = array( - 'title' => t('Language name'), - 'help' => t("Language name, e.g. 'German' or 'English'."), - 'field' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string' - ), - 'argument' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - $data['language']['direction'] = array( - 'title' => t('Direction'), - 'help' => t('Direction of language (Left-to-Right = 0, Right-to-Left = 1).'), - 'field' => array( - 'id' => 'numeric', - ), - 'filter' => array( - 'id' => 'numeric' - ), - 'argument' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - $data['language']['weight'] = array( - 'title' => t('Weight'), - 'help' => t('Weight, used in lists of languages.'), - 'field' => array( - 'id' => 'numeric', - ), - 'filter' => array( - 'id' => 'numeric' - ), - 'argument' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/locale.views.inc b/core/modules/views/modules/locale.views.inc deleted file mode 100644 index 42bd31644f8..00000000000 --- a/core/modules/views/modules/locale.views.inc +++ /dev/null @@ -1,192 +0,0 @@ - 'lid', - 'title' => t('Locale source'), - 'help' => t('A source string for translation, in English or the default site language.'), - ); - - // lid - $data['locales_source']['lid'] = array( - 'title' => t('LID'), - 'help' => t('The ID of the source string.'), - 'field' => array( - 'id' => 'standard', - 'click sortable' => TRUE, - ), - 'argument' => array( - 'id' => 'numeric', - 'numeric' => TRUE, - 'validate type' => 'lid', - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // location - $data['locales_source']['location'] = array( - 'group' => t('Locale source'), - 'title' => t('Location'), - 'help' => t('A description of the location or context of the string.'), - 'field' => array( - 'id' => 'standard', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - // Source field - $data['locales_source']['source'] = array( - 'group' => t('Locale source'), - 'title' => t('Source'), - 'help' => t('The full original string.'), - 'field' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - // Source field - $data['locales_source']['context'] = array( - 'group' => t('Locale source'), - 'title' => t('Context'), - 'help' => t('The context this string applies to.'), - 'field' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - // Version field - $data['locales_source']['version'] = array( - 'group' => t('Locale source'), - 'title' => t('Version'), - 'help' => t('The version of Drupal core that this string is for.'), - 'field' => array( - 'id' => 'standard', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'locale_version', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - $data['locales_source']['edit_lid'] = array( - 'group' => t('Locale source'), - 'field' => array( - 'title' => t('Edit link'), - 'help' => t('Provide a simple link to edit the translations.'), - 'id' => 'locale_link_edit', - ), - ); - - // Locales target table - - // Define the base group of this table. Fields that don't - // have a group defined will go into this field by default. - $data['locales_target']['table']['group'] = t('Locale target'); - - // Join information - $data['locales_target']['table']['join'] = array( - 'locales_source' => array( - 'left_field' => 'lid', - 'field' => 'lid', - ), - ); - - // Translation field - $data['locales_target']['translation'] = array( - 'group' => t('Locale target'), - 'title' => t('Translation'), - 'help' => t('The full translation string.'), - 'field' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'string', - ), - ); - - // Language field - $data['locales_target']['language'] = array( - 'group' => t('Locale target'), - 'title' => t('Language'), - 'help' => t('The language this translation is in.'), - 'field' => array( - 'id' => 'locale_language', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'locale_language', - ), - 'argument' => array( - 'id' => 'locale_language', - ), - ); - - $data['locales_target']['plid'] = array( - 'group' => t('Locale target'), - 'title' => t('Singular LID'), - 'help' => t('The ID of the parent translation.'), - 'field' => array( - 'id' => 'standard', - ), - ); - - // Plural - $data['locales_target']['plural'] = array( - 'group' => t('Locale target'), - 'title' => t('Plural'), - 'help' => t('Whether or not the translation is plural.'), - 'field' => array( - 'id' => 'boolean', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'boolean', - 'label' => t('Plural'), - 'type' => 'yes-no', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/poll.views.inc b/core/modules/views/modules/poll.views.inc deleted file mode 100644 index b69f5060a6d..00000000000 --- a/core/modules/views/modules/poll.views.inc +++ /dev/null @@ -1,46 +0,0 @@ - array( - 'left_field' => 'nid', - 'field' => 'nid', - ), - ); - - // Fields - - // poll active status - $data['poll']['active'] = array( - 'title' => t('Active'), - 'help' => t('Whether the poll is open for voting.'), - 'field' => array( - 'id' => 'boolean', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'boolean', - 'label' => t('Active'), - 'type' => 'yes-no', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/search.views.inc b/core/modules/views/modules/search.views.inc deleted file mode 100644 index 3208ede8c49..00000000000 --- a/core/modules/views/modules/search.views.inc +++ /dev/null @@ -1,141 +0,0 @@ - array( - 'left_field' => 'nid', - 'field' => 'sid', - ), - ); - - $data['search_total']['table']['join'] = array( - 'node' => array( - 'left_table' => 'search_index', - 'left_field' => 'word', - 'field' => 'word', - ), - 'users' => array( - 'left_table' => 'search_index', - 'left_field' => 'word', - 'field' => 'word', - ) - ); - - $data['search_dataset']['table']['join'] = array( - 'node' => array( - 'left_table' => 'search_index', - 'left_field' => 'sid', - 'field' => 'sid', - 'extra' => 'search_index.type = search_dataset.type', - 'type' => 'INNER', - ), - 'users' => array( - 'left_table' => 'search_index', - 'left_field' => 'sid', - 'field' => 'sid', - 'extra' => 'search_index.type = search_dataset.type', - 'type' => 'INNER', - ), - ); - - // Fields - - // score - $data['search_index']['score'] = array( - 'title' => t('Score'), - 'help' => t('The score of the search item. This will not be used if the search filter is not also present.'), - 'field' => array( - 'id' => 'search_score', - 'click sortable' => TRUE, - 'float' => TRUE, - 'no group by' => TRUE, - ), - // Information for sorting on a search score. - 'sort' => array( - 'id' => 'search_score', - 'no group by' => TRUE, - ), - ); - - // Search node links: forward links. - $data['search_node_links_from']['table']['group'] = t('Search'); - $data['search_node_links_from']['table']['join'] = array( - 'node' => array( - 'arguments' => array( - 'table' => 'search_node_links', - 'left_table' => 'node', - 'field' => 'nid', - 'left_field' => 'nid', - 'type' => 'INNER' - ), - ), - ); - $data['search_node_links_from']['sid'] = array( - 'title' => t('Links from'), - 'help' => t('Other nodes that are linked from the node.'), - 'argument' => array( - 'id' => 'node_nid', - ), - 'filter' => array( - 'id' => 'equality', - ), - ); - - // Search node links: backlinks. - $data['search_node_links_to']['table']['group'] = t('Search'); - $data['search_node_links_to']['table']['join'] = array( - 'node' => array( - 'arguments' => array( - 'table' => 'search_node_links', - 'left_table' => 'node', - 'field' => 'sid', - 'left_field' => 'nid', - 'type' => 'INNER' - ), - ), - ); - $data['search_node_links_to']['nid'] = array( - 'title' => t('Links to'), - 'help' => t('Other nodes that link to the node.'), - 'argument' => array( - 'id' => 'node_nid', - ), - 'filter' => array( - 'id' => 'equality', - ), - ); - - // search filter - $data['search_index']['keys'] = array( - 'title' => t('Search Terms'), // The item it appears as on the UI, - 'help' => t('The terms to search for.'), // The help that appears on the UI, - // Information for searching terms using the full search syntax - 'filter' => array( - 'id' => 'search', - 'no group by' => TRUE, - ), - 'argument' => array( - 'id' => 'search', - 'no group by' => TRUE, - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/statistics.views.inc b/core/modules/views/modules/statistics.views.inc deleted file mode 100644 index b4e3caf1f13..00000000000 --- a/core/modules/views/modules/statistics.views.inc +++ /dev/null @@ -1,259 +0,0 @@ - array( - 'left_field' => 'nid', - 'field' => 'nid', - ), - ); - - // totalcount - $data['node_counter']['totalcount'] = array( - 'title' => t('Total views'), - 'help' => t('The total number of times the node has been viewed.'), - - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // daycount - $data['node_counter']['daycount'] = array( - 'title' => t('Views today'), - 'help' => t('The total number of times the node has been viewed today.'), - - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // timestamp - $data['node_counter']['timestamp'] = array( - 'title' => t('Most recent view'), - 'help' => t('The most recent time the node has been viewed.'), - - 'field' => array( - 'id' => 'date', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'date', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // accesslog table - - $data['accesslog']['table']['group'] = t('Access log'); - - // Advertise this table as a possible base table - $data['accesslog']['table']['base'] = array( - 'field' => 'aid', - 'title' => t('Access log'), - 'help' => t('Stores site access information.'), - 'weight' => 10, - ); - - // For other base tables, explain how we join - $data['accesslog']['table']['join'] = array( - 'users' => array( - 'field' => 'uid', - 'left_field' => 'uid', - ), - ); - - // accesslog.aid - $data['accesslog']['aid'] = array( - 'title' => t('Aid'), - 'help' => t('Unique access event ID.'), - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'argument' => array( - 'id' => 'numeric', - 'name field' => 'wid', - 'numeric' => TRUE, - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // session id - $data['accesslog']['sid'] = array( - 'title' => t('Session ID'), - 'help' => t('Browser session ID of user that visited page.'), - - 'field' => array( - 'id' => 'standard', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'string', - ), - 'argument' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // title - $data['accesslog']['title'] = array( - 'title' => t('Page title'), - 'help' => t('Title of page visited.'), - - 'field' => array( - 'id' => 'accesslog_path', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - 'argument' => array( - 'id' => 'standard', - ), - ); - - // path - $data['accesslog']['path'] = array( - 'title' => t('Path'), - 'help' => t('Internal path to page visited (relative to Drupal root.)'), - - 'field' => array( - 'id' => 'accesslog_path', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - //No argument here. Can't send forward slashes as arguments. - //Can be worked around by node ID. - //(but what about aliases?) - ); - - // referrer - $data['accesslog']['url'] = array( - 'title' => t('Referrer'), - 'help' => t('Referrer URI.'), - 'field' => array( - 'id' => 'url', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // hostname - $data['accesslog']['hostname'] = array( - 'title' => t('Hostname'), - 'help' => t('Hostname of user that visited the page.'), - 'field' => array( - 'id' => 'standard', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'string', - ), - 'sort' => array( - 'id' => 'standard', - ), - 'argument' => array( - 'id' => 'string', - ), - ); - - // user - $data['accesslog']['uid'] = array( - 'title' => t('User'), - 'help' => t('The user who visited the site.'), - 'relationship' => array( - 'id' => 'standard', - 'base' => 'users', - 'base field' => 'uid', - ), - ); - - // timer - $data['accesslog']['timer'] = array( - 'title' => t('Timer'), - 'help' => t('Time in milliseconds that the page took to load.'), - 'field' => array( - 'id' => 'numeric', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // timestamp - $data['accesslog']['timestamp'] = array( - 'title' => t('Timestamp'), - 'help' => t('Timestamp of when the page was visited.'), - 'field' => array( - 'id' => 'date', - 'click sortable' => TRUE, - ), - 'sort' => array( - 'id' => 'standard', - ), - 'filter' => array( - 'id' => 'date', - ), - ); - - return $data; -} diff --git a/core/modules/views/modules/translation.views.inc b/core/modules/views/modules/translation.views.inc deleted file mode 100644 index 6564b31829d..00000000000 --- a/core/modules/views/modules/translation.views.inc +++ /dev/null @@ -1,120 +0,0 @@ - 'tnid', - 'field' => 'tnid', - ); - - // The translation ID (nid of the "source" translation) - $data['node']['tnid'] = array( - 'group' => t('Content translation'), - 'title' => t('Translation set node ID'), - 'help' => t('The ID of the translation set the content belongs to.'), - 'field' => array( - 'id' => 'node', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'numeric', - ), - 'argument' => array( - 'id' => 'node_tnid', - 'name field' => 'title', // the field to display in the summary. - 'numeric' => TRUE, - 'validate type' => 'tnid', - ), - 'sort' => array( - 'id' => 'standard', - ), - 'relationship' => array( - 'title' => t('Source translation'), - 'help' => t('The source that this content was translated from.'), - 'base' => 'node', - 'base field' => 'nid', - 'id' => 'standard', - 'label' => t('Source translation'), - ), - ); - - // The source translation. - $data['node']['translation'] = array( - 'group' => t('Content translation'), - 'title' => t('Translations'), - 'help' => t('Versions of content in different languages.'), - 'relationship' => array( - 'title' => t('Translations'), - 'help' => t('Versions of content in different languages.'), - 'base' => 'node', - 'base field' => 'tnid', - 'relationship table' => 'node', - 'relationship field' => 'nid', - 'id' => 'translation', - 'label' => t('Translations'), - ), - ); - - // The source translation. - $data['node']['source_translation'] = array( - 'group' => t('Content translation'), - 'title' => t('Source translation'), - 'help' => t('Content that is either untranslated or is the original version of a translation set.'), - 'filter' => array( - 'id' => 'node_tnid', - ), - ); - - // The source translation. - $data['node']['child_translation'] = array( - 'group' => t('Node translation'), - 'title' => t('Child translation'), - 'help' => t('Content that is a translation of a source translation.'), - 'filter' => array( - 'id' => 'node_tnid_child', - ), - ); - - // Translation status - $data['node']['translate'] = array( - 'group' => t('Content translation'), - 'title' => t('Translation status'), - 'help' => t('The translation status of the content - whether or not the translation needs to be updated.'), - 'field' => array( - 'id' => 'boolean', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'boolean', - 'label' => t('Outdated'), - 'type' => 'yes-no', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - - // Translate node link. - $data['node']['translate_node'] = array( - 'group' => t('Content translation'), - 'title' => t('Translate link'), - 'help' => t('Provide a simple link to translate the node.'), - 'field' => array( - 'id' => 'node_link_translate', - ), - ); - -} diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/views_test_data/views_test_data.module index c4a28f95416..9dcd5e69e97 100644 --- a/core/modules/views/tests/views_test_data/views_test_data.module +++ b/core/modules/views/tests/views_test_data/views_test_data.module @@ -19,16 +19,6 @@ function views_test_data_permission() { ); } -/** - * Implements hook_views_api(). - */ -function views_test_data_views_api() { - return array( - 'api' => 3.0, - 'template path' => drupal_get_path('module', 'views_test_data') . '/templates', - ); -} - /** * Implements hook_views_data(). */ diff --git a/core/modules/views/views.module b/core/modules/views/views.module index b218edef79e..0eb12956baa 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -19,56 +19,6 @@ use Drupal\views\ViewStorage; */ const VIEWS_API_VERSION = '3.0'; -/** - * Advertise the current views api version - */ -function views_api_version() { - return VIEWS_API_VERSION; -} - -/** - * Returns a list of Drupal core modules. - * - * @return array - */ -function views_core_modules() { - return array( - 'aggregator', - 'book', - 'block', - 'comment', - 'contact', - 'field', - 'filter', - 'file', - 'language', - 'locale', - 'node', - 'search', - 'statistics', - 'system', - 'taxonomy', - 'translation', - 'user' - ); -} - -/** - * Implements hook_init(). - */ -function views_init() { - $path = drupal_get_path('module', 'views'); - $loader = drupal_classloader(); - // Just register enabled modules. - $modules = array_intersect(views_core_modules(), module_list('module_enabled')); - foreach ($modules as $module) { - $function = $module . '_views_api'; - if (function_exists($function)) { - $loader->registerNamespace('Views\\' . $module, DRUPAL_ROOT . '/' . $path . '/lib'); - } - } -} - /** * Implements hook_entity_info(). */ @@ -127,13 +77,6 @@ function views_form_id($view) { return implode('_', $parts); } -/** - * Views will not load plugins advertising a version older than this. - */ -function views_api_minimum_version() { - return '2'; -} - /** * Implements hook_element_info(). */ @@ -1175,35 +1118,6 @@ function views_include($file) { module_load_include('inc', 'views', 'includes/' . $file); } -/** - * Load views files on behalf of modules. - * - * @todo Remove this function once the views integration got moved into the - * core modules itself. - */ -function views_module_include() { - $loaded_files = &drupal_static(__FUNCTION__, array()); - - $minimum_version = views_api_minimum_version(); - $current_version = views_api_version(); - foreach (module_implements('views_api') as $module) { - if (isset($loaded_files[$module])) { - continue; - } - $info = module_invoke($module, 'views_api'); - $version = $info['api']; - $path = isset($info['path']) ? $info['path'] : drupal_get_path('module', $module); - // Only process if version is between minimum and current, inclusive. - if (version_compare($version, $minimum_version, '>=') && version_compare($version, $current_version, '<=')) { - $path = $path . "/$module.views.inc"; - if (file_exists($path)) { - include_once $path; - $loaded_files[$module] = TRUE; - } - } - } -} - /** * Implements hook_hook_info(). */ @@ -1248,21 +1162,6 @@ function views_add_js($file) { drupal_add_js($path . "/js/$file.js"); } -/** - * Load views files on behalf of modules. - */ -function views_include_handlers($reset = FALSE) { - static $finished = FALSE; - // Ensure this only gets run once. - if ($finished && !$reset) { - return; - } - - views_include('cache'); - views_module_include(); - $finished = TRUE; -} - /** * Fetch a handler from the data cache. * @@ -1521,15 +1420,9 @@ function views_get_applicable_views($type) { } /** - * Return an array of all views as fully loaded $view objects. - * - * @todo Figure out whether you expect to return config entities or - * view executables. - * @param $reset - * If TRUE, reset the static cache forcing views to be reloaded. - * + * Returns an array of all views as fully loaded $view objects. */ -function views_get_all_views($reset = FALSE) { +function views_get_all_views() { return entity_get_controller('view')->load(); } @@ -2321,94 +2214,3 @@ function views_array_key_plus($array) { asort($array); return $array; } - -// Declare API compatibility on behalf of core modules: - -/** - * Implements hook_views_api(). - * - * This one is used as the base to reduce errors when updating. - */ -function views_views_api() { - return array( - // in your modules do *not* use views_api_version()!!! - 'api' => views_api_version(), - 'path' => drupal_get_path('module', 'views') . '/modules', - ); -} - -if (!function_exists('aggregator_views_api')) { - function aggregator_views_api() { return views_views_api(); } -} - -if (!function_exists('book_views_api')) { - function book_views_api() { return views_views_api(); } -} - -if (!function_exists('block_views_api')) { - function block_views_api() { return views_views_api(); } -} - -if (!function_exists('comment_views_api')) { - function comment_views_api() { return views_views_api(); } -} - -if (!function_exists('field_views_api')) { - function field_views_api() { return views_views_api(); } -} - -if (!function_exists('file_views_api')) { - function file_views_api() { return views_views_api(); } -} - -if (!function_exists('filter_views_api')) { - function filter_views_api() { return views_views_api(); } -} - -if (!function_exists('image_views_api')) { - function image_views_api() { return views_views_api(); } -} - -if (!function_exists('language_views_api')) { - function language_views_api() { return views_views_api(); } -} - -if (!function_exists('locale_views_api')) { - function locale_views_api() { return views_views_api(); } -} - -if (!function_exists('node_views_api')) { - function node_views_api() { return views_views_api(); } -} - -if (!function_exists('poll_views_api')) { - function poll_views_api() { return views_views_api(); } -} - -if (!function_exists('search_views_api')) { - function search_views_api() { return views_views_api(); } -} - -if (!function_exists('statistics_views_api')) { - function statistics_views_api() { return views_views_api(); } -} - -if (!function_exists('system_views_api')) { - function system_views_api() { return views_views_api(); } -} - -if (!function_exists('taxonomy_views_api')) { - function taxonomy_views_api() { return views_views_api(); } -} - -if (!function_exists('translation_views_api')) { - function translation_views_api() { return views_views_api(); } -} - -if (!function_exists('user_views_api')) { - function user_views_api() { return views_views_api(); } -} - -if (!function_exists('contact_views_api')) { - function contact_views_api() { return views_views_api(); } -} diff --git a/core/modules/views/modules/views.views.inc b/core/modules/views/views.views.inc similarity index 100% rename from core/modules/views/modules/views.views.inc rename to core/modules/views/views.views.inc diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php index 60f918a0f66..7ac85c95fc7 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -1205,10 +1205,7 @@ class ViewUI extends ViewExecutable { // Build the rest of the form based on the currently selected wizard plugin. $wizard_key = $show_form['wizard_key']['#default_value']; - - views_include_handlers(); $wizard_instance = views_get_plugin('wizard', $wizard_key); - $form = $wizard_instance->build_form($form, $form_state); $form['save'] = array(