diff --git a/src/TailwindJsHandler.php b/src/TailwindJsHandler.php index 37c2901..75ca91e 100644 --- a/src/TailwindJsHandler.php +++ b/src/TailwindJsHandler.php @@ -10,7 +10,6 @@ use Drupal\Core\File\FileUrlGeneratorInterface; use Drupal\Core\Session\AccountProxyInterface; use Drupal\Core\Site\Settings; use Drupal\file\FileRepositoryInterface; -use Drupal\file\FileStorageInterface; use GuzzleHttp\ClientInterface; use GuzzleHttp\Exception\GuzzleException; use Psr\Log\LoggerInterface; @@ -35,7 +34,7 @@ final class TailwindJsHandler { private FileRepositoryInterface $fileRepository; private FileSystemInterface $fileSystem; private ClientInterface $httpClient; - private FileStorageInterface $fileStorage; + private EntityTypeManagerInterface $entityTypeManager; private AccountProxyInterface $currentUser; private LoggerInterface $logger; @@ -52,13 +51,13 @@ final class TailwindJsHandler { $this->fileRepository = $file_repository; $this->fileSystem = $file_system; $this->httpClient = $http_client; - $this->fileStorage = $entity_type_manager->getStorage('file'); + $this->entityTypeManager = $entity_type_manager; $this->currentUser = $current_user; $this->logger = $logger; } public function deleteTailwindJs(): void { - $files = $this->fileStorage->loadByProperties(['uri' => self::TAILWIND_JS_FILE_URI]); + $files = $this->entityTypeManager->getStorage('file')->loadByProperties(['uri' => self::TAILWIND_JS_FILE_URI]); if (\count($files) > 0) { $file = \reset($files); $file->delete(); @@ -74,7 +73,7 @@ final class TailwindJsHandler { return FALSE; } - $files = $this->fileStorage->loadByProperties(['uri' => self::TAILWIND_JS_FILE_URI]); + $files = $this->entityTypeManager->getStorage('file')->loadByProperties(['uri' => self::TAILWIND_JS_FILE_URI]); if ((\count($files) > 0) && \file_exists(self::TAILWIND_JS_FILE_URI)) { return TRUE; } @@ -137,7 +136,7 @@ final class TailwindJsHandler { $add_to_config = TRUE; $embed .= ''; } - + if (count($classes) > 0) { $classes = array_values($classes); $encoded_classes = json_encode($classes); @@ -155,7 +154,7 @@ final class TailwindJsHandler { $embed .= ''; } - + // Add missing classes to DrupalSettings to allow lookup. if ($this->currentUser->hasPermission('access tailwindcss_utility endpoint')) { $embed .= "";