Unverified Commit 5ca1c882 authored by Dave Reid's avatar Dave Reid Committed by Dave Reid
Browse files

Issue #3002577 by Dave Reid: Fixed coding standards in XmlSitemapListBuilder.

parent c1c56549
...@@ -4,12 +4,12 @@ namespace Drupal\xmlsitemap; ...@@ -4,12 +4,12 @@ namespace Drupal\xmlsitemap;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder; use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityStorageInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Drupal\core\Language\LanguageInterface; use Drupal\core\Language\LanguageInterface;
use Drupal\Core\Language\LanguageManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
* Provides a listing of XmlSitemap. * Provides a listing of XmlSitemap.
...@@ -53,7 +53,10 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder { ...@@ -53,7 +53,10 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder {
*/ */
public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) { public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
return new static( return new static(
$entity_type, $container->get('entity.manager')->getStorage($entity_type->id()), $container->get('module_handler'), $container->get('language_manager') $entity_type,
$container->get('entity.manager')->getStorage($entity_type->id()),
$container->get('module_handler'),
$container->get('language_manager')
); );
} }
...@@ -81,16 +84,17 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder { ...@@ -81,16 +84,17 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function buildRow(EntityInterface $entity) { public function buildRow(EntityInterface $entity) {
$row['label'] = $this->getLabel($entity); /** @var \Drupal\xmlsitemap\XmlSitemapInterface $entity */
$row['label'] = $entity->label();
if ($this->moduleHandler->moduleExists('language')) { if ($this->moduleHandler->moduleExists('language')) {
if (isset($entity->context['language'])) { if (isset($entity->getContext()['language'])) {
$language = $this->languageManager->getLanguage($entity->context['language']); $language = $this->languageManager->getLanguage($entity->getContext()['language']);
// In some cases ::getLanguage() can return NULL value. // In some cases ::getLanguage() can return NULL value.
if (!is_null($language) && ($language instanceof LanguageInterface)) { if (!is_null($language) && ($language instanceof LanguageInterface)) {
$row['language'] = $language->getName(); $row['language'] = $language->getName();
} }
else { else {
\Drupal::logger('xmlsitemap')->error('Can\'t determine language for entity with @id', array('@id' => $entity->id())); \Drupal::logger('xmlsitemap')->notice('Cannot determine language for sitemap @id', ['@id' => $entity->id()]);
// Set as default row value. // Set as default row value.
$row['language'] = $this->t('Undefined'); $row['language'] = $this->t('Undefined');
} }
...@@ -108,10 +112,13 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder { ...@@ -108,10 +112,13 @@ class XmlSitemapListBuilder extends ConfigEntityListBuilder {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getOperations(EntityInterface $entity) { public function getOperations(EntityInterface $entity) {
/** @var \Drupal\xmlsitemap\XmlSitemapInterface $entity */
$operations = parent::getOperations($entity); $operations = parent::getOperations($entity);
if (isset($operations['translate'])) { if (isset($operations['translate'])) {
unset($operations['translate']); unset($operations['translate']);
} }
return $operations; return $operations;
} }
......
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