Commit 958492c6 authored by Fabian de Rijk's avatar Fabian de Rijk
Browse files

Issue #3270126: The service "o365_groups.files" has a dependency on a... 

Issue #3270126: The service "o365_groups.files" has a dependency on a non-existent service "o365.extension_type"
parent ee446224

modules/o365_groups/o365_groups.services.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ services: 
      - { name: access_check, applies_to: _o365_groups_files_access }

  o365_groups.files:

    class: Drupal\o365_groups\GroupFilesService

    arguments: ['@o365.graph', '@o365.extension_type']
 
    arguments: ['@o365.graph']

modules/o365_groups/src/Controller/O365GroupsFilesController.php

+11 −13
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ use Drupal\Core\Link; 
use Drupal\Core\StringTranslation\TranslatableMarkup;

use Drupal\Core\Url;

use Drupal\group\Entity\Group;

use Drupal\o365\ExtensionService;

use Drupal\o365_groups\GroupFilesService;

use Mimey\MimeTypes;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Symfony\Component\HttpFoundation\RequestStack;
@@ -33,18 +33,18 @@ class O365GroupsFilesController extends ControllerBase { 
  protected $request;



  /**

   * Our extension service to convert mime types.

   * The group file service.

   *

   * @var \Drupal\o365\ExtensionService

   * @var \Drupal\o365_groups\GroupFilesService

   */

  protected $extensionService;

  protected $groupFilesService;



  /**

   * The group file service.

   * The mimey mimetypes.

   *

   * @var \Drupal\o365_groups\GroupFilesService

   * @var \Mimey\MimeTypes

   */

  protected $groupFilesService;

  protected $mimey;



  /**

   * The controller constructor.
@@ -53,23 +53,21 @@ class O365GroupsFilesController extends ControllerBase { 
   *   The date formatter.

   * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack

   *   The request stack.

   * @param \Drupal\o365\ExtensionService $extensionService

   *   The extension service.

   * @param \Drupal\o365_groups\GroupFilesService $groupFilesService

   *   The service to generate the group files arrays.

   */

  public function __construct(DateFormatterInterface $date_formatter, RequestStack $requestStack, ExtensionService $extensionService, GroupFilesService $groupFilesService) {

  public function __construct(DateFormatterInterface $date_formatter, RequestStack $requestStack, GroupFilesService $groupFilesService) {

    $this->dateFormatter = $date_formatter;

    $this->request = $requestStack->getCurrentRequest();

    $this->extensionService = $extensionService;

    $this->groupFilesService = $groupFilesService;

    $this->mimey = new MimeTypes();

  }



  /**

   * {@inheritdoc}

   */

  public static function create(ContainerInterface $container) {

    return new static($container->get('date.formatter'), $container->get('request_stack'), $container->get('o365.extension_type'), $container->get('o365_groups.files'));

    return new static($container->get('date.formatter'), $container->get('request_stack'), $container->get('o365_groups.files'));

  }



  /**
@@ -137,7 +135,7 @@ class O365GroupsFilesController extends ControllerBase { 


              // Determine the file icon.

              if ($child->getFile()) {

                $mimeType = $this->extensionService->extensionType($child->getFile()->getMimeType());

                $mimeType = $this->mimey->getExtension($child->getFile()->getMimeType());

              }

              else {

                $mimeType = 'folder';

modules/o365_groups/src/GroupFilesService.php

+7 −9
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 


namespace Drupal\o365_groups;



use Drupal\o365\ExtensionService;

use Drupal\o365\GraphService;

use Microsoft\Graph\Model\DriveItem;

use Mimey\MimeTypes;



/**

 * Service that returns the list of files.
@@ -19,23 +19,21 @@ class GroupFilesService { 
  protected $graphService;



  /**

   * The extension service.

   * The mimey mimetypes.

   *

   * @var \Drupal\o365\ExtensionService

   * @var \Mimey\MimeTypes

   */

  protected $extensionService;

  protected $mimey;



  /**

   * Constructs a GroupFilesService object.

   *

   * @param \Drupal\o365\GraphService $graphService

   *   The o365 graph service.

   * @param \Drupal\o365\ExtensionService $extensionService

   *   The o365 extension service.

   */

  public function __construct(GraphService $graphService, ExtensionService $extensionService) {

  public function __construct(GraphService $graphService) {

    $this->graphService = $graphService;

    $this->extensionService = $extensionService;

    $this->mimey = new MimeTypes();

  }



  /**
@@ -128,7 +126,7 @@ class GroupFilesService { 
    foreach ($childrenData as $child) {

      // Determine the file icon.

      if ($child->getFile()) {

        $mimeType = $this->extensionService->extensionType($child->getFile()

        $mimeType = $this->mimey->getExtension($child->getFile()

          ->getMimeType());

      }

      else {

modules/o365_sharepoint_file/src/Controller/O365SharepointController.php

+7 −17
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ namespace Drupal\o365_sharepoint_file\Controller; 


use Drupal\Core\Controller\ControllerBase;

use Drupal\o365\GraphService;

use Drupal\o365\ExtensionService;

use Mimey\MimeTypes;

use Symfony\Component\DependencyInjection\ContainerInterface;

use Symfony\Component\HttpFoundation\RequestStack;
@@ -27,12 +27,7 @@ class O365SharepointController extends ControllerBase { 
   */

  protected $request;



  /**

   * Drupal\o365\GraphService definition.

   *

   * @var \Drupal\o365\ExtensionService

   */

  protected $extensionService;

  protected $mimey;



  /**

   * Constructs a new TeamsGroup object.
@@ -41,20 +36,18 @@ class O365SharepointController extends ControllerBase { 
   *   The GraphService definition.

   * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack

   *   The RequestStack definition.

   * @param \Drupal\o365\ExtensionService $extensionService

   *   The Extension service.

   */

  public function __construct(GraphService $o365_graph, RequestStack $requestStack, ExtensionService $extensionService) {

  public function __construct(GraphService $o365_graph, RequestStack $requestStack) {

    $this->o365Graph = $o365_graph;

    $this->request = $requestStack->getCurrentRequest();

    $this->extensionService = $extensionService;

    $this->mimey = new MimeTypes();

  }



  /**

   * {@inheritdoc}

   */

  public static function create(ContainerInterface $container) {

    return new static($container->get('o365.graph'), $container->get('request_stack'), $container->get('o365.extension_type'));

    return new static($container->get('o365.graph'), $container->get('request_stack'));

  }



  /**
@@ -143,10 +136,7 @@ class O365SharepointController extends ControllerBase { 
   * {@inheritdoc}

   */

  private function getFileUrlAndExtension($hit) {

    $data = [

      'webUrl' => FALSE,

      'extension' => FALSE,

    ];

    $data = [];



    $fileId = $hit['resource']['id'] ?? '';

    $driveId = $hit['resource']['parentReference']['driveId'] ?? '';
@@ -156,7 +146,7 @@ class O365SharepointController extends ControllerBase { 


    if (isset($fileData['file'])) {

      $mimeType['file']['mimeType'] = $fileData['file']['mimeType'];

      $data['extension'] = $this->extensionService->extensionType($mimeType['file']['mimeType']);

      $data['extension'] = $this->mimey->getExtension($mimeType['file']['mimeType']);

    }

    else {

      $data['extension'] = 'folder';