Skip to content

Commit

Permalink
Merge branch '1.3' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
fashxp committed Nov 14, 2024
2 parents d18a09b + 331801e commit 706d526
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
->exclude([
__DIR__ . '/tests/_output',
__DIR__ . '/tests/Support/_generated',
__DIR__ . '/src/Processor/Api/PDFreactor.class.php',
])
;

Expand Down
2 changes: 1 addition & 1 deletion public/js/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ pimcore.bundle.web2print.settings = Class.create({
autoEl:{
tag: 'a',
target: '_blank',
href: "https://gotenberg.dev/docs/modules/chromium#routes",
href: "https://gotenberg.dev/docs/routes#page-properties-chromium",
}
},{
xtype: "displayfield",
Expand Down
10 changes: 5 additions & 5 deletions src/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ public static function getInstance(): PdfReactor|Gotenberg|Chromium|Processor
{
$config = Config::getWeb2PrintConfig();

if($config['generalTool'] == 'pdfreactor') {
if ($config['generalTool'] == 'pdfreactor') {
return new PdfReactor();
} elseif($config['generalTool'] == 'chromium') {
} elseif ($config['generalTool'] == 'chromium') {
return new Chromium();
} elseif($config['generalTool'] == 'gotenberg') {
} elseif ($config['generalTool'] == 'gotenberg') {
return new Gotenberg();
} else {
if(class_exists($config['generalTool'])) {
if (class_exists($config['generalTool'])) {
$generalToolClass = new $config['generalTool']();
if($generalToolClass instanceof Processor) {
if ($generalToolClass instanceof Processor) {
return $generalToolClass;
}
}
Expand Down

0 comments on commit 706d526

Please sign in to comment.