diff --git a/core/lib/Drupal/Core/Annotation/AnnotationInterface.php b/core/lib/Drupal/Component/Annotation/AnnotationInterface.php similarity index 65% rename from core/lib/Drupal/Core/Annotation/AnnotationInterface.php rename to core/lib/Drupal/Component/Annotation/AnnotationInterface.php index 3382d48..55741e4 100644 --- a/core/lib/Drupal/Core/Annotation/AnnotationInterface.php +++ b/core/lib/Drupal/Component/Annotation/AnnotationInterface.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Drupal\Core\Annotation\AnnotationInterface. + * Definition of Drupal\Component\Annotation\AnnotationInterface. */ -namespace Drupal\Core\Annotation; +namespace Drupal\Component\Annotation; /** * Defines a common interface for classed annotations. diff --git a/core/lib/Drupal/Core/Annotation/Plugin.php b/core/lib/Drupal/Component/Annotation/Plugin.php similarity index 92% rename from core/lib/Drupal/Core/Annotation/Plugin.php rename to core/lib/Drupal/Component/Annotation/Plugin.php index d4931ee..3d3500c 100644 --- a/core/lib/Drupal/Core/Annotation/Plugin.php +++ b/core/lib/Drupal/Component/Annotation/Plugin.php @@ -2,12 +2,10 @@ /** * @file - * Definition of Drupal\Core\Annotation\Plugin. + * Definition of Drupal\Component\Annotation\Plugin. */ -namespace Drupal\Core\Annotation; - -use Drupal\Core\Annotation\AnnotationInterface; +namespace Drupal\Component\Annotation; /** * Defines a Plugin annotation object. diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php similarity index 57% copy from core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php copy to core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php index bd89a92..9c726b3 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php +++ b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php @@ -2,15 +2,14 @@ /** * @file - * Definition of Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery. + * Definition of Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery. */ -namespace Drupal\Core\Plugin\Discovery; +namespace Drupal\Component\Plugin\Discovery; use DirectoryIterator; use Drupal\Component\Plugin\Discovery\DiscoveryInterface; use Drupal\Component\Reflection\MockFileFinder; -use Drupal\Core\Annotation\Plugin; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Annotations\AnnotationRegistry; use Doctrine\Common\Reflection\StaticReflectionParser; @@ -21,11 +20,36 @@ class AnnotatedClassDiscovery implements DiscoveryInterface { /** + * The namespaces within which to find plugin classes. + * + * @var array + */ + protected $pluginNamespaces; + + /** + * The namespaces of classes that can be used as annotations. + * + * @var array + */ + protected $annotationNamespaces; + + /** + * The name of the annotation that contains the plugin definition. + * + * The class corresponding to this name must implement + * Drupal\Component\Annotation\AnnotationInterface. + * + * @var string + */ + protected $pluginDefinitionAnnotationName; + + /** * Constructs an AnnotatedClassDiscovery object. */ - function __construct($owner, $type) { - $this->owner = $owner; - $this->type = $type; + function __construct($plugin_namespaces, $annotation_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') { + $this->pluginNamespaces = $plugin_namespaces; + $this->annotationNamespaces = $annotation_namespaces; + $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name; } /** @@ -45,36 +69,18 @@ public function getDefinitions() { // Prevent @endlink from being parsed as an annotation. $reader->addGlobalIgnoredName('endlink'); - // Register the namespace of classes that can be used for annotations. - AnnotationRegistry::registerAutoloadNamespace('Drupal\Core\Annotation', array(DRUPAL_ROOT . '/core/lib')); - // Get all PSR-0 namespaces. - $namespaces = drupal_classloader()->getNamespaces(); - foreach ($namespaces as $ns => $namespace_dirs) { - - // OS-Safe directory separators. - $ns = str_replace('\\', DIRECTORY_SEPARATOR, $ns); - - foreach ($namespace_dirs as $dir) { - // Check for the pre-determined directory structure to find plugins. - $prefix = implode(DIRECTORY_SEPARATOR, array( - $ns, - 'Plugin', - $this->owner, - $this->type - )); - $dir .= DIRECTORY_SEPARATOR . $prefix; + // Register the namespaces of classes that can be used for annotations. + AnnotationRegistry::registerAutoloadNamespaces($this->annotationNamespaces); - // If the directory structure exists, look for classes. + // Search for classes within all PSR-0 namespace locations. + foreach ($this->pluginNamespaces as $namespace => $dirs) { + foreach ($dirs as $dir) { + $dir .= DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $namespace); if (file_exists($dir)) { - $directories = new DirectoryIterator($dir); - foreach ($directories as $fileinfo) { + foreach (new DirectoryIterator($dir) as $fileinfo) { // @todo Once core requires 5.3.6, use $fileinfo->getExtension(). if (pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION) == 'php') { - $class = str_replace( - DIRECTORY_SEPARATOR, - '\\', - $prefix . DIRECTORY_SEPARATOR . $fileinfo->getBasename('.php') - ); + $class = $namespace . '\\' . $fileinfo->getBasename('.php'); // The filename is already known, so there is no need to find the // file. However, StaticReflectionParser needs a finder, so use a @@ -82,7 +88,7 @@ public function getDefinitions() { $finder = MockFileFinder::create($fileinfo->getPathName()); $parser = new StaticReflectionParser($class, $finder); - if ($annotation = $reader->getClassAnnotation($parser->getReflectionClass(), 'Drupal\Core\Annotation\Plugin')) { + if ($annotation = $reader->getClassAnnotation($parser->getReflectionClass(), $this->pluginDefinitionAnnotationName)) { // AnnotationInterface::get() returns the array definition // instead of requiring us to work with the annotation object. $definition = $annotation->get(); diff --git a/core/lib/Drupal/Core/Annotation/Translation.php b/core/lib/Drupal/Core/Annotation/Translation.php index 1e4ec6d..0d6acd1 100644 --- a/core/lib/Drupal/Core/Annotation/Translation.php +++ b/core/lib/Drupal/Core/Annotation/Translation.php @@ -7,7 +7,7 @@ namespace Drupal\Core\Annotation; -use Drupal\Core\Annotation\AnnotationInterface; +use Drupal\Component\Annotation\AnnotationInterface; /** * Defines a translatable annotation object. diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php index bd89a92..c4072f1 100644 --- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php +++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php @@ -7,94 +7,26 @@ namespace Drupal\Core\Plugin\Discovery; -use DirectoryIterator; -use Drupal\Component\Plugin\Discovery\DiscoveryInterface; -use Drupal\Component\Reflection\MockFileFinder; -use Drupal\Core\Annotation\Plugin; -use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\Common\Annotations\AnnotationRegistry; -use Doctrine\Common\Reflection\StaticReflectionParser; +use Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery as ComponentAnnotatedClassDiscovery; /** * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces. */ -class AnnotatedClassDiscovery implements DiscoveryInterface { +class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery { /** * Constructs an AnnotatedClassDiscovery object. */ function __construct($owner, $type) { - $this->owner = $owner; - $this->type = $type; - } - - /** - * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinition(). - */ - public function getDefinition($plugin_id) { - $plugins = $this->getDefinitions(); - return isset($plugins[$plugin_id]) ? $plugins[$plugin_id] : NULL; - } - - /** - * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions(). - */ - public function getDefinitions() { - $definitions = array(); - $reader = new AnnotationReader(); - // Prevent @endlink from being parsed as an annotation. - $reader->addGlobalIgnoredName('endlink'); - - // Register the namespace of classes that can be used for annotations. - AnnotationRegistry::registerAutoloadNamespace('Drupal\Core\Annotation', array(DRUPAL_ROOT . '/core/lib')); - // Get all PSR-0 namespaces. - $namespaces = drupal_classloader()->getNamespaces(); - foreach ($namespaces as $ns => $namespace_dirs) { - - // OS-Safe directory separators. - $ns = str_replace('\\', DIRECTORY_SEPARATOR, $ns); - - foreach ($namespace_dirs as $dir) { - // Check for the pre-determined directory structure to find plugins. - $prefix = implode(DIRECTORY_SEPARATOR, array( - $ns, - 'Plugin', - $this->owner, - $this->type - )); - $dir .= DIRECTORY_SEPARATOR . $prefix; - - // If the directory structure exists, look for classes. - if (file_exists($dir)) { - $directories = new DirectoryIterator($dir); - foreach ($directories as $fileinfo) { - // @todo Once core requires 5.3.6, use $fileinfo->getExtension(). - if (pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION) == 'php') { - $class = str_replace( - DIRECTORY_SEPARATOR, - '\\', - $prefix . DIRECTORY_SEPARATOR . $fileinfo->getBasename('.php') - ); - - // The filename is already known, so there is no need to find the - // file. However, StaticReflectionParser needs a finder, so use a - // mock version. - $finder = MockFileFinder::create($fileinfo->getPathName()); - $parser = new StaticReflectionParser($class, $finder); - - if ($annotation = $reader->getClassAnnotation($parser->getReflectionClass(), 'Drupal\Core\Annotation\Plugin')) { - // AnnotationInterface::get() returns the array definition - // instead of requiring us to work with the annotation object. - $definition = $annotation->get(); - $definition['class'] = $class; - $definitions[$definition['id']] = $definition; - } - } - } - } - } + $drupal_namespaces = drupal_classloader()->getNamespaces(); + $plugin_namespaces = array(); + foreach ($drupal_namespaces as $namespace => $dirs) { + $plugin_namespaces["$namespace\\Plugin\\$owner\\$type"] = $dirs; } - return $definitions; + $annotation_namespaces = array( + 'Drupal\Component\Annotation' => $drupal_namespaces['Drupal\Component'], + 'Drupal\Core\Annotation' => $drupal_namespaces['Drupal\Core'], + ); + parent::__construct($plugin_namespaces, $annotation_namespaces); } - } diff --git a/core/modules/action/lib/Drupal/action/Plugin/views/field/BulkForm.php b/core/modules/action/lib/Drupal/action/Plugin/views/field/BulkForm.php index 08d6c85..4a61887 100644 --- a/core/modules/action/lib/Drupal/action/Plugin/views/field/BulkForm.php +++ b/core/modules/action/lib/Drupal/action/Plugin/views/field/BulkForm.php @@ -7,7 +7,7 @@ namespace Drupal\action\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php index bbe883c..f32980e 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php @@ -8,7 +8,7 @@ namespace Drupal\aggregator\Plugin\aggregator\fetcher; use Drupal\aggregator\Plugin\FetcherInterface; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php index 584ac00..6014bef 100644 --- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php +++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php @@ -8,7 +8,7 @@ namespace Drupal\block\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\display\DisplayPluginBase; diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php index 7c7301d..c2dff01 100644 --- a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php +++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/Breakpoint.php @@ -13,7 +13,7 @@ use Drupal\breakpoint\InvalidBreakpointSourceException; use Drupal\breakpoint\InvalidBreakpointSourceTypeException; use Drupal\breakpoint\InvalidBreakpointMediaQueryException; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php index 2fe4227..334d2cb 100644 --- a/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php +++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Plugin/Core/Entity/BreakpointGroup.php @@ -10,7 +10,7 @@ use Drupal\Core\Config\Entity\ConfigEntityBase; use Drupal\breakpoint\InvalidBreakpointSourceException; use Drupal\breakpoint\InvalidBreakpointSourceTypeException; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php index e0bbfd9..85cecc5 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php index 521e45a..b97f15e 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler to accept a user id to check for nodes that diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php index eadc0b5..9251596 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to allow linking to a comment. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php index 1713bd7..f90a028 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php @@ -7,7 +7,7 @@ namespace Drupal\comment\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php index 1f14803..360258f 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\Date; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to display the timestamp of a comment with the count of comments. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php index d11e7a5..d2a4d0d 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Base field handler to present a link. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php index 5eb2195..e538e06 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php @@ -7,7 +7,7 @@ namespace Drupal\comment\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Provides a comment approve link. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php index fbe0815..7851d9d 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php @@ -7,7 +7,7 @@ namespace Drupal\comment\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to delete a node. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php index 4a17fe7..c3407e4 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php @@ -7,7 +7,7 @@ namespace Drupal\comment\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link node edit. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php index bee231c..400748d 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php @@ -7,7 +7,7 @@ namespace Drupal\comment\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to delete a node. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php index e52caa4..e30b7ca 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present the name of the last comment poster. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php index da21adf..dd85608 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\Date; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to display the newer of last comment / node updated. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php index e0b3f90..a88a3cf 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Display node comment status. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php index 6c0ee35..b991cc9 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Handler for showing comment module's node link. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php index fe24f52..efaeed6 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\Numeric; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to display the number of new comments. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php index 42a7590..7618bb9 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to allow linking to a user account or homepage. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php index 9b96a6a..bd0d70a 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\Date; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler for the newer of last comment / node updated. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php index 1eae8c9..30a0a7a 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter based on comment node status. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php index 32eae9c..b56cd38 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler to accept a user id to check for nodes that user posted or diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php index 7bafe53..fa9ab0a 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\row; use Drupal\system\Plugin\views\row\EntityRow; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php index cb39cd2..7ad1bf7 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\row; use Drupal\views\Plugin\views\row\RowPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php index de3511e..c7021b9 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Sort handler to sort by last comment name which might be in 2 different diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php index db4ddc8..3af22a9 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\Date; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Sort handler for the newer of last comment / node updated. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php index b562e85..8d28815 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Sort handler for ordering by thread. diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php index d079af4..c45efbd 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php @@ -8,7 +8,7 @@ namespace Drupal\comment\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php index 8690b2a..0114620 100644 --- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php @@ -8,7 +8,7 @@ namespace Drupal\config_test\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php b/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php index c2d456b..57601b7 100644 --- a/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php +++ b/core/modules/contact/lib/Drupal/contact/Plugin/Core/Entity/Category.php @@ -8,7 +8,7 @@ namespace Drupal\contact\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php index e6ce0ad..36c1fd4 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php +++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php @@ -7,7 +7,7 @@ namespace Drupal\contextual\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/widget/LegacyWidget.php b/core/modules/field/lib/Drupal/field/Plugin/field/widget/LegacyWidget.php index 166bd87..95f412a 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/field/widget/LegacyWidget.php +++ b/core/modules/field/lib/Drupal/field/Plugin/field/widget/LegacyWidget.php @@ -7,7 +7,7 @@ namespace Drupal\field\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\Core\Entity\EntityInterface; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php index f1b0d35..ec57ee1 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\argument\Numeric; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler for list field to show the human readable name in the diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php index 596d73e..ed1de13 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\argument\String; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler for list field to show the human readable name in the diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index 005eb14..55fa650 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A field that displays fieldapi fields. diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php index 6dbd16a..8ef220c 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php @@ -8,7 +8,7 @@ namespace Drupal\field\Plugin\views\filter; use Drupal\views\Plugin\views\filter\ManyToOne; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler which uses list-fields as options. diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php index 75ad533..8448e43 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\relationship\RelationshipPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A relationship handlers which reverse entity references. diff --git a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php b/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php index 388acd9..d28eaab 100644 --- a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php +++ b/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\email\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php b/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php index bb4e859..56c7f25 100644 --- a/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php +++ b/core/modules/field/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php @@ -7,7 +7,7 @@ namespace Drupal\email\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php index 29e4dbf..09e9378 100644 --- a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php +++ b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\number\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php index ac03e0e..048e9c2 100644 --- a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php +++ b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\number\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\number\Plugin\field\formatter\DefaultNumberFormatter; diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php index 3979de3..199c319 100644 --- a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php +++ b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\number\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\number\Plugin\field\formatter\DefaultNumberFormatter; diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php index 30e1f18..483abc1 100644 --- a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php +++ b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\number\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php index ecaf204..b177e5b 100644 --- a/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php +++ b/core/modules/field/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php @@ -7,7 +7,7 @@ namespace Drupal\number\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php index 6b34ba9..92f5cb4 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\text\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php index 0f7b615..cfea6b8 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\text\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php index 11f0c14..5f9f66f 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php @@ -7,7 +7,7 @@ */ namespace Drupal\text\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php index 349cf63..08052bd 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php @@ -7,7 +7,7 @@ */ namespace Drupal\text\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php index 17f80a0..9d607b3 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php @@ -7,7 +7,7 @@ namespace Drupal\text\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php index 373f1ed..e292a83 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php @@ -7,7 +7,7 @@ namespace Drupal\text\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php index e6b87b1..4fc4264 100644 --- a/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php +++ b/core/modules/field/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php @@ -7,7 +7,7 @@ namespace Drupal\text\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleKeyTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleKeyTestEntity.php index 683bc48..11723b8 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleKeyTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleKeyTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleTestEntity.php index b31258e..ee91584 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/BundleTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/CacheableTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/CacheableTestEntity.php index 12de950..d91f41c 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/CacheableTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/CacheableTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelCallbackTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelCallbackTestEntity.php index cddde9e..bab0bc4 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelCallbackTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelCallbackTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelTestEntity.php index 7e2bdb2..36f6a81 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/LabelTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/NoLabelTestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/NoLabelTestEntity.php index 4802e5e..dd1927f 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/NoLabelTestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/NoLabelTestEntity.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php index a5911e9..51c8f17 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Core/Entity/TestEntity.php @@ -8,7 +8,7 @@ namespace Drupal\field_test\Plugin\Core\Entity; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php index e1782a0..4609363 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php index 6be0e28..bca0395 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php index 34316c7..6796143 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php index 55471ba..293ef18 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php index 91f333a..95b3cf2 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php index 3ac1987..1d7f6e4 100644 --- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php +++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetNoDefault.php @@ -7,7 +7,7 @@ namespace Drupal\field_test\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php b/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php index bc54514..e0b789a 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/Core/Entity/File.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php index f3f89a9..10bb7f5 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php index 8032da7..16b872e 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php index c0d8683..77c5a37 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php index 1707dbb..fdecddc 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php b/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php index c0c8eb5..818cd19 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php +++ b/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php index 16de71b..886bf33 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php index 012b895..65a0f9c 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php index facf8a5..c90ee5f 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php @@ -8,7 +8,7 @@ namespace Drupal\file\Plugin\views\field; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php index 74cec34..fd424c9 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to add rendering MIME type images as an option on the filemime field. diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php index afb773a..56ba1df 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php index 78e07c0..91e7116 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to add rendering file paths as file URLs instead of as internal file URIs. diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php index 4a1c737..b6c7867 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php @@ -7,7 +7,7 @@ namespace Drupal\file\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; /** diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php index 00d451f..54f33e3 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php @@ -8,7 +8,7 @@ namespace Drupal\file\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php index 363fbd8..aa2b445 100644 --- a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php +++ b/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php @@ -8,7 +8,7 @@ namespace Drupal\image\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php b/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php index 76f73e1..de0503f 100644 --- a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php +++ b/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\image\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php b/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php index 35cb3fa..6d2083a 100644 --- a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php +++ b/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php @@ -7,7 +7,7 @@ namespace Drupal\image\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; use Drupal\file\Plugin\field\widget\FileWidget; diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php index 33a461e..44ebbe2 100644 --- a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php +++ b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php @@ -8,7 +8,7 @@ namespace Drupal\language\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Defines an argument handler to accept a language. diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php index 54725f0..3c2ca79 100644 --- a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php +++ b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php @@ -8,7 +8,7 @@ namespace Drupal\language\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Defines a field handler to translate a language into its readable form. diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php index 59a6764..5a5da1b 100644 --- a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php +++ b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php @@ -8,7 +8,7 @@ namespace Drupal\language\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Provides filtering by language. diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php index d954832..95abe27 100644 --- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php +++ b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/Display.php @@ -11,7 +11,7 @@ use Drupal\layout\Config\BoundDisplayInterface; use Drupal\layout\Config\UnboundDisplayInterface; use Drupal\layout\Plugin\LayoutInterface; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php index 5450e2c..712f014 100644 --- a/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php +++ b/core/modules/layout/lib/Drupal/layout/Plugin/Core/Entity/UnboundDisplay.php @@ -11,7 +11,7 @@ use Drupal\layout\Config\BoundDisplayInterface; use Drupal\layout\Config\UnboundDisplayInterface; use Drupal\layout\Plugin\LayoutInterface; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/layout/layout/StaticLayout.php b/core/modules/layout/lib/Drupal/layout/Plugin/layout/layout/StaticLayout.php index 3ded379..8db908b 100644 --- a/core/modules/layout/lib/Drupal/layout/Plugin/layout/layout/StaticLayout.php +++ b/core/modules/layout/lib/Drupal/layout/Plugin/layout/layout/StaticLayout.php @@ -10,7 +10,7 @@ use Drupal\Component\Plugin\Discovery\DiscoveryInterface; use Drupal\layout\Plugin\LayoutInterface; use Drupal\Component\Plugin\PluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @Plugin( diff --git a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php index 1fd8fc8..c7c340f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php index 1601302..ba037cd 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php index 17f53ef..1f128c6 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php index f521e9f..e85b6fa 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php index 1b75912..867d0ac 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php index 0a666c8..f4a832c 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php index a024118..598512c 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Date; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php index bda334d..f19676b 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler to accept a node id. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php index 1a11b22..00eb0a6 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\String; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler to accept a node type. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php index d93611e..5630b03 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\user\Plugin\views\argument\Uid; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler to accept a user id to check for nodes that diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php index d24c314..3136671 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler to accept a node revision id. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php index 690dd31..9e53ee8 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php index 4607e77..a2b8b63 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\argument_validator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php index 3617bc6..034eba8 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\node\Plugin\views\field\Node; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to display the marker for new content. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php index 3fb43fb..4d0ff3e 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\Node; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to translate a language into its readable form. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php index 83c489a..dc77691 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to the node. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php index 6a394ff..a1afd13 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\Link; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to delete a node. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php index bf27a9b..529244f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\Link; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link node edit. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php index b78e9f0..bc2302f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that allows linking to a node. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php index 1fca3d3..12bd6eb 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present the path to the node. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php index 163c9f3..da679fd 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\node\Plugin\views\field\Node; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A basic node_revision handler. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php index 0701234..fc56b2a 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php @@ -9,7 +9,7 @@ use Drupal\node\Plugin\views\field\Link; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to a node revision. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php index 2bb53f1..556bdd1 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\RevisionLink; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present link to delete a node revision. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php index 11e66ff..94b1dfb 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\RevisionLink; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to revert a node to a revision. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php index e444a2e..94955a1 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\field; use Drupal\node\Plugin\views\field\Node; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to translate a node type into its readable form. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php index af9c38a..eef38a4 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter by node_access records. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php index 57cb781..304afe2 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter for new content. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php index 49fdb97..6e284e0 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\FilterPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter by published status. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php index 87f7005..44eacb2 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Type.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter by node type. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php index f435e4d..8a4cb5f 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\filter; use Drupal\user\Plugin\views\filter\Name; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler to check for revisions a certain user has created. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php index e096fc2..5955fe8 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\row; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\system\Plugin\views\row\EntityRow; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php index 31dab0b..93254e5 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php @@ -7,7 +7,7 @@ namespace Drupal\node\Plugin\views\row; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\row\RowPluginBase; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index fec2bfe..ddc3ac5 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php index 9c5073f..0f41638 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php @@ -8,7 +8,7 @@ namespace Drupal\node\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php index 2710303..e7ccba0 100644 --- a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php +++ b/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php @@ -8,7 +8,7 @@ namespace Drupal\picture\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php index b371d48..37e0347 100644 --- a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php +++ b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php @@ -7,7 +7,7 @@ namespace Drupal\picture\Plugin\field\formatter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Formatter\FormatterBase; use Drupal\Core\Entity\EntityInterface; diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php index 5a1fe31..e35dfc4 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php @@ -7,7 +7,7 @@ namespace Drupal\rest\Plugin\rest\resource; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\rest\Plugin\ResourceBase; use Drupal\rest\ResourceResponse; diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php index 689fd84..5450910 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php @@ -7,7 +7,7 @@ namespace Drupal\rest\Plugin\rest\resource; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\Core\Entity\EntityStorageException; use Drupal\rest\Plugin\ResourceBase; diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php index 756b8de..354b0c1 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php @@ -8,7 +8,7 @@ namespace Drupal\search\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument that accepts query keys for search. diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php index 4db578b..4f7d6bf 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php @@ -8,7 +8,7 @@ namespace Drupal\search\Plugin\views\field; use Drupal\views\Plugin\views\field\Numeric; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that allows linking to a node. diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php index 8953c91..3c961b6 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php @@ -9,7 +9,7 @@ use Drupal\search\SearchQuery; use Drupal\views\Plugin\views\filter\FilterPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that allows linking to a node. diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php index 9bebc88..055d4aa 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php @@ -8,7 +8,7 @@ namespace Drupal\search\Plugin\views\row; use Drupal\views\Plugin\views\row\RowPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php index c871281..7ce047e 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php @@ -8,7 +8,7 @@ namespace Drupal\search\Plugin\views\sort; use Drupal\views\Plugin\views\sort\SortPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that allows linking to a node. diff --git a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php index c0fbea4..4043469 100644 --- a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php +++ b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Plugin/Core/Entity/EntityCacheTest.php @@ -8,7 +8,7 @@ namespace Drupal\entity_cache_test_dependency\Plugin\Core\Entity; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Defines the EntityCacheTest class. diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php index 9b4d368..25164dd 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTest.php @@ -8,7 +8,7 @@ namespace Drupal\entity_test\Plugin\Core\Entity; use Drupal\Core\Entity\EntityNG; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php index 5b8cfa8..fd3fb2f 100644 --- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php +++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php @@ -7,7 +7,7 @@ namespace Drupal\plugin_test\Plugin\plugin_test\fruit; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @Plugin( diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php index 621ac81..55f1d12 100644 --- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php +++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php @@ -7,7 +7,7 @@ namespace Drupal\plugin_test\Plugin\plugin_test\fruit; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php index 97e10ce..1352983 100644 --- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php +++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php @@ -7,7 +7,7 @@ namespace Drupal\plugin_test\Plugin\plugin_test\fruit; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @Plugin( diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php index b00ca39..02b8a36 100644 --- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php +++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php @@ -7,7 +7,7 @@ namespace Drupal\plugin_test\Plugin\plugin_test\fruit; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @Plugin( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php index 51468af..b6c1723 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Term.php @@ -9,7 +9,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php index 0ecbae8..a193461 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\Core\Entity; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php index 3f4d510..6cfee3a 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\field\widget; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\field\Plugin\Type\Widget\WidgetBase; diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php index 955f80b..0cbcadd 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\ManyToOne; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php index b5ab713..c43c69e 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler for taxonomy terms with depth. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php index 86608cb..c8aecf0 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler for to modify depth for a previous term. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php index 33a93d3..3106222 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\Numeric; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler for basic taxonomy tid. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php index c36e406..8557021 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyMachineName.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; use Drupal\views\Plugin\views\argument\String; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler to accept a vocabulary machine name. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php index f479f66..970d591 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php index e657ea6..84b3d78 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument_default; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php index 955be61..e2757cb 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\argument_validator; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase; diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php index 7f2319a..9dc6f68 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to show the language of a taxonomy term. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php index fcdd258..622a213 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a term edit link. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php index ec56116..f4ee9bd 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that allows linking to a taxonomy diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php index 9c75368..2e4e64d 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\PrerenderList; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to display all taxonomy terms of a node. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index fa8f3de..0bcc633 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\filter; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php index e8cee6a..6329e85 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler for taxonomy terms with depth. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php index 8be71e6..22ef40a 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyMachineName.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php index 1264319..a60c475 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/VocabularyVid.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\InOperator; /** diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php index ab2021a..cf1f4f3 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\relationship\RelationshipPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Relationship handler to return the taxonomy terms of nodes. diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php index 984f533..615d222 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php index dbedf89..0298d0c 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/User.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\Core\Entity; use Drupal\Core\Entity\Entity; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php index 571a255..5b4004d 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\access; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\access\AccessPluginBase; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php index 2a07d79..ee391b0 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\access; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\access\AccessPluginBase; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php index 634307e..83712d4 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\ManyToOne; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php index 02341c1..bbcbccf 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\argument\Numeric; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php index 8ba91b5..4d27b49 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php index 70daaa7..360ec9d 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php index a31b0af..88dc5a2 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\argument_validator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php index 3fb9b23..d0ca31a 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views field handler for user language. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php index c7f0561..13b42d8 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to the user. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php index d1ce197..adbcb0e 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to user cancel. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php index 4d85c7f..a990ba0 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to present a link to user edit. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php index 713d42a..7c4aec1 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php index 5b7a101..fb66b37 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\views\field; use Drupal\user\Plugin\views\field\User; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php index 98cb021..0d04a89 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\PrerenderList; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php index 8446fac..442eb0e 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Picture.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php index 947175a..f5a8590 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\field\PrerenderList; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php index b958d3e..dd890fc 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php index b24e658..f5cce3f 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\filter\BooleanOperator; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php index b12eb07..636815c 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\views\filter; use Drupal\views\Plugin\views\filter\InOperator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler for usernames. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php index 7f26db9..cf71ac2 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php index 8ee3569..d61bac2 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php @@ -7,7 +7,7 @@ namespace Drupal\user\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\Plugin\views\filter\ManyToOne; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php index b7d1de0..e25d1fb 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\views\row; use Drupal\system\Plugin\views\row\EntityRow; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php index 9a334c1..24a787e 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php @@ -8,7 +8,7 @@ namespace Drupal\user\Plugin\views\wizard; use Drupal\views\Plugin\views\wizard\WizardPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php index 29be1f6..88748c6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php @@ -11,7 +11,7 @@ use Drupal\views_ui\ViewUI; use Drupal\views\ViewStorageInterface; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php index 923598c..55e1c80 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\access; use Drupal\Core\Annotation\Translation; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Access plugin that provides no access control at all. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php index a7d00c9..772304c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A special handler to take the place of missing or broken handlers. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php index 11a5f94..e4d11bd 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views area handler to display some configurable result summary. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php index 0671ec4..ae7c7b9 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views area text handler. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php index a270006..410e0df 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views area text handler. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php index b0402c4..83dfcba 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views area title override handler. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php index 1da8146..ac611ef 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\area; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Views area handlers. Insert a view inside of an area. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php index d08cda3..02cbcf7 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A special handler to take the place of missing or broken handlers. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php index ce3f52f..54d0d73 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Abstract argument handler for dates. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php index 4c0865f..8eaec41 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php index 16976d3..72fbfed 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Simple handler for arguments using group by. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php index b0807ad..985a4aa 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\argument; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ManyToOneHelper; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php index 6097b00..33a47bd 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Argument handler that ignores the argument. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php index 3972b4d..c694400 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Basic argument handler for arguments that are numeric. Incorporates diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php index d7dafb3..16a4448 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the base argument plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php index 59148de..dbdbb4e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\ManyToOneHelper; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Basic argument handler to implement string arguments that may have length diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php index 977a01c..fcdda9d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Php.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Php.php index 7dc3a56..cf5a574 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Php.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Php.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php index 636e3f3..a2a6290 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_default; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php index f15fc11..7a63069 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_validator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php index fae745d..6db339e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_validator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php index 798533f..9b23895 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Php.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\argument_validator; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php index eed62c6..f510248 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\cache; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php index aae760d..537c40e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\cache; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php index a0f6a2f..17f6bdd 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php index c739973..c35ffa4 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php index bb35995..b004963 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php index 7c89f90..88caf0a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php @@ -10,7 +10,7 @@ use Drupal\views\ViewExecutable; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php index 889a14f..6e9aac4 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Drupal\Core\Annotation\Translation; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php index b8faf98..69cfb2f 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\display_extender; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php index f850d89..d422867 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\exposed_form; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php index 3baebe0..3afcabc 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\exposed_form; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php index 5a9ae65..ae1bf04 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\field; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A handler to provide proper displays for booleans. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php index f131f25..251abd7 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A special handler to take the place of missing or broken handlers. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php index 9d27f06..a30a469 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to show a counter of the current row. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php index 6c10baa..4f0050d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A handler to provide a field that is completely custom by the administrator. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php index dd5f2fa..72a0d25 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A handler to provide proper displays for dates. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index 8d6fe06..4b17e9d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\HandlerBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @defgroup views_field_handlers Views field handlers diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php index e52f134..9c35a18 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Render a numeric value as a size. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php index 14a81c9..6e7e7ba 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler whichs allows to show machine name content as human name. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php index d82a529..4adc67e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php index fc06d72..12e61a2 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Render a field as a numeric value diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php index 90b91e8..306fe89 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide a list of items. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php index 1598a8a..a1ffcf1 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to show data of serialized fields. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php index 52e7b5c..9b4c862 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the base field plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php index ff53056..796efac 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A handler to provide proper displays for time intervals. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php index 8a0183d..b30e3ec 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Field handler to provide simple renderer that turns a URL into a clickable link. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php index 3d06bb9..5fa8c31 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A handler to run a field through simple XSS filtering. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php index dcf6df3..2dfa090 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php index f26e245..2e6f467 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Simple filter to handle matching of boolean values. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php index 02eb9a5..7285a03 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php index c43d5b3..18f2262 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter handler which allows to search on multiple fields. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php index d8f4c29..ae01e3b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Filter to handle dates stored as a timestamp. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php index c357801..541fca4 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Simple filter to handle equal to / not equal to filters diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php index 6b32ca3..608b817 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\filter; use Drupal\views\Plugin\views\HandlerBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php index c0118b6..559b183 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Simple filter to handle greater than/less than filters diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php index f3ae1d7..1012575 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php index d3ff72c..2e8802b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php @@ -9,7 +9,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\ManyToOneHelper; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Complex filter to handle filtering for many to one relationships, diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php index 3e5c9db..e6b27cf 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\filter; use Drupal\Core\Database\Database; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Simple filter to handle greater than/less than filters diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php index e86dc12..4baee72 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the base filter plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php index ed59742..be3e132 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\filter; use Drupal\Core\Database\Database; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Basic textfield filter to handle string filtering commands diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php index ba54cc4..323d339 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\join; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the join plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php index 913c866..6ce08cd 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php @@ -6,7 +6,7 @@ */ namespace Drupal\views\Plugin\views\join; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Component\Plugin\Discovery\DiscoveryInterface; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php index f99eabe..35e13b0 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\pager; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php index 4783b2a..972d107 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\pager; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php index 7d6ec89..bb7a021 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\pager; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php index a917ed6..e6e5f76 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\pager; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index 103ea43..e42858f 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -12,7 +12,7 @@ use Drupal\Core\Database\DatabaseExceptionWrapper; use Drupal\views\Plugin\views\join\JoinPluginBase; use Drupal\views\Plugin\views\HandlerBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php index e5831b6..afddb4a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\relationship; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A special handler to take the place of missing or broken handlers. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php index f3a1f4d..39407f7 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php @@ -9,7 +9,7 @@ use Drupal\Core\Database\Query\AlterableInterface; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Relationship handler that allows a groupwise maximum of the linked in table. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php index f1641aa..1193a05 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php @@ -10,7 +10,7 @@ use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\HandlerBase; use Drupal\views\Join; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @defgroup views_relationship_handlers Views relationship handlers diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php index 592c6f2..9cd47e5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\relationship; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the base relationship plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php index 842162b..0cf32c5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\row; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php index 4a7a1e4..e944f23 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\row; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php index 4080a04..25ab695 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * A special handler to take the place of missing or broken handlers. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php index a00e3d8..072aea6 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Basic sort handler for dates. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php index e52bc06..bbfbab8 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\views\ViewExecutable; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php index 0b74348..fff7c2d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php index 8a53170..66792b5 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Handle a random sort. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php index 17f1a5f..a5c2149 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\sort; use Drupal\views\Plugin\views\HandlerBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * @defgroup views_sort_handlers Views sort handlers diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php index d5767fe..038d47c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\sort; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Default implementation of the base sort plugin. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php index 17c4abd..cbaa5f2 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php index 5cb448f..d24f10e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\style; use Drupal\views\Plugin\views\style\StylePluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php index 0cfaa2d..833cbfa 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php index a9ca9fd..b852fae 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php index e4d1e96..6f41837 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php index ee8081d..dd0660d 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php @@ -9,7 +9,7 @@ use Drupal\views\Plugin\views\PluginBase; use Drupal\views\Plugin\views\wizard\WizardInterface; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\ViewExecutable; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php index 5a3e907..8ab0337 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php @@ -8,7 +8,7 @@ namespace Drupal\views\Plugin\views\style; use Drupal\views\Plugin\views\wizard\WizardInterface; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php index d5ed76f..d392749 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php @@ -7,7 +7,7 @@ namespace Drupal\views\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php index d8d0b83..b153c93 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\access; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\access\AccessPluginBase; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php index 5f5770c..398e8d7 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\access; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\access\AccessPluginBase; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php index 78efe64..fe1bac1 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\area; use Drupal\views\Plugin\views\area\AreaPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; /** * Test area plugin. diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php index c29fc8d..ba706bb 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\argument_default; use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php index 46398ab..bc20849 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\display; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php index 1cc7ef5..eb03c8b 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\display; use Drupal\views\Plugin\views\display\DisplayPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php index 63c9f6d..82a212d 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\display_extender; use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php index aa83221..0439c25 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\display_extender; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php index 929d9a4..73c4779 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\field; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php index fa92dc2..6868262 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\filter; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\filter\FilterPluginBase; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php index 5d0cb73..1cb633c 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php @@ -8,7 +8,7 @@ namespace Drupal\views_test_data\Plugin\views\join; use Drupal\views\Plugin\views\join\JoinPluginBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php index 4ee2a48..a058bb3 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php @@ -10,7 +10,7 @@ use Drupal\views\Plugin\views\query\QueryPluginBase; use Drupal\views\Plugin\views\join\JoinPluginBase; use Drupal\views\ViewExecutable; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; /** diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php index 771ac8f..d12eaaf 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\row; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\row\RowPluginBase; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php index 2336d04..b73c367 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/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\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\field\Numeric; diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php index 59dc396..ec1d2ba 100644 --- a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php +++ b/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php @@ -7,7 +7,7 @@ namespace Drupal\views_test_data\Plugin\views\style; -use Drupal\Core\Annotation\Plugin; +use Drupal\Component\Annotation\Plugin; use Drupal\Core\Annotation\Translation; use Drupal\views\Plugin\views\style\StylePluginBase;