diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 169c785..13e5b52 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -237,6 +237,9 @@ Filter module Forum module - Lee Rowlands 'larowlan' http://drupal.org/user/395439 +Hypertext Application Language (HAL) module +- Lin Clark 'linclark' http://drupal.org/user/396253 + Help module - ? diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php index e06c2b9..0613d2a 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php @@ -71,11 +71,8 @@ public function normalize($entity, $format = NULL, array $context = array()) { * The entity URI. */ protected function getEntityUri($entity) { - // @todo Remove this conditional once entities are converted to EntityNG. - if ($entity instanceof EntityNG) { - $uri_info = $entity->uri(); - return url($uri_info['path'], array('absolute' => TRUE)); - } + $uri_info = $entity->uri(); + return url($uri_info['path'], array('absolute' => TRUE)); } } diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php index 5cd49ce..224586d 100644 --- a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php +++ b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php @@ -9,7 +9,6 @@ use Drupal\Core\Language\Language; use Drupal\simpletest\DrupalUnitTestBase; -use Drupal\Core\DependencyInjection\ContainerBuilder; /** * Test the HAL normalizer. diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php b/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php index 2de3dfb..78f5d7e 100644 --- a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php +++ b/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php @@ -7,8 +7,6 @@ namespace Drupal\rest\LinkManager; -use Drupal\Core\Cache\CacheBackendInterface; - class RelationLinkManager implements RelationLinkManagerInterface{ /** diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php index b1f075c..7988bfe 100644 --- a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php +++ b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php @@ -7,8 +7,6 @@ namespace Drupal\rest\LinkManager; -use Drupal\Core\Cache\CacheBackendInterface; - class TypeLinkManager implements TypeLinkManagerInterface { /**