Check if the first method exists on the Hook abstract class

This is a temporary solution until we break support with older pdfexport
module versions.

Author: TheSyscall

application/clicommands/DownloadCommand.php

@@ -5,6 +5,7 @@
 
 namespace Icinga\Module\Reporting\Clicommands;
 
+use Icinga\Application\Hook\PdfexportHook;
 use Icinga\Exception\NotFoundError;
 use Icinga\Module\Pdfexport\ProvidedHook\Pdfexport;
 use Icinga\Module\Reporting\Cli\Command;
@@ -70,7 +71,12 @@ public function defaultAction()
         $format = strtolower($format);
         switch ($format) {
             case 'pdf':
-                $content = Pdfexport::first()->htmlToPdf($report->toPdf());
+                // TODO: Remove this once the dependency on the Pdfexport module is removed
+                /** @var PdfexportHook $exporter */
+                $exporter = method_exists(PdfexportHook::class, 'first')
+                    ? PdfexportHook::first()
+                    : Pdfexport::first();
+                $content = $exporter->htmlToPdf($report->toPdf());
                 break;
             case 'csv':
                 $content = $report->toCsv();

application/controllers/ReportController.php

@@ -7,6 +7,8 @@
 
 use Exception;
 use Icinga\Application\Hook;
+use Icinga\Application\Hook\PdfexportHook;
+use Icinga\Application\Modules\Module;
 use Icinga\Module\Pdfexport\ProvidedHook\Pdfexport;
 use Icinga\Module\Reporting\Database;
 use Icinga\Module\Reporting\Model;
@@ -244,9 +246,16 @@ public function downloadAction(): void
 
         switch ($type) {
             case 'pdf':
-                /** @var Hook\PdfexportHook $exports */
-                $exports = Pdfexport::first();
-                $exports->streamPdfFromHtml($this->report->toPdf(), $name);
+                // TODO: Remove this once the dependency on the Pdfexport module is removed
+                if (! Module::exists('pdfexport')) {
+                    throw new Exception('The pdfexport module is not installed');
+                }
+
+                /** @var PdfexportHook $exporter */
+                $exporter = method_exists(PdfexportHook::class, 'first')
+                    ? PdfexportHook::first()
+                    : Pdfexport::first();
+                $exporter->streamPdfFromHtml($this->report->toPdf(), $name);
                 exit;
             case 'csv':
                 $response = $this->getResponse();

library/Reporting/Actions/SendMail.php

@@ -6,7 +6,7 @@
 namespace Icinga\Module\Reporting\Actions;
 
 use Icinga\Application\Config;
-use Icinga\Application\Logger;
+use Icinga\Application\Hook\PdfexportHook;
 use Icinga\Module\Pdfexport\ProvidedHook\Pdfexport;
 use Icinga\Module\Reporting\Hook\ActionHook;
 use Icinga\Module\Reporting\Mail;
@@ -15,7 +15,6 @@
 use ipl\Stdlib\Str;
 use ipl\Validator\CallbackValidator;
 use ipl\Validator\EmailAddressValidator;
-use Throwable;
 
 class SendMail extends ActionHook
 {
@@ -49,7 +48,11 @@ public function execute(Report $report, array $config)
 
         switch ($config['type']) {
             case 'pdf':
-                $mail->attachPdf(Pdfexport::first()->htmlToPdf($report->toPdf()), $name);
+                // TODO: Remove this once the dependency on the Pdfexport module is removed
+                $exporter = method_exists(PdfexportHook::class, 'first')
+                    ? PdfexportHook::first()
+                    : Pdfexport::first();
+                $mail->attachPdf($exporter->htmlToPdf($report->toPdf()), $name);
 
                 break;
             case 'csv':

module.yml

@@ -0,0 +1,19 @@
+title: Reporting
+version: 1.1.0
+description: Reporting module for Icinga Web 2
+
+depends:
+  icingaweb: "^2.10.0"
+  libraries:
+    icinga-php-library:
+      - ">=1.0.0"
+      - "^0.16.0-dev"
+    icinga-php-thirdparty:
+      - ">=1.0.0"
+      - "^0.16.0-dev"
+  modules:
+    pdfexport: ">=0.13.0"
+    any-of:
+      icingadb: ">=1.0.0"
+      monitoring: "^2.10.0"
+