Issue #3426961 by sorlov, Ruturaj Chaubey, mstrelan, smustgrave: Convert...

Issue #3426961 by sorlov, Ruturaj Chaubey, mstrelan, smustgrave: Convert ViewsSort plugin discovery to attributes

(cherry picked from commit 77ccadfb)

core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\comment\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\sort\SortPluginBase;
 
 /**
  * Sort handler, sorts by last comment name which can be in 2 different fields.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("comment_ces_last_comment_name")
  */
+#[ViewsSort("comment_ces_last_comment_name")]
 class StatisticsLastCommentName extends SortPluginBase {
 
   /**

core/modules/comment/src/Plugin/views/sort/StatisticsLastUpdated.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\comment\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\sort\Date;
 
 /**
  * Sort handler for the newer of last comment / entity updated.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("comment_ces_last_updated")
  */
+#[ViewsSort("comment_ces_last_updated")]
 class StatisticsLastUpdated extends Date {
 
   /**

core/modules/comment/src/Plugin/views/sort/Thread.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\comment\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\sort\SortPluginBase;
 
 /**
  * Sort handler for ordering by thread.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("comment_thread")
  */
+#[ViewsSort("comment_thread")]
 class Thread extends SortPluginBase {
 
   public function query() {

core/modules/content_moderation/src/Plugin/views/sort/ModerationStateSort.php

@@ -4,6 +4,7 @@
 
 use Drupal\content_moderation\Plugin\views\ModerationStateJoinViewsHandlerTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\sort\SortPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -11,9 +12,8 @@
  * Enables sorting for the computed moderation_state field.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("moderation_state_sort")
  */
+#[ViewsSort("moderation_state_sort")]
 class ModerationStateSort extends SortPluginBase {
 
   use ModerationStateJoinViewsHandlerTrait;

core/modules/datetime/src/Plugin/views/sort/Date.php

@@ -3,6 +3,7 @@
 namespace Drupal\datetime\Plugin\views\sort;
 
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\FieldAPIHandlerTrait;
 use Drupal\views\Plugin\views\sort\Date as NumericDate;
 
@@ -11,9 +12,8 @@
  *
  * This handler enables granularity, which is the ability to make dates
  * equivalent based upon nearness.
- *
- * @ViewsSort("datetime")
  */
+#[ViewsSort("datetime")]
 class Date extends NumericDate {
 
   use FieldAPIHandlerTrait;

core/modules/search/src/Plugin/views/sort/Score.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\search\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\sort\SortPluginBase;
 
 /**
  * Sort handler for sorting by search score.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("search_score")
  */
+#[ViewsSort("search_score")]
 class Score extends SortPluginBase {
 
   /**

core/modules/views/src/Attribute/ViewsSort.php

+<?php
+
+namespace Drupal\views\Attribute;
+
+use Drupal\Component\Plugin\Attribute\PluginID;
+
+/**
+ * Defines a Plugin attribute object for views sort handlers.
+ *
+ * @see \Drupal\views\Plugin\views\sort\SortPluginBase
+ *
+ * @ingroup views_sort_handlers
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class ViewsSort extends PluginID {
+
+}

core/modules/views/src/Plugin/views/sort/Broken.php

@@ -2,15 +2,15 @@
 
 namespace Drupal\views\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\BrokenHandlerTrait;
 
 /**
  * A special handler to take the place of missing or broken handlers.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("broken")
  */
+#[ViewsSort("broken")]
 class Broken extends SortPluginBase {
   use BrokenHandlerTrait;
 

core/modules/views/src/Plugin/views/sort/Date.php

@@ -3,15 +3,15 @@
 namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\Attribute\ViewsSort;
 
 /**
  * Basic sort handler for dates.
  *
  * This handler enables granularity, which is the ability to make dates
  * equivalent based upon nearness.
- *
- * @ViewsSort("date")
  */
+#[ViewsSort("date")]
 class Date extends SortPluginBase {
 
   protected function defineOptions() {

core/modules/views/src/Plugin/views/sort/GroupByNumeric.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\views\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\ViewExecutable;
@@ -9,9 +10,8 @@
 
 /**
  * Handler for GROUP BY on simple numeric fields.
- *
- * @ViewsSort("groupby_numeric")
  */
+#[ViewsSort("groupby_numeric")]
 class GroupByNumeric extends SortPluginBase {
 
   /**

core/modules/views/src/Plugin/views/sort/Random.php

@@ -5,12 +5,12 @@
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\UncacheableDependencyTrait;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\Attribute\ViewsSort;
 
 /**
  * Handle a random sort.
- *
- * @ViewsSort("random")
  */
+#[ViewsSort("random")]
 class Random extends SortPluginBase implements CacheableDependencyInterface {
 
   use UncacheableDependencyTrait;

core/modules/views/src/Plugin/views/sort/SortPluginBase.php

@@ -13,8 +13,8 @@
  * Plugins that handle sorting for Views.
  *
  * Sort handlers extend \Drupal\views\Plugin\views\sort:SortPluginBase. They
- * must be annotated with \Drupal\views\Annotation\ViewsSort annotation, and
- * they must be in plugin directory Plugin\views\sort.
+ * must be attributed with the \Drupal\views\Attribute\ViewsSort attribute,
+ * and they must be in plugin directory Plugin\views\sort.
  *
  * @ingroup views_plugins
  * @see plugin_api

core/modules/views/src/Plugin/views/sort/Standard.php

@@ -2,13 +2,14 @@
 
 namespace Drupal\views\Plugin\views\sort;
 
+use Drupal\views\Attribute\ViewsSort;
+
 /**
  * Default implementation of the base sort plugin.
  *
  * @ingroup views_sort_handlers
- *
- * @ViewsSort("standard")
  */
+#[ViewsSort("standard")]
 class Standard extends SortPluginBase {
 
 }