From 9c38bfcccbb891c8fac34c9e6d0f63cb7497efba Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Fri, 24 Nov 2023 20:14:33 +0000 Subject: [PATCH] [REF][PHP8.2] Tidy up properties in CRM_Badge_BAO_Badge --- CRM/Badge/BAO/Badge.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index d3486b13ff..d189683660 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -24,6 +24,11 @@ use Civi\Token\TokenProcessor; */ class CRM_Badge_BAO_Badge { + /** + * @var CRM_Utils_PDF_Label + */ + public $pdf; + /** * @var bool */ @@ -168,9 +173,6 @@ class CRM_Badge_BAO_Badge { * @param int $cellspacing */ public function labelCreator($formattedRow, $cellspacing = 0) { - $this->lMarginLogo = 18; - $this->tMarginName = 20; - $x = $this->pdf->GetAbsX(); $y = $this->pdf->getY(); @@ -363,10 +365,8 @@ class CRM_Badge_BAO_Badge { $y = $this->pdf->GetY(); } - $this->imgRes = 300; - if ($img) { - [$w, $h] = self::getImageProperties($img, $this->imgRes, $w, $h); + [$w, $h] = self::getImageProperties($img, 300, $w, $h); $this->pdf->Image($img, $x, $y, $w, $h, '', '', '', FALSE, 72, '', FALSE, FALSE, $this->debug, FALSE, FALSE, FALSE); } -- 2.25.1