diff -u b/bynder.info.yml b/bynder.info.yml --- b/bynder.info.yml +++ b/bynder.info.yml @@ -5,7 +5,8 @@ -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 configure: bynder.configuration_form dependencies: - drupal:media (>= 8.4.0) - ctools:ctools - entity_browser:entity_browser (>= 8.x-2.x) + - jquery_ui_tooltip:jquery_ui_tooltip diff -u b/bynder.install b/bynder.install --- b/bynder.install +++ b/bynder.install @@ -179,0 +180,11 @@ + +/** + * Enables the jquery_ui_tooltip module. + */ +function bynder_update_8010() { + /** @var \Drupal\Core\Extension\ModuleExtensionList $module_list */ + $module_list = \Drupal::service('extension.list.module'); + if ($module_list->exists('jquery_ui_tooltip')) { + \Drupal::service('module_installer')->install(['jquery_ui_tooltip']); + } +} diff -u b/modules/bynder_select2/bynder_select2.info.yml b/modules/bynder_select2/bynder_select2.info.yml --- b/modules/bynder_select2/bynder_select2.info.yml +++ b/modules/bynder_select2/bynder_select2.info.yml @@ -2,7 +2,7 @@ type: module description: Adds integration with the Select2 Javascript plugin. package: User interface -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 dependencies: - bynder:bynder diff -u b/modules/bynder_usage/bynder_usage.info.yml b/modules/bynder_usage/bynder_usage.info.yml --- b/modules/bynder_usage/bynder_usage.info.yml +++ b/modules/bynder_usage/bynder_usage.info.yml @@ -2,7 +2,7 @@ description: 'Reports usage tracking of media items back to the Bynder API' type: module package: Media -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 dependencies: - bynder:bynder diff -u b/modules/demo/bynder_demo.info.yml b/modules/demo/bynder_demo.info.yml --- b/modules/demo/bynder_demo.info.yml +++ b/modules/demo/bynder_demo.info.yml @@ -2,7 +2,7 @@ description: 'Demonstration of the Bynder integration.' type: module package: Media -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 dependencies: - bynder:bynder diff -u b/modules/lightning/bynder_lightning.info.yml b/modules/lightning/bynder_lightning.info.yml --- b/modules/lightning/bynder_lightning.info.yml +++ b/modules/lightning/bynder_lightning.info.yml @@ -2,7 +2,7 @@ description: 'Bynder integration for the Lightning distribution.' type: module package: Lightning -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 dependencies: - bynder:bynder diff -u b/src/Exception/BynderException.php b/src/Exception/BynderException.php --- b/src/Exception/BynderException.php +++ b/src/Exception/BynderException.php @@ -22,11 +22,4 @@ /** - * Message level to be used when displaying the message to the user. - * - * @var string - */ - protected $messageLevel = 'error'; - - /** * User-facing for admin users. * diff -u b/src/Plugin/EntityBrowser/Widget/BynderUpload.php b/src/Plugin/EntityBrowser/Widget/BynderUpload.php --- b/src/Plugin/EntityBrowser/Widget/BynderUpload.php +++ b/src/Plugin/EntityBrowser/Widget/BynderUpload.php @@ -20,9 +20,6 @@ use Drupal\Core\Link; use Drupal\Core\Logger\LoggerChannelFactoryInterface; use Drupal\Core\Url; -use Drupal\Core\File\FileSystemInterface; -use Drupal\Core\Messenger\MessengerInterface; -use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\entity_browser\WidgetValidationManager; use Drupal\media\Entity\Media; use Drupal\media\MediaInterface; @@ -44,9 +41,7 @@ * ) */ class BynderUpload extends BynderWidgetBase { - - use StringTranslationTrait; - + /** * Number of times to try fetching an asset during the batch. */ @@ -61,18 +56,4 @@ /** - * The file system service. - * - * @var \Drupal\Core\File\FileSystemInterface - */ - protected $fileSystem; - - /** - * The messenger service. - * - * @var \Drupal\Core\Messenger\MessengerInterface - */ - protected $messenger; - - /** * Upload constructor. * @@ -100,16 +81,10 @@ * The language manager. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack. - * @param \Drupal\Core\File\FileSystemInterface $file_system - * The file system service. - * @param \Drupal\Core\Messenger\MessengerInterface $messenger - * The messanger service. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityTypeManagerInterface $entity_type_manager, WidgetValidationManager $validation_manager, BynderApiInterface $bynder_api, ConfigFactoryInterface $config_factory, LoggerChannelFactoryInterface $logger_factory, SessionInterface $session, LanguageManagerInterface $language_manager, RequestStack $request_stack, FileSystemInterface $file_system, MessengerInterface $messenger) { + public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityTypeManagerInterface $entity_type_manager, WidgetValidationManager $validation_manager, BynderApiInterface $bynder_api, ConfigFactoryInterface $config_factory, LoggerChannelFactoryInterface $logger_factory, SessionInterface $session, LanguageManagerInterface $language_manager, RequestStack $request_stack) { parent::__construct($configuration, $plugin_id, $plugin_definition, $event_dispatcher, $entity_type_manager, $validation_manager, $bynder_api, $logger_factory, $language_manager, $request_stack, $config_factory); $this->session = $session; - $this->fileSystem = $file_system; - $this->messenger = $messenger; } /** @@ -128,8 +103,7 @@ $container->get('logger.factory'), $container->get('session'), $container->get('language_manager'), - $container->get('request_stack'), - $container->get('file_system') + $container->get('request_stack') ); } @@ -364,7 +338,7 @@ $result = \Drupal::service('bynder_api')->uploadFileAsync($data); $context['results']['accessRequestId'] = $result['accessRequestId']; $context['results'][$file['path']] = $result['mediaid']; - $this->fileSystem->delete($file['path']); + \Drupal::service('file_system')->delete($file['path']); $context['message'] = t('Uploaded @file to Bynder.', ['@file' => $file['filename']]); } catch (\Exception $e) { @@ -404,7 +378,7 @@ $context['message'] = t('Mapped @file locally.', ['@file' => $file['filename']]); } else { - $this->messenger->addWarning($this->t("Your file was uploaded to Bynder but needs to be approved before you can use it. Please go to your Bynder waiting room and review the uploaded assets.")); + \Drupal::messenger()->addWarning(t("Your file was uploaded to Bynder but needs to be approved before you can use it. Please go to your Bynder waiting room and review the uploaded assets.")); } $context['finished'] = 1; } @@ -422,7 +396,7 @@ if ($context['sandbox']['fails'] >= static::FAIL_LIMIT) { watchdog_exception('bynder', $e); (new UploadFailedException(t("There was an unexpected error after uploading the file to Bynder.")))->displayMessage(); - $this->messenger->addWarning($this->t("There was an unexpected error after uploading the file to Bynder. Please contact your site administrator for more info.")); + \Drupal::messenger()->addWarning(t("There was an unexpected error after uploading the file to Bynder. Please contact your site administrator for more info.")); } } } diff -u b/tests/modules/bynder_test_module/bynder_test_module.info.yml b/tests/modules/bynder_test_module/bynder_test_module.info.yml --- b/tests/modules/bynder_test_module/bynder_test_module.info.yml +++ b/tests/modules/bynder_test_module/bynder_test_module.info.yml @@ -2,7 +2,7 @@ description: 'Bynder test module.' type: module package: Media -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 dependencies: - bynder:bynder diff -u b/tests/modules/entity_browser_bynder_test/entity_browser_bynder_test.info.yml b/tests/modules/entity_browser_bynder_test/entity_browser_bynder_test.info.yml --- b/tests/modules/entity_browser_bynder_test/entity_browser_bynder_test.info.yml +++ b/tests/modules/entity_browser_bynder_test/entity_browser_bynder_test.info.yml @@ -1,7 +1,7 @@ name: 'Entity browser bynder test' type: module description: 'Support module for the Bynder module tests.' -core_version_requirement: ^8.7 || ^9 +core_version_requirement: ^8.7.7 || ^9 package: Testing version: VERSION dependencies: only in patch2: unchanged: --- a/bynder.libraries.yml +++ b/bynder.libraries.yml @@ -52,4 +52,4 @@ formatter: dependencies: - core/jquery - core/drupal - - core/jquery.ui.tooltip + - jquery_ui_tooltip/tooltip only in patch2: unchanged: --- a/composer.json +++ b/composer.json @@ -4,7 +4,8 @@ "type": "drupal-module", "require": { "Bynder/bynder-php-sdk": "~1.0", - "drupal/entity_browser": "~2.0" + "drupal/entity_browser": "~2.0", + "drupal/jquery_ui_tooltip": "~1.0" }, "require-dev": { "drupal/ctools": "~3.0",