diff --git a/core/modules/aggregator/src/Plugin/views/argument/Fid.php b/core/modules/aggregator/src/Plugin/views/argument/Fid.php index f9d248106c96..7561694befe4 100644 --- a/core/modules/aggregator/src/Plugin/views/argument/Fid.php +++ b/core/modules/aggregator/src/Plugin/views/argument/Fid.php @@ -8,7 +8,7 @@ namespace Drupal\aggregator\Plugin\views\argument; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Drupal\Component\Utility\String; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("aggregator_fid") */ -class Fid extends Numeric { +class Fid extends NumericArgument { /** * The entity manager service. diff --git a/core/modules/aggregator/src/Plugin/views/argument/Iid.php b/core/modules/aggregator/src/Plugin/views/argument/Iid.php index 7fca20197e81..1c95afac5d94 100644 --- a/core/modules/aggregator/src/Plugin/views/argument/Iid.php +++ b/core/modules/aggregator/src/Plugin/views/argument/Iid.php @@ -8,7 +8,7 @@ namespace Drupal\aggregator\Plugin\views\argument; use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Drupal\Component\Utility\String; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("aggregator_iid") */ -class Iid extends Numeric { +class Iid extends NumericArgument { /** * The entity manager service. diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php index 40b8a5922e26..2328fece7761 100644 --- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php @@ -10,7 +10,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\Core\Database\Connection; use Drupal\comment\CommentInterface; use Drupal\Core\Form\FormStateInterface; -use Drupal\views\Plugin\views\field\Numeric; +use Drupal\views\Plugin\views\field\NumericField; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\ResultRow; use Drupal\views\ViewExecutable; @@ -23,7 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsField("node_new_comments") */ -class NodeNewComments extends Numeric { +class NodeNewComments extends NumericField { /** * {@inheritdoc} diff --git a/core/modules/file/src/Plugin/views/argument/Fid.php b/core/modules/file/src/Plugin/views/argument/Fid.php index bca81f762cb8..7548901f8c19 100644 --- a/core/modules/file/src/Plugin/views/argument/Fid.php +++ b/core/modules/file/src/Plugin/views/argument/Fid.php @@ -9,7 +9,7 @@ namespace Drupal\file\Plugin\views\argument; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Drupal\Component\Utility\String; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("file_fid") */ -class Fid extends Numeric implements ContainerFactoryPluginInterface { +class Fid extends NumericArgument implements ContainerFactoryPluginInterface { /** * The entity manager service diff --git a/core/modules/node/src/Plugin/views/argument/Nid.php b/core/modules/node/src/Plugin/views/argument/Nid.php index 07f93ec33595..7ef1d937c054 100644 --- a/core/modules/node/src/Plugin/views/argument/Nid.php +++ b/core/modules/node/src/Plugin/views/argument/Nid.php @@ -9,7 +9,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\Component\Utility\String; use Drupal\node\NodeStorageInterface; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("node_nid") */ -class Nid extends Numeric { +class Nid extends NumericArgument { /** * The node storage. diff --git a/core/modules/node/src/Plugin/views/argument/Type.php b/core/modules/node/src/Plugin/views/argument/Type.php index eb1e10786d2b..ec03b48f0005 100644 --- a/core/modules/node/src/Plugin/views/argument/Type.php +++ b/core/modules/node/src/Plugin/views/argument/Type.php @@ -9,7 +9,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\Component\Utility\String as UtilityString; use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\views\Plugin\views\argument\String; +use Drupal\views\Plugin\views\argument\StringArgument; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("node_type") */ -class Type extends String { +class Type extends StringArgument { /** * NodeType storage controller. diff --git a/core/modules/node/src/Plugin/views/argument/Vid.php b/core/modules/node/src/Plugin/views/argument/Vid.php index 43246d80e489..2c93d9d8e79e 100644 --- a/core/modules/node/src/Plugin/views/argument/Vid.php +++ b/core/modules/node/src/Plugin/views/argument/Vid.php @@ -9,7 +9,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\Component\Utility\String; use Drupal\Core\Database\Connection; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\node\NodeStorageInterface; @@ -18,7 +18,7 @@ use Drupal\node\NodeStorageInterface; * * @ViewsArgument("node_vid") */ -class Vid extends Numeric { +class Vid extends NumericArgument { /** * Database Service Object. diff --git a/core/modules/options/src/Plugin/views/argument/NumberListField.php b/core/modules/options/src/Plugin/views/argument/NumberListField.php index 792381c4c739..007bcddaa38c 100644 --- a/core/modules/options/src/Plugin/views/argument/NumberListField.php +++ b/core/modules/options/src/Plugin/views/argument/NumberListField.php @@ -13,7 +13,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\FieldAPIHandlerTrait; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; /** * Argument handler for list field to show the human readable name in the @@ -23,7 +23,7 @@ use Drupal\views\Plugin\views\argument\Numeric; * * @ViewsArgument("number_list_field") */ -class NumberListField extends Numeric { +class NumberListField extends NumericArgument { use AllowedTagsXssTrait; use FieldAPIHandlerTrait; diff --git a/core/modules/options/src/Plugin/views/argument/StringListField.php b/core/modules/options/src/Plugin/views/argument/StringListField.php index da715c411f62..0825bb1f5ea5 100644 --- a/core/modules/options/src/Plugin/views/argument/StringListField.php +++ b/core/modules/options/src/Plugin/views/argument/StringListField.php @@ -12,7 +12,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\views\FieldAPIHandlerTrait; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; -use Drupal\views\Plugin\views\argument\String; +use Drupal\views\Plugin\views\argument\StringArgument; use Drupal\Component\Utility\String as StringUtility; /** @@ -22,7 +22,7 @@ use Drupal\Component\Utility\String as StringUtility; * * @ViewsArgument("string_list_field") */ -class StringListField extends String { +class StringListField extends StringArgument { use AllowedTagsXssTrait; use FieldAPIHandlerTrait; diff --git a/core/modules/search/src/Plugin/views/field/Score.php b/core/modules/search/src/Plugin/views/field/Score.php index bb5c3fe46623..7d093b76fb27 100644 --- a/core/modules/search/src/Plugin/views/field/Score.php +++ b/core/modules/search/src/Plugin/views/field/Score.php @@ -7,7 +7,7 @@ namespace Drupal\search\Plugin\views\field; -use Drupal\views\Plugin\views\field\Numeric; +use Drupal\views\Plugin\views\field\NumericField; use Drupal\views\ResultRow; /** @@ -17,7 +17,7 @@ use Drupal\views\ResultRow; * * @ViewsField("search_score") */ -class Score extends Numeric { +class Score extends NumericField { /** * {@inheritdoc} diff --git a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php index 41a7f5d232a1..87704eda409a 100644 --- a/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php +++ b/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php @@ -9,7 +9,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Drupal\Component\Utility\String; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -20,7 +20,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("taxonomy") */ -class Taxonomy extends Numeric implements ContainerFactoryPluginInterface { +class Taxonomy extends NumericArgument implements ContainerFactoryPluginInterface { /** * @var EntityStorageInterface diff --git a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php index 597f8261830f..2b92822c8438 100644 --- a/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php +++ b/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Drupal\Component\Utility\String; use Drupal\taxonomy\VocabularyStorageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("vocabulary_vid") */ -class VocabularyVid extends Numeric { +class VocabularyVid extends NumericArgument { /** * The vocabulary storage. diff --git a/core/modules/user/src/Plugin/views/argument/Uid.php b/core/modules/user/src/Plugin/views/argument/Uid.php index 2c4a087b60b3..63db23c4df66 100644 --- a/core/modules/user/src/Plugin/views/argument/Uid.php +++ b/core/modules/user/src/Plugin/views/argument/Uid.php @@ -9,7 +9,7 @@ namespace Drupal\user\Plugin\views\argument; use Drupal\Component\Utility\String; use Drupal\Core\Entity\EntityStorageInterface; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; * * @ViewsArgument("user_uid") */ -class Uid extends Numeric { +class Uid extends NumericArgument { /** * The user storage. diff --git a/core/modules/views/src/Plugin/views/argument/FieldList.php b/core/modules/views/src/Plugin/views/argument/FieldList.php index 39d02cb7ebc5..64d9bb43fc9a 100644 --- a/core/modules/views/src/Plugin/views/argument/FieldList.php +++ b/core/modules/views/src/Plugin/views/argument/FieldList.php @@ -12,7 +12,7 @@ use Drupal\Core\Field\AllowedTagsXssTrait; use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; -use Drupal\views\Plugin\views\argument\Numeric; +use Drupal\views\Plugin\views\argument\NumericArgument; /** * Argument handler for list field to show the human readable name in the @@ -22,7 +22,7 @@ use Drupal\views\Plugin\views\argument\Numeric; * * @ViewsArgument("field_list") */ -class FieldList extends Numeric { +class FieldList extends NumericArgument { use AllowedTagsXssTrait; diff --git a/core/modules/views/src/Plugin/views/argument/ListString.php b/core/modules/views/src/Plugin/views/argument/ListString.php index f24ca79b42ad..3237e80a45d3 100644 --- a/core/modules/views/src/Plugin/views/argument/ListString.php +++ b/core/modules/views/src/Plugin/views/argument/ListString.php @@ -12,7 +12,7 @@ use Drupal\Core\Field\AllowedTagsXssTrait; use Drupal\Core\Form\FormStateInterface; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; -use Drupal\views\Plugin\views\argument\String; +use Drupal\views\Plugin\views\argument\StringArgument; /** * Argument handler for list field to show the human readable name in the @@ -22,7 +22,7 @@ use Drupal\views\Plugin\views\argument\String; * * @ViewsArgument("field_list_string") */ -class ListString extends String { +class ListString extends StringArgument { use AllowedTagsXssTrait; @@ -34,7 +34,7 @@ class ListString extends String { var $allowed_values = NULL; /** - * Overrides \Drupal\views\Plugin\views\argument\String::init(). + * Overrides \Drupal\views\Plugin\views\argument\StringArgument::init(). */ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); diff --git a/core/modules/views/src/Plugin/views/argument/Null.php b/core/modules/views/src/Plugin/views/argument/NullArgument.php similarity index 93% rename from core/modules/views/src/Plugin/views/argument/Null.php rename to core/modules/views/src/Plugin/views/argument/NullArgument.php index 051e35211e4e..d21ce521f57e 100644 --- a/core/modules/views/src/Plugin/views/argument/Null.php +++ b/core/modules/views/src/Plugin/views/argument/NullArgument.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\argument\Null. + * Contains \Drupal\views\Plugin\views\argument\NullArgument. */ namespace Drupal\views\Plugin\views\argument; @@ -16,7 +16,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsArgument("null") */ -class Null extends ArgumentPluginBase { +class NullArgument extends ArgumentPluginBase { protected function defineOptions() { $options = parent::defineOptions(); diff --git a/core/modules/views/src/Plugin/views/argument/Numeric.php b/core/modules/views/src/Plugin/views/argument/NumericArgument.php similarity index 97% rename from core/modules/views/src/Plugin/views/argument/Numeric.php rename to core/modules/views/src/Plugin/views/argument/NumericArgument.php index e926da3fc89f..799d5cbeaf3c 100644 --- a/core/modules/views/src/Plugin/views/argument/Numeric.php +++ b/core/modules/views/src/Plugin/views/argument/NumericArgument.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\argument\Numeric. + * Contains \Drupal\views\Plugin\views\argument\NumericArgument. */ namespace Drupal\views\Plugin\views\argument; @@ -17,7 +17,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsArgument("numeric") */ -class Numeric extends ArgumentPluginBase { +class NumericArgument extends ArgumentPluginBase { /** * The operator used for the query: or|and. diff --git a/core/modules/views/src/Plugin/views/argument/String.php b/core/modules/views/src/Plugin/views/argument/StringArgument.php similarity index 98% rename from core/modules/views/src/Plugin/views/argument/String.php rename to core/modules/views/src/Plugin/views/argument/StringArgument.php index b542bfba96b1..eeda44bb1cae 100644 --- a/core/modules/views/src/Plugin/views/argument/String.php +++ b/core/modules/views/src/Plugin/views/argument/StringArgument.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\argument\String. + * Contains \Drupal\views\Plugin\views\argument\StringArgument. */ namespace Drupal\views\Plugin\views\argument; @@ -20,7 +20,7 @@ use Drupal\views\ManyToOneHelper; * * @ViewsArgument("string") */ -class String extends ArgumentPluginBase { +class StringArgument extends ArgumentPluginBase { /** * Overrides \Drupal\views\Plugin\views\argument\ArgumentPluginBase::init(). diff --git a/core/modules/views/src/Plugin/views/argument_validator/Numeric.php b/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php similarity index 70% rename from core/modules/views/src/Plugin/views/argument_validator/Numeric.php rename to core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php index ff7e5a3ef442..c7ffc755ba8d 100644 --- a/core/modules/views/src/Plugin/views/argument_validator/Numeric.php +++ b/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\argument_validator\Numeric. + * Contains \Drupal\views\Plugin\views\argument_validator\NumericArgumentValidator. */ namespace Drupal\views\Plugin\views\argument_validator; @@ -17,7 +17,7 @@ namespace Drupal\views\Plugin\views\argument_validator; * title = @Translation("Numeric") * ) */ -class Numeric extends ArgumentValidatorPluginBase { +class NumericArgumentValidator extends ArgumentValidatorPluginBase { public function validateArgument($argument) { return is_numeric($argument); diff --git a/core/modules/views/src/Plugin/views/field/Numeric.php b/core/modules/views/src/Plugin/views/field/NumericField.php similarity index 98% rename from core/modules/views/src/Plugin/views/field/Numeric.php rename to core/modules/views/src/Plugin/views/field/NumericField.php index da99d1578e86..5e2db03db5db 100644 --- a/core/modules/views/src/Plugin/views/field/Numeric.php +++ b/core/modules/views/src/Plugin/views/field/NumericField.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\field\Numeric. + * Contains \Drupal\views\Plugin\views\field\NumericField. */ namespace Drupal\views\Plugin\views\field; @@ -21,7 +21,7 @@ use Drupal\views\ResultRow; * * @ViewsField("numeric") */ -class Numeric extends FieldPluginBase { +class NumericField extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php index cad7eb9137dc..7ed5aea06f09 100644 --- a/core/modules/views/src/Plugin/views/filter/Combine.php +++ b/core/modules/views/src/Plugin/views/filter/Combine.php @@ -16,7 +16,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsFilter("combine") */ -class Combine extends String { +class Combine extends StringFilter { /** * @var views_plugin_query_default diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php index 7e5417f6007c..0da930065944 100644 --- a/core/modules/views/src/Plugin/views/filter/Date.php +++ b/core/modules/views/src/Plugin/views/filter/Date.php @@ -16,7 +16,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsFilter("date") */ -class Date extends Numeric { +class Date extends NumericFilter { protected function defineOptions() { $options = parent::defineOptions(); diff --git a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php index 9bd321b07bc6..e7157a902d91 100644 --- a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php +++ b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php @@ -14,7 +14,7 @@ namespace Drupal\views\Plugin\views\filter; * * @ViewsFilter("groupby_numeric") */ -class GroupByNumeric extends Numeric { +class GroupByNumeric extends NumericFilter { public function query() { $this->ensureMyTable(); diff --git a/core/modules/views/src/Plugin/views/filter/Numeric.php b/core/modules/views/src/Plugin/views/filter/NumericFilter.php similarity index 98% rename from core/modules/views/src/Plugin/views/filter/Numeric.php rename to core/modules/views/src/Plugin/views/filter/NumericFilter.php index 38c0fcab2187..e234bf296b08 100644 --- a/core/modules/views/src/Plugin/views/filter/Numeric.php +++ b/core/modules/views/src/Plugin/views/filter/NumericFilter.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\filter\Numeric. + * Contains \Drupal\views\Plugin\views\filter\NumericFilter. */ namespace Drupal\views\Plugin\views\filter; @@ -18,7 +18,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsFilter("numeric") */ -class Numeric extends FilterPluginBase { +class NumericFilter extends FilterPluginBase { protected $alwaysMultiple = TRUE; diff --git a/core/modules/views/src/Plugin/views/filter/String.php b/core/modules/views/src/Plugin/views/filter/StringFilter.php similarity index 98% rename from core/modules/views/src/Plugin/views/filter/String.php rename to core/modules/views/src/Plugin/views/filter/StringFilter.php index 54dbb495f29e..41e2e9aa38ef 100644 --- a/core/modules/views/src/Plugin/views/filter/String.php +++ b/core/modules/views/src/Plugin/views/filter/StringFilter.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\views\Plugin\views\filter\String. + * Contains \Drupal\views\Plugin\views\filter\StringFilter. */ namespace Drupal\views\Plugin\views\filter; @@ -19,7 +19,7 @@ use Drupal\Core\Form\FormStateInterface; * * @ViewsFilter("string") */ -class String extends FilterPluginBase { +class StringFilter extends FilterPluginBase { // exposed filter options protected $alwaysMultiple = TRUE; diff --git a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php index 50684bd96233..3e078bf81f4c 100644 --- a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php +++ b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php @@ -11,7 +11,7 @@ use Drupal\views\Tests\ViewUnitTestBase; use Drupal\views\Views; /** - * Tests the core Drupal\views\Plugin\views\argument\Null handler. + * Tests the core Drupal\views\Plugin\views\argument\NullArgument handler. * * @group views */ diff --git a/core/modules/views/src/Tests/Handler/ArgumentStringTest.php b/core/modules/views/src/Tests/Handler/ArgumentStringTest.php index 021fcf15889f..4b5b9feb7acd 100644 --- a/core/modules/views/src/Tests/Handler/ArgumentStringTest.php +++ b/core/modules/views/src/Tests/Handler/ArgumentStringTest.php @@ -10,7 +10,7 @@ namespace Drupal\views\Tests\Handler; use Drupal\views\Views; /** - * Tests the core Drupal\views\Plugin\views\argument\String handler. + * Tests the core Drupal\views\Plugin\views\argument\StringArgument handler. * * @group views */ diff --git a/core/modules/views/src/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php index f738d3432493..95be9dfe0a5d 100644 --- a/core/modules/views/src/Tests/Handler/FilterStringTest.php +++ b/core/modules/views/src/Tests/Handler/FilterStringTest.php @@ -11,7 +11,7 @@ use Drupal\views\Tests\ViewUnitTestBase; use Drupal\views\Views; /** - * Tests the core Drupal\views\Plugin\views\filter\String handler. + * Tests the core Drupal\views\Plugin\views\filter\StringFilter handler. * * @group views */ diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php index 6d221aee5403..ec0ac1ac278b 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\style; use Drupal\views\Plugin\views\style\Mapping; -use Drupal\views\Plugin\views\field\Numeric; +use Drupal\views\Plugin\views\field\NumericField; /** * Provides a test plugin for the mapping style. @@ -59,7 +59,7 @@ class MappingTest extends Mapping { */ protected function filterNumericFields(&$fields) { foreach ($this->view->field as $id => $field) { - if (!($field instanceof Numeric)) { + if (!($field instanceof NumericField)) { unset($fields[$id]); } } diff --git a/core/modules/views_ui/src/Tests/FilterNumericWebTest.php b/core/modules/views_ui/src/Tests/FilterNumericWebTest.php index b9ba56533719..d687b4a57aea 100644 --- a/core/modules/views_ui/src/Tests/FilterNumericWebTest.php +++ b/core/modules/views_ui/src/Tests/FilterNumericWebTest.php @@ -13,7 +13,7 @@ use Drupal\config\Tests\SchemaCheckTestTrait; * Tests the numeric filter UI. * * @group views_ui - * @see \Drupal\views\Plugin\views\filter\Numeric + * @see \Drupal\views\Plugin\views\filter\NumericFilter */ class FilterNumericWebTest extends UITestBase { use SchemaCheckTestTrait;