From 8e30a345571d0778da841677804d0aa4b3ed7bc1 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Wed, 9 Oct 2013 15:52:39 +0300 Subject: [PATCH] Issue #2108077 by claudiu.cristea: ImageToolkit annotation object left under system module. x --- .../Drupal/Core/ImageToolkit}/Annotation/ImageToolkit.php | 4 ++-- core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php | 2 +- .../system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php | 2 -- .../lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php | 3 --- .../lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) rename core/{modules/system/lib/Drupal/system => lib/Drupal/Core/ImageToolkit}/Annotation/ImageToolkit.php (84%) diff --git a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php similarity index 84% rename from core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php rename to core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php index 0a75e97..4615847 100644 --- a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php +++ b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkit.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Annotation\ImageToolkit. + * Contains \Drupal\Core\ImageToolkit\Annotation\ImageToolkit. */ -namespace Drupal\system\Annotation; +namespace Drupal\Core\ImageToolkit\Annotation; use Drupal\Component\Annotation\Plugin; diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php index 9dd46d4..96b3ed8 100644 --- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php +++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php @@ -38,7 +38,7 @@ class ImageToolkitManager extends DefaultPluginManager { * The config factory. */ public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ConfigFactory $config_factory) { - parent::__construct('Plugin/ImageToolkit', $namespaces, 'Drupal\system\Annotation\ImageToolkit'); + parent::__construct('Plugin/ImageToolkit', $namespaces, 'Drupal\Core\ImageToolkit\Annotation\ImageToolkit'); $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit'); $this->configFactory = $config_factory; diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php index fa8fe41..737ad27 100644 --- a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php @@ -8,8 +8,6 @@ namespace Drupal\system\Plugin\ImageToolkit; use Drupal\Core\Plugin\PluginBase; -use Drupal\system\Annotation\ImageToolkit; -use Drupal\Core\Annotation\Translation; use Drupal\Core\Image\ImageInterface; use Drupal\Core\ImageToolkit\ImageToolkitInterface; diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php index ff63957..e5ead27 100644 --- a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php +++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php @@ -7,9 +7,6 @@ namespace Drupal\image_test\Plugin\ImageToolkit; -use Drupal\system\Annotation\ImageToolkit; -use Drupal\Core\Annotation\Translation; - /** * Defines a Test toolkit for image manipulation within Drupal. * diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php index 726384d..43800617 100644 --- a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php +++ b/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php @@ -8,8 +8,6 @@ namespace Drupal\image_test\Plugin\ImageToolkit; use Drupal\Core\Plugin\PluginBase; -use Drupal\system\Annotation\ImageToolkit; -use Drupal\Core\Annotation\Translation; use Drupal\Core\Image\ImageInterface; use Drupal\Core\ImageToolkit\ImageToolkitInterface; -- 1.8.3.1