From cf8af65cc3c12b9528817cce14119ab58c64dba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20St=C3=B6ckler?= <tobiasstoeckler@googlemail.com>
Date: Wed, 1 Jun 2016 20:35:23 +0200
Subject: [PATCH] by tstoeckler: Rename the LibraryType sub-namespace to just
Type
---
libraries.services.yml | 2 +-
src/ExternalLibrary/LibraryManager.php | 4 ++--
.../LibraryCreationListenerInterface.php | 7 +------
.../LibraryLoadingListenerInterface.php | 7 +------
.../{LibraryType => Type}/LibraryTypeFactory.php | 4 ++--
.../{LibraryType => Type}/LibraryTypeInterface.php | 8 +-------
.../{LibraryType => Type}/AssetLibraryType.php | 11 +++--------
.../{LibraryType => Type}/PhpFileLibraryType.php | 13 ++++---------
8 files changed, 15 insertions(+), 41 deletions(-)
rename src/ExternalLibrary/{LibraryType => Type}/LibraryCreationListenerInterface.php (72%)
rename src/ExternalLibrary/{LibraryType => Type}/LibraryLoadingListenerInterface.php (72%)
rename src/ExternalLibrary/{LibraryType => Type}/LibraryTypeFactory.php (85%)
rename src/ExternalLibrary/{LibraryType => Type}/LibraryTypeInterface.php (77%)
rename src/Plugin/libraries/{LibraryType => Type}/AssetLibraryType.php (89%)
rename src/Plugin/libraries/{LibraryType => Type}/PhpFileLibraryType.php (89%)
diff --git a/libraries.services.yml b/libraries.services.yml
index 18d36ca..d331c67 100644
--- a/libraries.services.yml
+++ b/libraries.services.yml
@@ -10,7 +10,7 @@ services:
arguments: ['@serialization.yaml']
plugin.manager.libraries.library_type:
- class: Drupal\libraries\ExternalLibrary\LibraryType\LibraryTypeFactory
+ class: Drupal\libraries\ExternalLibrary\Type\LibraryTypeFactory
parent: default_plugin_manager
plugin.manager.libraries.locator:
class: Drupal\libraries\ExternalLibrary\Local\LocatorManager
diff --git a/src/ExternalLibrary/LibraryManager.php b/src/ExternalLibrary/LibraryManager.php
index 6cfef1d..4f7062d 100644
--- a/src/ExternalLibrary/LibraryManager.php
+++ b/src/ExternalLibrary/LibraryManager.php
@@ -9,8 +9,8 @@ namespace Drupal\libraries\ExternalLibrary;
use Drupal\Component\Plugin\Factory\FactoryInterface;
use Drupal\libraries\Extension\ExtensionHandlerInterface;
use Drupal\libraries\ExternalLibrary\Exception\LibraryTypeNotFoundException;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryCreationListenerInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryLoadingListenerInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryCreationListenerInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryLoadingListenerInterface;
use Drupal\libraries\ExternalLibrary\Definition\DefinitionDiscoveryInterface;
/**
diff --git a/src/ExternalLibrary/LibraryType/LibraryCreationListenerInterface.php b/src/ExternalLibrary/Type/LibraryCreationListenerInterface.php
similarity index 72%
rename from src/ExternalLibrary/LibraryType/LibraryCreationListenerInterface.php
rename to src/ExternalLibrary/Type/LibraryCreationListenerInterface.php
index 252efd4..031e505 100644
--- a/src/ExternalLibrary/LibraryType/LibraryCreationListenerInterface.php
+++ b/src/ExternalLibrary/Type/LibraryCreationListenerInterface.php
@@ -1,11 +1,6 @@
<?php
-/**
- * @file
- * Contains \Drupal\libraries\ExternalLibrary\LibraryType\LibraryCreationListenerInterface.
- */
-
-namespace Drupal\libraries\ExternalLibrary\LibraryType;
+namespace Drupal\libraries\ExternalLibrary\Type;
use Drupal\libraries\ExternalLibrary\LibraryInterface;
diff --git a/src/ExternalLibrary/LibraryType/LibraryLoadingListenerInterface.php b/src/ExternalLibrary/Type/LibraryLoadingListenerInterface.php
similarity index 72%
rename from src/ExternalLibrary/LibraryType/LibraryLoadingListenerInterface.php
rename to src/ExternalLibrary/Type/LibraryLoadingListenerInterface.php
index dc3dfbe..8ab4e1a 100644
--- a/src/ExternalLibrary/LibraryType/LibraryLoadingListenerInterface.php
+++ b/src/ExternalLibrary/Type/LibraryLoadingListenerInterface.php
@@ -1,11 +1,6 @@
<?php
-/**
- * @file
- * Contains \Drupal\libraries\ExternalLibrary\LibraryType\LibraryLoadingListenerInterface.
- */
-
-namespace Drupal\libraries\ExternalLibrary\LibraryType;
+namespace Drupal\libraries\ExternalLibrary\Type;
use Drupal\libraries\ExternalLibrary\LibraryInterface;
diff --git a/src/ExternalLibrary/LibraryType/LibraryTypeFactory.php b/src/ExternalLibrary/Type/LibraryTypeFactory.php
similarity index 85%
rename from src/ExternalLibrary/LibraryType/LibraryTypeFactory.php
rename to src/ExternalLibrary/Type/LibraryTypeFactory.php
index dff4668..cc12adb 100644
--- a/src/ExternalLibrary/LibraryType/LibraryTypeFactory.php
+++ b/src/ExternalLibrary/Type/LibraryTypeFactory.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\libraries\ExternalLibrary\LibraryType;
+namespace Drupal\libraries\ExternalLibrary\Type;
use Drupal\Component\Plugin\Factory\FactoryInterface;
use Drupal\Core\Cache\CacheBackendInterface;
@@ -25,7 +25,7 @@ class LibraryTypeFactory extends DefaultPluginManager {
* The module handler to invoke the alter hook with.
*/
public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
- parent::__construct('Plugin/libraries/LibraryType', $namespaces, $module_handler, LibraryTypeInterface::class, LibraryType::class);
+ parent::__construct('Plugin/libraries/Type', $namespaces, $module_handler, LibraryTypeInterface::class, LibraryType::class);
// @todo Document this hook.
$this->alterInfo('libraries_library_type_info');
$this->setCacheBackend($cache_backend, 'libraries_library_type_info');
diff --git a/src/ExternalLibrary/LibraryType/LibraryTypeInterface.php b/src/ExternalLibrary/Type/LibraryTypeInterface.php
similarity index 77%
rename from src/ExternalLibrary/LibraryType/LibraryTypeInterface.php
rename to src/ExternalLibrary/Type/LibraryTypeInterface.php
index 87ecfe5..fba127f 100644
--- a/src/ExternalLibrary/LibraryType/LibraryTypeInterface.php
+++ b/src/ExternalLibrary/Type/LibraryTypeInterface.php
@@ -1,12 +1,6 @@
<?php
-/**
- * @file
- * Contains \Drupal\libraries\ExternalLibrary\LibraryType\LibraryTypeInterface.
- */
-
-namespace Drupal\libraries\ExternalLibrary\LibraryType;
-
+namespace Drupal\libraries\ExternalLibrary\Type;
/**
* Provides an interface for library types.
diff --git a/src/Plugin/libraries/LibraryType/AssetLibraryType.php b/src/Plugin/libraries/Type/AssetLibraryType.php
similarity index 89%
rename from src/Plugin/libraries/LibraryType/AssetLibraryType.php
rename to src/Plugin/libraries/Type/AssetLibraryType.php
index ac5c3c9..b2dbed9 100644
--- a/src/Plugin/libraries/LibraryType/AssetLibraryType.php
+++ b/src/Plugin/libraries/Type/AssetLibraryType.php
@@ -1,18 +1,13 @@
<?php
-/**
- * @file
- * Contains \Drupal\libraries\Plugin\libraries\LibraryType\AssetLibraryType.
- */
-
-namespace Drupal\libraries\Plugin\libraries\LibraryType;
+namespace Drupal\libraries\Plugin\libraries\Type;
use Drupal\Component\Plugin\Factory\FactoryInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\libraries\ExternalLibrary\Asset\AssetLibrary;
use Drupal\libraries\ExternalLibrary\LibraryInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryCreationListenerInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryTypeInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryCreationListenerInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryTypeInterface;
use Drupal\libraries\ExternalLibrary\Local\LocalLibraryInterface;
use Drupal\libraries\ExternalLibrary\Utility\IdAccessorTrait;
use Drupal\libraries\ExternalLibrary\Version\VersionedLibraryInterface;
diff --git a/src/Plugin/libraries/LibraryType/PhpFileLibraryType.php b/src/Plugin/libraries/Type/PhpFileLibraryType.php
similarity index 89%
rename from src/Plugin/libraries/LibraryType/PhpFileLibraryType.php
rename to src/Plugin/libraries/Type/PhpFileLibraryType.php
index 0575e9c..61ccf25 100644
--- a/src/Plugin/libraries/LibraryType/PhpFileLibraryType.php
+++ b/src/Plugin/libraries/Type/PhpFileLibraryType.php
@@ -1,18 +1,13 @@
<?php
-/**
- * @file
- * Contains \Drupal\libraries\Plugin\libraries\LibraryType\PhpFileLibraryType.
- */
-
-namespace Drupal\libraries\Plugin\libraries\LibraryType;
+namespace Drupal\libraries\Plugin\libraries\Type;
use Drupal\Component\Plugin\Factory\FactoryInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\libraries\ExternalLibrary\LibraryInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryCreationListenerInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryLoadingListenerInterface;
-use Drupal\libraries\ExternalLibrary\LibraryType\LibraryTypeInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryCreationListenerInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryLoadingListenerInterface;
+use Drupal\libraries\ExternalLibrary\Type\LibraryTypeInterface;
use Drupal\libraries\ExternalLibrary\PhpFile\PhpFileLibrary;
use Drupal\libraries\ExternalLibrary\PhpFile\PhpFileLoaderInterface;
use Drupal\libraries\ExternalLibrary\Utility\IdAccessorTrait;
--
GitLab