Task/update cloudinary to version 2

.gitignore

@@ -2,3 +2,6 @@
 .prettierrc
 package.json
 yarn.lock
+composer.lock
+/public/*
+/vendor/*

Classes/Backend/Form/Container/InlineCloudinaryControlContainer.php

@@ -12,50 +12,28 @@
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use Visol\Cloudinary\Driver\CloudinaryFastDriver;
+use Visol\Cloudinary\Driver\CloudinaryDriver;
 use Visol\Cloudinary\Services\ConfigurationService;
 
 class InlineCloudinaryControlContainer extends InlineControlContainer
 {
 
-    public function render() {
-
-        // We load here the cloudinary library
-        /** @var AssetCollector $assetCollector */
-        $assetCollector = GeneralUtility::makeInstance(AssetCollector::class);
-        $assetCollector->addJavaScript('media_library_cloudinary', 'https://media-library.cloudinary.com/global/all.js', []);
-
+    public function render()
+    {
         /** @var PageRenderer $pageRenderer */
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Cloudinary/CloudinaryMediaLibrary');
 
         return parent::render();
     }
 
-    /**
-     * @param array $inlineConfiguration
-     * @return string
-     */
-    protected function renderPossibleRecordsSelectorTypeGroupDB(array $inlineConfiguration)
+    protected function renderPossibleRecordsSelectorTypeGroupDB(array $inlineConfiguration): ?string
     {
         $typo3Buttons = parent::renderPossibleRecordsSelectorTypeGroupDB($inlineConfiguration);
 
         // We could have multiple cloudinary buttons / storages
         $cloudinaryButtons = $this->renderCloudinaryButtons($inlineConfiguration);
-
-        // Inject button before help-block
-        if (strpos($typo3Buttons, '</div><div class="help-block">') > 0) {
-            $typo3Buttons = str_replace(
-                '</div><div class="help-block">',
-                $cloudinaryButtons . '</div><div class="help-block">',
-                $typo3Buttons,
-            );
-            // Try to inject it into the form-control container
-        } elseif (preg_match('/<\/div><\/div>$/i', $typo3Buttons)) {
-            $typo3Buttons = preg_replace('/<\/div><\/div>$/i', $cloudinaryButtons . '</div></div>', $typo3Buttons);
-        } else {
-            $typo3Buttons .= $cloudinaryButtons;
-        }
+        $typo3Buttons = $this->appendButtons($typo3Buttons, $cloudinaryButtons);
 
         return $typo3Buttons;
     }
@@ -72,7 +50,7 @@ protected function renderCloudinaryButtons(array $inlineConfiguration): string
         $view = $this->initializeStandaloneView('EXT:cloudinary/Resources/Private/Standalone/MediaLibrary/Show.html');
         $view->assignMultiple([
             'objectGroup' => $objectGroup,
-            'cloudinaryCredentials' => json_encode($this->computeCloudinaryCredentials($storages)),
+            'cloudinaryCredentials' => $this->computeCloudinaryCredentials($storages),
         ]);
 
         return $view->render();
@@ -107,7 +85,7 @@ protected function getCloudinaryStorages(): array
             $storageItems = $query
                 ->select('*')
                 ->from('sys_file_storage')
-                ->where($query->expr()->eq('driver', $query->expr()->literal(CloudinaryFastDriver::DRIVER_TYPE)))
+                ->where($query->expr()->eq('driver', $query->expr()->literal(CloudinaryDriver::DRIVER_TYPE)))
                 ->execute()
                 ->fetchAllAssociativeIndexed();
 
@@ -159,4 +137,22 @@ protected function computeCloudinaryCredentials(array $storages): array
 
         return $cloudinaryCredentials;
     }
+
+    protected function appendButtons(string $typo3Buttons, string $cloudinaryButtons): ?string
+    {
+        // Inject button before help-block
+        if (strpos($typo3Buttons, '</div><div class="help-block">') > 0) {
+            $typo3Buttons = str_replace(
+                '</div><div class="help-block">',
+                $cloudinaryButtons . '</div><div class="help-block">',
+                $typo3Buttons,
+            );
+            // Try to inject it into the form-control container
+        } elseif (preg_match('/<\/div><\/div>$/i', $typo3Buttons)) {
+            $typo3Buttons = preg_replace('/<\/div><\/div>$/i', $cloudinaryButtons . '</div></div>', $typo3Buttons);
+        } else {
+            $typo3Buttons .= $cloudinaryButtons;
+        }
+        return $typo3Buttons;
+    }
 }

Classes/CloudinaryException.php

@@ -2,6 +2,8 @@
 
 namespace Visol\Cloudinary;
 
-class CloudinaryException extends \Exception
+use Exception;
+
+class CloudinaryException extends Exception
 {
 }

Classes/CloudinaryFactory.php

@@ -9,6 +9,7 @@
 
 namespace Visol\Cloudinary;
 
+use Exception;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
@@ -18,7 +19,7 @@
 /**
  * Class CloudinaryFactory
  */
-class CloudinaryFactory extends \Exception
+class CloudinaryFactory extends Exception
 {
     /**
      * @return ResourceStorage