Merge remote-tracking branch 'origin/1.3' into 1.x

pimcore · Nov 19, 2024 · 500df07 · 500df07
2 parents 706d526 + 0d6a215
commit 500df07
Show file tree

Hide file tree

Showing 6 changed files with 2,632 additions and 1,450 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,6 +12,10 @@
         __DIR__ . '/tests/Support/_generated',
         __DIR__ . '/src/Processor/Api/PDFreactor.class.php',
     ])
+
+    ->notPath([
+        'Processor/Api/PDFreactor.class.php'
+    ])
 ;
 
 // do not enable self_accessor as it breaks pimcore models relying on get_called_class()

diff --git a/doc/01_Doc_Types_and_Available_Processors.md b/doc/01_Doc_Types_and_Available_Processors.md
@@ -9,11 +9,11 @@ This bundle introduces 2 new document types:
 
 ## Available PDF Processors
 
-| Name           | Description                                                                                                                                                 | 
-|----------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [Chromium](https://www.chromium.org/Home/)      | Convert to PDF by installing the Chromium binary or by using a dockerized chromium (via websocket)                                                                              | 
-| [Gotenberg](https://gotenberg.dev/) | A Docker service with Chromium and LibreOffice support   | 
-| [PDF Reactor](https://www.pdfreactor.com/) | A REST/SOAP solution, please visit the official website for further information                                                                                          | 
+| Name           | Description                                                                                                                                                | 
+|----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Chromium](https://www.chromium.org/Home/)      | Convert to PDF by installing the Chromium binary or by using a dockerized chromium (via websocket)                                                         | 
+| [Gotenberg](https://gotenberg.dev/) | A Docker service with Chromium and LibreOffice support                                                                                                     | 
+| [PDF Reactor](https://www.pdfreactor.com/) | A REST solution for rendering complex catalogs, please visit the official website for further information. Currently Pimcore supports PDFreactor 10, 11, 12 | 
 
  > For details on how to install and configure these processors, please see [Additional Tools Installation](https://pimcore.com/docs/platform/Pimcore/Installation_and_Upgrade/System_Setup_and_Hosting/Additional_Tools_Installation) page in the Core.
 

diff --git a/src/Controller/SettingsController.php b/src/Controller/SettingsController.php
@@ -95,10 +95,14 @@ public function testWeb2printAction(Request $request): Response
 
         if ($adapter instanceof PdfReactor) {
             $params['adapterConfig'] = [
-                'javaScriptMode' => 0,
+                'javaScriptSettings' => [
+                    'enabled' => false,
+                ],
                 'addLinks' => true,
                 'appendLog' => true,
-                'enableDebugMode' => true,
+                'debugSettings' => [
+                    'all' => true,
+                ],
             ];
         } elseif ($adapter instanceof Gotenberg) {
             $params = Config::getWeb2PrintConfig();