Commit 13bd2b25 authored by catch's avatar catch
Browse files

Issue #1849752 by effulgentsia, Berdir, jibran, neclimdul: Abstract...

Issue #1849752 by effulgentsia, Berdir, jibran, neclimdul: Abstract non-Drupal-specific parts of AnnotatedClassDiscovery into a Drupal\Component base class.
parent 62e136a3
<?php
/**
* @file
* Definition of Drupal\Core\Annotation\Plugin.
*/
namespace Drupal\Core\Annotation;
use Drupal\Component\Annotation\Plugin as ComponentPlugin;
/**
* Defines a Plugin annotation object.
*
* @Annotation
*/
class Plugin extends ComponentPlugin {
}
......@@ -42,7 +42,7 @@ function __construct($owner, $type, array $root_namespaces = array()) {
foreach ($root_namespaces as $namespace => $dir) {
$plugin_namespaces["$namespace\\Plugin\\{$owner}\\{$type}"] = array($dir);
}
parent::__construct($plugin_namespaces, $annotation_namespaces, 'Drupal\Core\Annotation\Plugin');
parent::__construct($plugin_namespaces, $annotation_namespaces);
}
}
......@@ -8,7 +8,7 @@
namespace Drupal\Core\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
......
......@@ -8,7 +8,7 @@
namespace Drupal\Core\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
......
......@@ -7,7 +7,7 @@
namespace Drupal\Core\Plugin\Validation\Constraint;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Length;
......
......@@ -7,7 +7,7 @@
namespace Drupal\Core\Plugin\Validation\Constraint;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Type as SymfonyConstraint;
......
......@@ -7,7 +7,7 @@
namespace Drupal\Core\Plugin\Validation\Constraint;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Range;
......
......@@ -7,7 +7,7 @@
namespace Drupal\action\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\system\Plugin\views\field\BulkFormBase;
/**
......
......@@ -9,7 +9,7 @@
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -9,7 +9,7 @@
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -9,7 +9,7 @@
use Drupal\aggregator\Plugin\FetcherInterface;
use Drupal\aggregator\Plugin\Core\Entity\Feed;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Guzzle\Http\Exception\BadResponseException;
......
......@@ -8,7 +8,7 @@
namespace Drupal\aggregator\Plugin\block\block;
use Drupal\block\BlockBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -8,7 +8,7 @@
namespace Drupal\aggregator\Plugin\block\block;
use Drupal\block\BlockBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -9,7 +9,7 @@
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityNG;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -8,7 +8,7 @@
namespace Drupal\custom_block\Plugin\Core\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -8,7 +8,7 @@
namespace Drupal\custom_block\Plugin\block\block;
use Drupal\block\BlockBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -8,7 +8,7 @@
namespace Drupal\block\Plugin\Core\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
use Drupal\Component\Plugin\Exception\PluginException;
......
......@@ -7,7 +7,7 @@
namespace Drupal\block\Plugin\system\plugin_ui;
use Drupal\system\Plugin\PluginUIBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
......@@ -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;
......
......@@ -8,7 +8,7 @@
namespace Drupal\block_test\Plugin\block\block;
use Drupal\block\BlockBase;
use Drupal\Core\Annotation\Plugin;
use Drupal\Component\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment