Commit b32acef5 authored by Milan Golubovic's avatar Milan Golubovic Committed by Lio Novelli
Browse files

Issue #3299722 by golubovicm, useernamee: PHPStan reports 2 static code issues

parent 7bee8a4f

src/Plugin/simple_sitemap/UrlGenerator/ExtendedEntityUrlGenerator.php

+27 −4
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Drupal\simple_sitemap_extensions\Plugin\simple_sitemap\UrlGenerator; 


use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;

use Drupal\Core\Entity\ContentEntityInterface;

use Drupal\Core\Config\ConfigFactory;

use Drupal\Core\Entity\EntityInterface;

use Drupal\Core\Entity\EntityTypeManagerInterface;

use Drupal\Core\Entity\FieldableEntityInterface;
@@ -12,6 +13,7 @@ use Drupal\Core\Field\EntityReferenceFieldItemListInterface; 
use Drupal\Core\Language\LanguageManagerInterface;

use Drupal\file\Entity\File;

use Drupal\file\Plugin\Field\FieldType\FileFieldItemList;

use Drupal\Core\File\FileUrlGenerator;

use Drupal\simple_sitemap\EntityHelper;

use Drupal\simple_sitemap\Logger;

use Drupal\simple_sitemap\Plugin\simple_sitemap\UrlGenerator\EntityUrlGenerator;
@@ -41,6 +43,21 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
   */

  protected $moduleHandler;



  /**

   * Config factory.

   *

   * @var \Drupal\Core\Config\ConfigFactory

   */

  protected $configFactory;





  /**

   * File url generator.

   *

   * @var \Drupal\Core\File\FileUrlGenerator

   */

  protected $fileUrlGenerator;



    /**

   * {@inheritDoc}

   */
@@ -55,7 +72,9 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
    EntityHelper $entityHelper,

    UrlGeneratorManager $url_generator_manager,

    MemoryCacheInterface $memory_cache,

    ModuleHandlerInterface $module_handler

    ModuleHandlerInterface $module_handler,

    ConfigFactory $configFactory,

    FileUrlGenerator $fileUrlGenerator

  ) {

    parent::__construct(

      $configuration,
@@ -70,6 +89,8 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
      $memory_cache

    );

    $this->moduleHandler = $module_handler;

    $this->configFactory = $configFactory;

    $this->fileUrlGenerator = $fileUrlGenerator;

  }



  /**
@@ -91,7 +112,9 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
      $container->get('simple_sitemap.entity_helper'),

      $container->get('plugin.manager.simple_sitemap.url_generator'),

      $container->get('entity.memory_cache'),

      $container->get('module_handler')

      $container->get('module_handler'),

      $container->get('config.factory'),

      $container->get('file_url_generator')

    );

  }
@@ -168,7 +191,7 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
   * {@inheritDoc}

   */

  protected function getEntityImageData(ContentEntityInterface $entity) {

    $image_paths = \Drupal::configFactory()->get('simple_sitemap_extensions.extended_entity.image_paths')->get();

    $image_paths = $this->configFactory->get('simple_sitemap_extensions.extended_entity.image_paths')->get();

    if (empty($image_paths[$entity->getEntityTypeId()][$entity->bundle()])) {

      return parent::getEntityImageData($entity);

    }
@@ -245,7 +268,7 @@ class ExtendedEntityUrlGenerator extends EntityUrlGenerator { 
    foreach ($field->getValue() as $value) {

      $id = $value['target_id'];

      $image_data[$id] = [

        'path' => file_create_url(File::load($value['target_id'])->getFileUri()),

        'path' => $this->fileUrlGenerator->generateAbsoluteString(File::load($value['target_id'])->getFileUri()),

        'alt' => $value['alt'],

        'title' => $value['title'],

      ];