From ad9cfc61d8d74b403f90c3c295c29769977a412c Mon Sep 17 00:00:00 2001 From: Lahcen SIBOUIH Date: Wed, 26 Nov 2025 16:22:00 +0100 Subject: [PATCH 1/5] feat: drupal 11 compatibilty --- cloudinary.info.yml | 2 +- .../cloudinary_media_library_widget.info.yml | 2 +- modules/cloudinary_sdk/cloudinary_sdk.info.yml | 2 +- modules/cloudinary_storage/cloudinary_storage.info.yml | 2 +- .../cloudinary_stream_wrapper.info.yml | 2 +- .../src/StreamWrapper/CloudinaryStreamWrapper.php | 4 ++-- modules/cloudinary_video/cloudinary_video.info.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudinary.info.yml b/cloudinary.info.yml index 0862f99..8979d73 100644 --- a/cloudinary.info.yml +++ b/cloudinary.info.yml @@ -1,7 +1,7 @@ name: Cloudinary description: 'The module provides image transformation of Cloudinay, auto convert default image style effects with Cloudinary transformation.' package: Cloudinary -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 type: module dependencies: - cloudinary:cloudinary_media_library_widget diff --git a/modules/cloudinary_media_library_widget/cloudinary_media_library_widget.info.yml b/modules/cloudinary_media_library_widget/cloudinary_media_library_widget.info.yml index 298dacc..8f20fe0 100644 --- a/modules/cloudinary_media_library_widget/cloudinary_media_library_widget.info.yml +++ b/modules/cloudinary_media_library_widget/cloudinary_media_library_widget.info.yml @@ -2,7 +2,7 @@ name: 'Cloudinary media library widget' description: 'The module provides a cloudinary media library widget.' package: Cloudinary type: module -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 configure: cloudinary_sdk.settings dependencies: - cloudinary:cloudinary_sdk diff --git a/modules/cloudinary_sdk/cloudinary_sdk.info.yml b/modules/cloudinary_sdk/cloudinary_sdk.info.yml index 40a9ec8..06d1fb0 100644 --- a/modules/cloudinary_sdk/cloudinary_sdk.info.yml +++ b/modules/cloudinary_sdk/cloudinary_sdk.info.yml @@ -2,7 +2,7 @@ name: 'Cloudinary SDK' description: 'The module provides a library of Cloudinary PHP SDK for developers working with Cloudinary service.' package: Cloudinary type: module -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 configure: cloudinary_sdk.settings dependencies: - cloudinary:cloudinary diff --git a/modules/cloudinary_storage/cloudinary_storage.info.yml b/modules/cloudinary_storage/cloudinary_storage.info.yml index bb76363..63a609f 100644 --- a/modules/cloudinary_storage/cloudinary_storage.info.yml +++ b/modules/cloudinary_storage/cloudinary_storage.info.yml @@ -1,7 +1,7 @@ name: 'Cloudinary Storage' description: 'The module provides stores information locally to reduce network requests and improve loading speed for uploaded Cloudinary files.' package: Cloudinary -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 dependencies: - cloudinary:cloudinary_stream_wrapper - cloudinary:cloudinary diff --git a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.info.yml b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.info.yml index 2321f8e..b150d86 100644 --- a/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.info.yml +++ b/modules/cloudinary_stream_wrapper/cloudinary_stream_wrapper.info.yml @@ -1,7 +1,7 @@ name: 'Cloudinary Stream Wrapper' description: 'The module provides stream wrappers to access Cloudinary files with read or write method.' package: Cloudinary -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 dependencies: - cloudinary:cloudinary - cloudinary:cloudinary_sdk diff --git a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php index 27b2a70..1cb5f7f 100644 --- a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php +++ b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php @@ -2,7 +2,7 @@ namespace Drupal\cloudinary_stream_wrapper\StreamWrapper; // These classes are used to implement a stream wrapper class. -use Cloudinary\Api\Admin\AdminApi; +use Drupal\Core\Utility\Error; use Cloudinary\Asset\Media; use Cloudinary\Configuration\Configuration; use Drupal\Core\StreamWrapper\StreamWrapperInterface; @@ -223,7 +223,7 @@ protected function streamReadCloudinary() { $data[$this->uri] = $request->getBody(); } catch (\Exception $e) { - watchdog_exception('cloudinary_stream_wrapper', $e); + Error::logException(\Drupal::logger('cloudinary_stream_wrapper'), $e); } return $data[$this->uri]; diff --git a/modules/cloudinary_video/cloudinary_video.info.yml b/modules/cloudinary_video/cloudinary_video.info.yml index e53a41f..ff1b47f 100644 --- a/modules/cloudinary_video/cloudinary_video.info.yml +++ b/modules/cloudinary_video/cloudinary_video.info.yml @@ -2,7 +2,7 @@ name: 'Cloudinary video' description: 'The module provides a Cloudinary video integration.' package: Cloudinary type: module -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 configure: cloudinary_sdk.settings dependencies: - cloudinary:cloudinary_media_library_widget From f965a6642a852ab5f1bbee5e70587cda14150eba Mon Sep 17 00:00:00 2001 From: Lahcen SIBOUIH Date: Wed, 26 Nov 2025 22:18:43 +0100 Subject: [PATCH 2/5] feat: drupal 11 compatibilty --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d379dd8..c36a574 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "voidagency/cloudinary", + "name": "lahcen-void/cloudinary", "type": "drupal-module", "description": "The module provides a library and stream wrapper of Cloudinary service.", "homepage": "https://www.drupal.org/project/cloudinary", From 8def3c3fd5d2328814b96994ab45dbee96a741f4 Mon Sep 17 00:00:00 2001 From: Lahcen SIBOUIH Date: Wed, 26 Nov 2025 23:10:59 +0100 Subject: [PATCH 3/5] feat: drupal 11 compatibilty --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c36a574..d379dd8 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "lahcen-void/cloudinary", + "name": "voidagency/cloudinary", "type": "drupal-module", "description": "The module provides a library and stream wrapper of Cloudinary service.", "homepage": "https://www.drupal.org/project/cloudinary", From f2e04d0688cefbb0aa6dd5dbc5d3ab91cd9de11a Mon Sep 17 00:00:00 2001 From: Lahcen SIBOUIH Date: Mon, 8 Dec 2025 09:40:48 +0100 Subject: [PATCH 4/5] feat: drupal 11 compatibilty --- .../src/Normalizer/AssetNormalizer.php | 2 +- .../cloudinary_sdk/src/EventSubscriber/InitSubscriber.php | 2 +- .../src/StreamWrapper/CloudinaryStreamWrapper.php | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php b/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php index cbc0c17..07af594 100644 --- a/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php +++ b/modules/cloudinary_media_library_widget/src/Normalizer/AssetNormalizer.php @@ -40,7 +40,7 @@ public function supportsNormalization($data, $format = NULL) { /** * {@inheritdoc} */ - public function normalize($object, $format = NULL, array $context = []) { + public function normalize($object, $format = NULL, array $context = []): array|bool|string|int|float|null|\ArrayObject { throw new \LogicException('This method should never be called.'); } diff --git a/modules/cloudinary_sdk/src/EventSubscriber/InitSubscriber.php b/modules/cloudinary_sdk/src/EventSubscriber/InitSubscriber.php index 79c8d10..5c6e511 100644 --- a/modules/cloudinary_sdk/src/EventSubscriber/InitSubscriber.php +++ b/modules/cloudinary_sdk/src/EventSubscriber/InitSubscriber.php @@ -14,7 +14,7 @@ class InitSubscriber implements EventSubscriberInterface { /** * {@inheritdoc} */ - public static function getSubscribedEvents() { + public static function getSubscribedEvents(): array { return [KernelEvents::REQUEST => ['onEvent', 0]]; } diff --git a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php index 1cb5f7f..9190ea0 100644 --- a/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php +++ b/modules/cloudinary_stream_wrapper/src/StreamWrapper/CloudinaryStreamWrapper.php @@ -223,7 +223,10 @@ protected function streamReadCloudinary() { $data[$this->uri] = $request->getBody(); } catch (\Exception $e) { - Error::logException(\Drupal::logger('cloudinary_stream_wrapper'), $e); + \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall( + \Drupal::VERSION, '10.1.0', fn() => \Drupal\Core\Utility\Error::logException( + \Drupal::logger('cloudinary_stream_wrapper'), $e), fn() => watchdog_exception('cloudinary_stream_wrapper', $e) + ); } return $data[$this->uri]; From 7e3f5ce783cbabaa7c5e77eb9770f45db1f2d41a Mon Sep 17 00:00:00 2001 From: Lahcen SIBOUIH Date: Mon, 8 Dec 2025 18:37:25 +0100 Subject: [PATCH 5/5] feat: drupal 11 compatibilty --- .../cloudinary_storage_db/cloudinary_storage_db.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.info.yml b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.info.yml index 9c0b6d5..cf751db 100644 --- a/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.info.yml +++ b/modules/cloudinary_storage/modules/cloudinary_storage_db/cloudinary_storage_db.info.yml @@ -1,7 +1,7 @@ name: 'Cloudinary Storage Database' description: 'The module provides stores information in database for uploaded Cloudinary files.' package: Cloudinary -core_version_requirement: ^9.3 || ^10 +core_version_requirement: ^9.3 || ^10 || ^11 dependencies: - cloudinary:cloudinary_storage - cloudinary:cloudinary