Stefanius67 / XFPDF

XFPDFExample.php

Indentation +10 added lines, -10 removed lines

@@ -13,16 +13,16 @@
 

 $date = time();

 for ($iRow=1; $iRow <= 100; $iRow++) {

-	// just a simple demo - most cases data comes from DB-query ;-)

-	$row = array(

-		'text' => 'Text in var Col, Line ' . $iRow,

-	    'weight' => (rand(10, 500) / 10),

-	    'date' => date('Y-m-d', $date),

-	    'price' => (rand(10, 2000) / 9),

-	    'grp_id' => rand(1, 4)

-	);

-	$pdf->Row($row);

-	$date += 24 * 60 * 60;

+    // just a simple demo - most cases data comes from DB-query ;-)

+    $row = array(

+        'text' => 'Text in var Col, Line ' . $iRow,

+        'weight' => (rand(10, 500) / 10),

+        'date' => date('Y-m-d', $date),

+        'price' => (rand(10, 2000) / 9),

+        'grp_id' => rand(1, 4)

+    );

+    $pdf->Row($row);

+    $date += 24 * 60 * 60;

 }

 // ...and end of the grid

 $pdf->EndGrid();

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
 

 // set some file information

 $pdf->SetInfo('XFPDF', 'Example', 'PHP classes', 'Keyword1, Keyword2, ...');

-$pdf->SetPageHeader( 'Create PDF Table', 'using extpdf package from PHPClasses.org');

+$pdf->SetPageHeader('Create PDF Table', 'using extpdf package from PHPClasses.org');

 

 // prepare grid and just insert a bulk of lines

 $pdf->Prepare();

 

 $date = time();

-for ($iRow=1; $iRow <= 100; $iRow++) {

+for ($iRow = 1; $iRow <= 100; $iRow++) {

 	// just a simple demo - most cases data comes from DB-query ;-)

 	$row = array(

 		'text' => 'Text in var Col, Line ' . $iRow,

SKien/XFPDF/XPDFFont.php

Indentation +18 added lines, -18 removed lines

@@ -17,23 +17,23 @@
  */

 class XPDFFont

 {

-	/** @var string fontname	 */

-	public string $strFontname;

-	/** @var int size	 */

-	public int $iSize;

-	/** @var string style	 */

-	public string $strStyle;

+    /** @var string fontname	 */

+    public string $strFontname;

+    /** @var int size	 */

+    public int $iSize;

+    /** @var string style	 */

+    public string $strStyle;

 	

-	/**

-	 * Creates a Font-object

-	 * @param string $strFontname

-	 * @param string $strStyle		'B', 'I' or 'BI'

-	 * @param int $iSize

-	 */

-	function __construct(string $strFontname, string $strStyle, int $iSize)

-	{

-		$this->strFontname = $strFontname;

-		$this->strStyle = $strStyle;

-		$this->iSize = $iSize;

-	}

+    /**

+     * Creates a Font-object

+     * @param string $strFontname

+     * @param string $strStyle		'B', 'I' or 'BI'

+     * @param int $iSize

+     */

+    function __construct(string $strFontname, string $strStyle, int $iSize)

+    {

+        $this->strFontname = $strFontname;

+        $this->strStyle = $strStyle;

+        $this->iSize = $iSize;

+    }

 }

OPlathey/FPDF/FPDF.php

Spacing +229 added lines, -229 removed lines

@@ -24,7 +24,7 @@ 
 * http://www.fpdf.org/en/doc/index.php

 *******************************************************************************/

 

-define('FPDF_VERSION','1.82');

+define('FPDF_VERSION', '1.82');

 

 class FPDF

 {

@@ -175,7 +175,7 @@ 
      *                              or an array containing the width and the height (expressed in the unit given by unit). <br/>

      *                              Default value is 'A4'.

      */

-    public function __construct(string $orientation='P', string $unit='mm', $size='A4')

+    public function __construct(string $orientation = 'P', string $unit = 'mm', $size = 'A4')

     {

         // Some checks

         $this->doChecks();

@@ -191,10 +191,10 @@ 
                 $this->k = 1;

                 break;

             case 'mm':

-                $this->k = 72/25.4;

+                $this->k = 72 / 25.4;

                 break;

             case 'cm':

-                $this->k = 72/2.54;

+                $this->k = 72 / 2.54;

                 break;

             case 'in':

                 $this->k = 72;

@@ -254,12 +254,12 @@ 
      * @param float $top    Top margin.

      * @param float $right  Right margin. Default value is the left one.

      */

-    public function SetMargins(float $left, float $top, ?float $right=null) : void

+    public function SetMargins(float $left, float $top, ?float $right = null) : void

     {

         // Set left, top and right margins

         $this->lMargin = $left;

         $this->tMargin = $top;

-        if($right===null)

+        if ($right === null)

             $right = $left;

         $this->rMargin = $right;

     }

@@ -274,7 +274,7 @@ 
     {

         // Set left margin

         $this->lMargin = $margin;

-        if($this->page>0 && $this->x<$margin)

+        if ($this->page > 0 && $this->x < $margin)

             $this->x = $margin;

     }

 

@@ -308,12 +308,12 @@ 
      * @param bool $auto    indicating if mode should be on or off. 

      * @param float $margin Distance from the bottom of the page. 

      */

-    public function SetAutoPageBreak(bool $auto, float $margin=0) : void

+    public function SetAutoPageBreak(bool $auto, float $margin = 0) : void

     {

         // Set auto page break mode and triggering margin

         $this->AutoPageBreak = $auto;

         $this->bMargin = $margin;

-        $this->PageBreakTrigger = $this->h-$margin;

+        $this->PageBreakTrigger = $this->h - $margin;

     }

 

     /**

@@ -344,17 +344,17 @@ 
      *                              <li> 'defaul't: uses viewer default mode </li></ul>

      *                              Default value is default. 

      */

-    public function SetDisplayMode($zoom, string $layout='default') : void

+    public function SetDisplayMode($zoom, string $layout = 'default') : void

     {

         // Set display mode in viewer

-        if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

+        if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))

             $this->ZoomMode = $zoom;

         else

-            $this->Error('Incorrect zoom display mode: '.$zoom);

-        if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

+            $this->Error('Incorrect zoom display mode: ' . $zoom);

+        if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')

             $this->LayoutMode = $layout;

         else

-            $this->Error('Incorrect layout display mode: '.$layout);

+            $this->Error('Incorrect layout display mode: ' . $layout);

     }

 

     /**

@@ -369,7 +369,7 @@ 
     public function SetCompression(bool $compress) : void

     {

         // Set page compression

-        if(function_exists('gzcompress'))

+        if (function_exists('gzcompress'))

             $this->compress = $compress;

         else

             $this->compress = false;

@@ -380,7 +380,7 @@ 
      * @param string $title The title.

      * @param bool $isUTF8  Indicates if the string is encoded in ISO-8859-1 (false) or UTF-8 (true). Default value: false. 

      */

-    public function SetTitle(string $title, bool $isUTF8=false) : void

+    public function SetTitle(string $title, bool $isUTF8 = false) : void

     {

         // Title of document

         $this->metadata['Title'] = $isUTF8 ? $title : utf8_encode($title);

@@ -391,7 +391,7 @@ 
      * @param string $author

      * @param bool $isUTF8  Indicates if the string is encoded in ISO-8859-1 (false) or UTF-8 (true). Default value: false.

      */

-    public function SetAuthor(string $author, bool $isUTF8=false) : void

+    public function SetAuthor(string $author, bool $isUTF8 = false) : void

     {

         // Author of document

         $this->metadata['Author'] = $isUTF8 ? $author : utf8_encode($author);

@@ -402,7 +402,7 @@ 
      * @param string $subject

      * @param bool $isUTF8  Indicates if the string is encoded in ISO-8859-1 (false) or UTF-8 (true). Default value: false.

      */

-    public function SetSubject(string $subject, bool $isUTF8=false) : void

+    public function SetSubject(string $subject, bool $isUTF8 = false) : void

     {

         // Subject of document

         $this->metadata['Subject'] = $isUTF8 ? $subject : utf8_encode($subject);

@@ -413,7 +413,7 @@ 
      * @param string $keywords

      * @param bool $isUTF8  Indicates if the string is encoded in ISO-8859-1 (false) or UTF-8 (true). Default value: false.

      */

-    public function SetKeywords(string $keywords, bool $isUTF8=false) : void

+    public function SetKeywords(string $keywords, bool $isUTF8 = false) : void

     {

         // Keywords of document

         $this->metadata['Keywords'] = $isUTF8 ? $keywords : utf8_encode($keywords);

@@ -424,7 +424,7 @@ 
      * @param string $creator

      * @param bool $isUTF8  Indicates if the string is encoded in ISO-8859-1 (false) or UTF-8 (true). Default value: false.

      */

-    public function SetCreator(string $creator, bool $isUTF8=false) : void

+    public function SetCreator(string $creator, bool $isUTF8 = false) : void

     {

         // Creator of document

         $this->metadata['Creator'] = $isUTF8 ? $creator : utf8_encode($creator);

@@ -434,7 +434,7 @@ 
      * Defines an alias for the total number of pages. It will be substituted as the document is closed. 

      * @param string $alias The alias. Default value: {nb}. 

      */

-    public function AliasNbPages(string $alias='{nb}') : void

+    public function AliasNbPages(string $alias = '{nb}') : void

     {

         // Define an alias for total number of pages

         $this->AliasNbPages = $alias;

@@ -451,7 +451,7 @@ 
     public function Error(string $msg) : void

     {

         // Fatal error

-        throw new \Exception('FPDF error: '.$msg);

+        throw new \Exception('FPDF error: ' . $msg);

     }

     

     /**

@@ -463,9 +463,9 @@ 
     public function Close() : void

     {

         // Terminate document

-        if($this->state==3)

+        if ($this->state == 3)

             return;

-        if($this->page==0)

+        if ($this->page == 0)

             $this->addPage();

         // Page footer

         $this->InFooter = true;

@@ -505,7 +505,7 @@ 
      *                              It must be a multiple of 90; positive values mean clockwise rotation. </br>

      *                              The default value is 0.

      */

-    public function AddPage(string $orientation='', $size='', int $rotation=0) : void

+    public function AddPage(string $orientation = '', $size = '', int $rotation = 0) : void

     {

         // Start a new page

         if ($this->state == 3) {

@@ -615,7 +615,7 @@ 
      * @param int $g    Green component (between 0 and 255).

      * @param int $b    Blue component (between 0 and 255).

      */

-    public function SetDrawColor(int $r, ?int $g=null, ?int $b=null) : void

+    public function SetDrawColor(int $r, ?int $g = null, ?int $b = null) : void

     {

         // Set color for all stroking operations

         if (($r === 0 && $g === 0 && $b === 0) || $g === null) {

@@ -636,7 +636,7 @@ 
      * @param int $g    Green component (between 0 and 255).

      * @param int $b    Blue component (between 0 and 255).

      */

-    public function SetFillColor(int $r, ?int $g=null, ?int $b=null) : void

+    public function SetFillColor(int $r, ?int $g = null, ?int $b = null) : void

     {

         // Set color for all filling operations

         if (($r === 0 && $g === 0 && $b === 0) || $g === null) {

@@ -658,7 +658,7 @@ 
      * @param int $g    Green component (between 0 and 255).

      * @param int $b    Blue component (between 0 and 255).

      */

-    public function SetTextColor(int $r, ?int $g=null, ?int $b=null) : void

+    public function SetTextColor(int $r, ?int $g = null, ?int $b = null) : void

     {

         // Set color for text

         if (($r === 0 && $g === 0 && $b === 0) || $g === null) {

@@ -678,13 +678,13 @@ 
     public function GetStringWidth(string $s) : float

     {

         // Get width of a string in the current font

-        $s = (string)$s;

+        $s = (string) $s;

         $cw = &$this->CurrentFont['cw'];

         $w = 0;

         $l = strlen($s);

-        for($i=0;$i<$l;$i++)

+        for ($i = 0; $i < $l; $i++)

             $w += $cw[$s[$i]];

-        return $w*$this->FontSize/1000;

+        return $w * $this->FontSize / 1000;

     }

     

     /**

@@ -697,8 +697,8 @@ 
     {

         // Set line width

         $this->LineWidth = $width;

-        if($this->page>0)

-            $this->out(sprintf('%.2F w',$width*$this->k));

+        if ($this->page > 0)

+            $this->out(sprintf('%.2F w', $width * $this->k));

     }

     

     /**

@@ -713,7 +713,7 @@ 
     public function Line(float $x1, float $y1, float $x2, float $y2) : void

     {

         // Draw a line

-        $this->out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));

+        $this->out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));

     }

 

     /**

@@ -731,16 +731,16 @@ 
      *                      <li>   'F': fill. </li>

      *                      <li>   'DF' or 'FD': draw the shape and fill. </li></ul>

      */

-    public function Rect(float $x, float $y, float $w, float $h, string $style='') : void

+    public function Rect(float $x, float $y, float $w, float $h, string $style = '') : void

     {

         // Draw a rectangle

-        if($style=='F')

+        if ($style == 'F')

             $op = 'f';

-        elseif($style=='FD' || $style=='DF')

+        elseif ($style == 'FD' || $style == 'DF')

             $op = 'B';

         else

             $op = 'S';

-        $this->out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));

+        $this->out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));

     }

     

     /**

@@ -760,24 +760,24 @@ 
      * @param string $file      The font definition file. <br/>

      *                          By default, the name is built from the family and style, in lower case with no space.

      */

-    public function AddFont(string $family, string $style='', string $file='') : void

+    public function AddFont(string $family, string $style = '', string $file = '') : void

     {

         // Add a TrueType, OpenType or Type1 font

         $family = strtolower($family);

-        if($file=='')

-            $file = str_replace(' ','',$family).strtolower($style).'.php';

+        if ($file == '')

+            $file = str_replace(' ', '', $family) . strtolower($style) . '.php';

         $style = strtoupper($style);

-        if($style=='IB')

+        if ($style == 'IB')

             $style = 'BI';

-        $fontkey = $family.$style;

-        if(isset($this->fonts[$fontkey]))

+        $fontkey = $family . $style;

+        if (isset($this->fonts[$fontkey]))

             return;

         $info = $this->loadFont($file);

-        $info['i'] = count($this->fonts)+1;

-        if(!empty($info['file']))

+        $info['i'] = count($this->fonts) + 1;

+        if (!empty($info['file']))

         {

             // Embedded font

-            if($info['type']=='TrueType')

+            if ($info['type'] == 'TrueType')

                 $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

             else

                 $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

@@ -820,54 +820,54 @@ 
      *                          The default value is the current size. <br/>

      *                          If no size has been specified since the beginning of the document, the value taken is 12.

      */

-    public function SetFont(string $family, string $style='', float $size=0) : void

+    public function SetFont(string $family, string $style = '', float $size = 0) : void

     {

         // Select a font; size given in points

-        if($family=='')

+        if ($family == '')

             $family = $this->FontFamily;

         else

             $family = strtolower($family);

         $style = strtoupper($style);

-        if(strpos($style,'U')!==false)

+        if (strpos($style, 'U') !== false)

         {

             $this->underline = true;

-            $style = str_replace('U','',$style);

+            $style = str_replace('U', '', $style);

         }

         else

             $this->underline = false;

-        if($style=='IB')

+        if ($style == 'IB')

             $style = 'BI';

-        if($size==0)

+        if ($size == 0)

             $size = $this->FontSizePt;

         // Test if font is already selected

-        if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

+        if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size)

             return;

         // Test if font is already loaded

-        $fontkey = $family.$style;

-        if(!isset($this->fonts[$fontkey]))

+        $fontkey = $family . $style;

+        if (!isset($this->fonts[$fontkey]))

         {

             // Test if one of the core fonts

-            if($family=='arial')

+            if ($family == 'arial')

                 $family = 'helvetica';

-            if(in_array($family,$this->CoreFonts))

+            if (in_array($family, $this->CoreFonts))

             {

-                if($family=='symbol' || $family=='zapfdingbats')

+                if ($family == 'symbol' || $family == 'zapfdingbats')

                     $style = '';

-                $fontkey = $family.$style;

-                if(!isset($this->fonts[$fontkey]))

-                    $this->addFont($family,$style);

+                $fontkey = $family . $style;

+                if (!isset($this->fonts[$fontkey]))

+                    $this->addFont($family, $style);

             }

             else

-                $this->Error('Undefined font: '.$family.' '.$style);

+                $this->Error('Undefined font: ' . $family . ' ' . $style);

         }

         // Select it

         $this->FontFamily = $family;

         $this->FontStyle = $style;

         $this->FontSizePt = $size;

-        $this->FontSize = $size/$this->k;

+        $this->FontSize = $size / $this->k;

         $this->CurrentFont = &$this->fonts[$fontkey];

-        if($this->page>0)

-            $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        if ($this->page > 0)

+            $this->out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

     }

     

     /**

@@ -877,12 +877,12 @@ 
     public function SetFontSize(float $size) : void

     {

         // Set font size in points

-        if($this->FontSizePt==$size)

+        if ($this->FontSizePt == $size)

             return;

         $this->FontSizePt = $size;

-        $this->FontSize = $size/$this->k;

-        if($this->page>0)

-            $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        $this->FontSize = $size / $this->k;

+        if ($this->page > 0)

+            $this->out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));

     }

     

     /**

@@ -895,7 +895,7 @@ 
     public function AddLink() : int

     {

         // Create a new internal link

-        $n = count($this->links)+1;

+        $n = count($this->links) + 1;

         $this->links[$n] = array(0, 0);

         return $n;

     }

@@ -906,12 +906,12 @@ 
      * @param float $y  Y-position of target position; -1 indicates the current position. The default value is 0 (top of page).

      * @param int $page Number of target page; -1 indicates the current page. This is the default value.

      */

-    public function SetLink(int $link, float $y=0, int $page=-1) : void

+    public function SetLink(int $link, float $y = 0, int $page = -1) : void

     {

         // Set destination of internal link

-        if($y==-1)

+        if ($y == -1)

             $y = $this->y;

-        if($page==-1)

+        if ($page == -1)

             $page = $this->page;

         $this->links[$link] = array($page, $y);

     }

@@ -930,7 +930,7 @@ 
     public function Link(float $x, float $y, float $w, float $h, $link) : void

     {

         // Put a link on the page

-        $this->PageLinks[$this->page][] = array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);

+        $this->PageLinks[$this->page][] = array($x * $this->k, $this->hPt - $y * $this->k, $w * $this->k, $h * $this->k, $link);

     }

     

     /**

@@ -946,13 +946,13 @@ 
     public function Text(float $x, float $y, string $txt) : void

     {

         // Output a string

-        if(!isset($this->CurrentFont))

+        if (!isset($this->CurrentFont))

             $this->Error('No font has been set');

-        $s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->escape($txt));

-        if($this->underline && $txt!='')

-            $s .= ' '.$this->doUnderline($x,$y,$txt);

-        if($this->ColorFlag)

-            $s = 'q '.$this->TextColor.' '.$s.' Q';

+        $s = sprintf('BT %.2F %.2F Td (%s) Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $this->escape($txt));

+        if ($this->underline && $txt != '')

+            $s .= ' ' . $this->doUnderline($x, $y, $txt);

+        if ($this->ColorFlag)

+            $s = 'q ' . $this->TextColor . ' ' . $s . ' Q';

         $this->out($s);

     }

     

@@ -1010,80 +1010,80 @@ 
      *                          Default value: false. <br/>

      * @param string|int $link  URL or identifier for internal link created by AddLink().

      */

-    public function Cell(float $w, float $h=0, string $txt='', $border=0, float $ln=0, $align='', $fill=false, $link='') : void

+    public function Cell(float $w, float $h = 0, string $txt = '', $border = 0, float $ln = 0, $align = '', $fill = false, $link = '') : void

     {

         // Output a cell

         $k = $this->k;

-        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

+        if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())

         {

             // Automatic page break

             $x = $this->x;

             $ws = $this->ws;

-            if($ws>0)

+            if ($ws > 0)

             {

                 $this->ws = 0;

                 $this->out('0 Tw');

             }

-            $this->addPage($this->CurOrientation,$this->CurPageSize,$this->CurRotation);

+            $this->addPage($this->CurOrientation, $this->CurPageSize, $this->CurRotation);

             $this->x = $x;

-            if($ws>0)

+            if ($ws > 0)

             {

                 $this->ws = $ws;

-                $this->out(sprintf('%.3F Tw',$ws*$k));

+                $this->out(sprintf('%.3F Tw', $ws * $k));

             }

         }

-        if($w==0)

-            $w = $this->w-$this->rMargin-$this->x;

+        if ($w == 0)

+            $w = $this->w - $this->rMargin - $this->x;

         $s = '';

-        if($fill || $border==1)

+        if ($fill || $border == 1)

         {

-            if($fill)

-                $op = ($border==1) ? 'B' : 'f';

+            if ($fill)

+                $op = ($border == 1) ? 'B' : 'f';

             else

                 $op = 'S';

-            $s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);

+            $s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);

         }

-        if(is_string($border))

+        if (is_string($border))

         {

             $x = $this->x;

             $y = $this->y;

-            if(strpos($border,'L')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

-            if(strpos($border,'T')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

-            if(strpos($border,'R')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

-            if(strpos($border,'B')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

-        }

-        if($txt!=='')

+            if (strpos($border, 'L') !== false)

+                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);

+            if (strpos($border, 'T') !== false)

+                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);

+            if (strpos($border, 'R') !== false)

+                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);

+            if (strpos($border, 'B') !== false)

+                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);

+        }

+        if ($txt !== '')

         {

-            if(!isset($this->CurrentFont))

+            if (!isset($this->CurrentFont))

                 $this->Error('No font has been set');

-            if($align=='R')

-                $dx = $w-$this->cMargin-$this->getStringWidth($txt);

-            elseif($align=='C')

-                $dx = ($w-$this->getStringWidth($txt))/2;

+            if ($align == 'R')

+                $dx = $w - $this->cMargin - $this->getStringWidth($txt);

+            elseif ($align == 'C')

+                $dx = ($w - $this->getStringWidth($txt)) / 2;

             else

                 $dx = $this->cMargin;

-            if($this->ColorFlag)

-                $s .= 'q '.$this->TextColor.' ';

-            $s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->escape($txt));

-            if($this->underline)

-                $s .= ' '.$this->doUnderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-            if($this->ColorFlag)

+            if ($this->ColorFlag)

+                $s .= 'q ' . $this->TextColor . ' ';

+            $s .= sprintf('BT %.2F %.2F Td (%s) Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $this->escape($txt));

+            if ($this->underline)

+                $s .= ' ' . $this->doUnderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);

+            if ($this->ColorFlag)

                 $s .= ' Q';

-            if($link)

-                $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->getStringWidth($txt),$this->FontSize,$link);

+            if ($link)

+                $this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->getStringWidth($txt), $this->FontSize, $link);

         }

-        if($s)

+        if ($s)

             $this->out($s);

         $this->lasth = $h;

-        if($ln>0)

+        if ($ln > 0)

         {

             // Go to next line

             $this->y += $h;

-            if($ln==1)

+            if ($ln == 1)

                 $this->x = $this->lMargin;

         }

         else

@@ -1118,24 +1118,24 @@ 
      *                          If set to true, current FillColor is used for the background. <br/>

      *                          Default value: false.

      */

-    public function MultiCell(float $w, float $h, string $txt, $border=0, string $align='J', bool $fill=false) : void

+    public function MultiCell(float $w, float $h, string $txt, $border = 0, string $align = 'J', bool $fill = false) : void

     {

         // Output text with automatic or explicit line breaks

-        if(!isset($this->CurrentFont))

+        if (!isset($this->CurrentFont))

             $this->Error('No font has been set');

         $cw = &$this->CurrentFont['cw'];

-        if($w==0)

-            $w = $this->w-$this->rMargin-$this->x;

-        $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

-        $s = str_replace("\r",'',$txt);

+        if ($w == 0)

+            $w = $this->w - $this->rMargin - $this->x;

+        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

+        $s = str_replace("\r", '', $txt);

         $nb = strlen($s);

-        if($nb>0 && $s[$nb-1]=="\n")

+        if ($nb > 0 && $s[$nb - 1] == "\n")

             $nb--;

         $b = 0;

         $b2 = '';

-        if($border)

+        if ($border)

         {

-            if($border==1)

+            if ($border == 1)

             {

                 $border = 'LTRB';

                 $b = 'LRT';

@@ -1144,11 +1144,11 @@ 
             else

             {

                 $b2 = '';

-                if(strpos($border,'L')!==false)

+                if (strpos($border, 'L') !== false)

                     $b2 .= 'L';

-                if(strpos($border,'R')!==false)

+                if (strpos($border, 'R') !== false)

                     $b2 .= 'R';

-                $b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;

+                $b = (strpos($border, 'T') !== false) ? $b2 . 'T' : $b2;

             }

         }

         $sep = -1;

@@ -1158,80 +1158,80 @@ 
         $ns = 0;

         $nl = 1;

         $ls = 0;

-        while($i<$nb)

+        while ($i < $nb)

         {

             // Get next character

             $c = $s[$i];

-            if($c=="\n")

+            if ($c == "\n")

             {

                 // Explicit line break

-                if($this->ws>0)

+                if ($this->ws > 0)

                 {

                     $this->ws = 0;

                     $this->out('0 Tw');

                 }

-                $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+                $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

                 $i++;

                 $sep = -1;

                 $j = $i;

                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

+                if ($border && $nl == 2)

                     $b = $b2;

                 continue;

             }

-            if($c==' ')

+            if ($c == ' ')

             {

                 $sep = $i;

                 $ls = $l;

                 $ns++;

             }

             $l += $cw[$c];

-            if($l>$wmax)

+            if ($l > $wmax)

             {

                 // Automatic line break

-                if($sep==-1)

+                if ($sep == -1)

                 {

-                    if($i==$j)

+                    if ($i == $j)

                         $i++;

-                    if($this->ws>0)

+                    if ($this->ws > 0)

                     {

                         $this->ws = 0;

                         $this->out('0 Tw');

                     }

-                    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+                    $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

                 }

                 else

                 {

-                    if($align=='J')

+                    if ($align == 'J')

                     {

-                        $this->ws = ($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;

-                        $this->out(sprintf('%.3F Tw',$this->ws*$this->k));

+                        $this->ws = ($ns > 1) ? ($wmax - $ls) / 1000 * $this->FontSize / ($ns - 1) : 0;

+                        $this->out(sprintf('%.3F Tw', $this->ws * $this->k));

                     }

-                    $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);

-                    $i = $sep+1;

+                    $this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);

+                    $i = $sep + 1;

                 }

                 $sep = -1;

                 $j = $i;

                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

+                if ($border && $nl == 2)

                     $b = $b2;

             }

             else

                 $i++;

         }

         // Last chunk

-        if($this->ws>0)

+        if ($this->ws > 0)

         {

             $this->ws = 0;

             $this->out('0 Tw');

         }

-        if($border && strpos($border,'B')!==false)

+        if ($border && strpos($border, 'B') !== false)

             $b .= 'B';

-        $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

+        $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);

         $this->x = $this->lMargin;

     }

     

@@ -1245,78 +1245,78 @@ 
      * @param string $txt       String to print.

      * @param string|int $link  URL or identifier for internal link created by AddLink().

      */

-    public function Write(float $h, string $txt, $link='') : void

+    public function Write(float $h, string $txt, $link = '') : void

     {

         // Output text in flowing mode

-        if(!isset($this->CurrentFont))

+        if (!isset($this->CurrentFont))

             $this->Error('No font has been set');

         $cw = &$this->CurrentFont['cw'];

-        $w = $this->w-$this->rMargin-$this->x;

-        $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

-        $s = str_replace("\r",'',$txt);

+        $w = $this->w - $this->rMargin - $this->x;

+        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

+        $s = str_replace("\r", '', $txt);

         $nb = strlen($s);

         $sep = -1;

         $i = 0;

         $j = 0;

         $l = 0;

         $nl = 1;

-        while($i<$nb)

+        while ($i < $nb)

         {

             // Get next character

             $c = $s[$i];

-            if($c=="\n")

+            if ($c == "\n")

             {

                 // Explicit line break

-                $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);

+                $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', false, $link);

                 $i++;

                 $sep = -1;

                 $j = $i;

                 $l = 0;

-                if($nl==1)

+                if ($nl == 1)

                 {

                     $this->x = $this->lMargin;

-                    $w = $this->w-$this->rMargin-$this->x;

-                    $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

+                    $w = $this->w - $this->rMargin - $this->x;

+                    $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

                 }

                 $nl++;

                 continue;

             }

-            if($c==' ')

+            if ($c == ' ')

                 $sep = $i;

             $l += $cw[$c];

-            if($l>$wmax)

+            if ($l > $wmax)

             {

                 // Automatic line break

-                if($sep==-1)

+                if ($sep == -1)

                 {

-                    if($this->x>$this->lMargin)

+                    if ($this->x > $this->lMargin)

                     {

                         // Move to next line

                         $this->x = $this->lMargin;

                         $this->y += $h;

-                        $w = $this->w-$this->rMargin-$this->x;

-                        $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

+                        $w = $this->w - $this->rMargin - $this->x;

+                        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

                         $i++;

                         $nl++;

                         continue;

                     }

-                    if($i==$j)

+                    if ($i == $j)

                         $i++;

-                    $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);

+                    $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', false, $link);

                 }

                 else

                 {

-                    $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);

-                    $i = $sep+1;

+                    $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', false, $link);

+                    $i = $sep + 1;

                 }

                 $sep = -1;

                 $j = $i;

                 $l = 0;

-                if($nl==1)

+                if ($nl == 1)

                 {

                     $this->x = $this->lMargin;

-                    $w = $this->w-$this->rMargin-$this->x;

-                    $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

+                    $w = $this->w - $this->rMargin - $this->x;

+                    $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;

                 }

                 $nl++;

             }

@@ -1324,8 +1324,8 @@ 
                 $i++;

         }

         // Last chunk

-        if($i!=$j)

-            $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+        if ($i != $j)

+            $this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j), 0, 0, '', false, $link);

     }

     

     /**

@@ -1335,11 +1335,11 @@ 
      * @param float $h  The height of the break. <br/>

      *                  By default, the value equals the height of the last printed cell.

      */

-    public function Ln(float $h=null) : void

+    public function Ln(float $h = null) : void

     {

         // Line feed; default value is the last cell height

         $this->x = $this->lMargin;

-        if($h===null)

+        if ($h === null)

             $this->y += $this->lasth;

         else

             $this->y += $h;

@@ -1391,7 +1391,7 @@ 
      *                      If not specified, the type is inferred from the file extension. <br/>

      * @param string|int $link  URL or identifier for internal link created by AddLink().

      */

-    public function Image(string $file, ?float $x=null, ?float $y=null, float $w=0, float $h=0, string $type='', $link='') : void

+    public function Image(string $file, ?float $x = null, ?float $y = null, float $w = 0, float $h = 0, string $type = '', $link = '') : void

     {

         // Put an image on the page

         if ($file == '') {

@@ -1409,7 +1409,7 @@ 
                 $type = substr($file, $pos + 1);

             }

             $type = strtolower($type);

-            if($type=='jpeg') {

+            if ($type == 'jpeg') {

                 $type = 'jpg';

             }

             $mtd = 'parse' . ucfirst($type);

@@ -1459,7 +1459,7 @@ 
         }

         $this->out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));

         if ($link) {

-            $this->Link($x,$y,$w,$h,$link);

+            $this->Link($x, $y, $w, $h, $link);

         }

     }

     

@@ -1471,7 +1471,7 @@ 
      * @param int $level

      * @param int $y

      */

-    public function Bookmark(string $txt, bool $isUTF8=false, int $level=0, int $y=0) : void

+    public function Bookmark(string $txt, bool $isUTF8 = false, int $level = 0, int $y = 0) : void

     {

         if (!$isUTF8) {

             $txt = utf8_encode($txt);

@@ -1520,10 +1520,10 @@ 
     public function SetX(float $x) : void

     {

         // Set x position

-        if($x>=0)

+        if ($x >= 0)

             $this->x = $x;

         else

-            $this->x = $this->w+$x;

+            $this->x = $this->w + $x;

     }

 

     /**

@@ -1542,14 +1542,14 @@ 
      * @param float $y

      * @param bool $resetX

      */

-    public function SetY(float $y, bool $resetX=true) : void

+    public function SetY(float $y, bool $resetX = true) : void

     {

         // Set y position and optionally reset x

-        if($y>=0)

+        if ($y >= 0)

             $this->y = $y;

         else

-            $this->y = $this->h+$y;

-        if($resetX)

+            $this->y = $this->h + $y;

+        if ($resetX)

             $this->x = $this->lMargin;

     }

     

@@ -1563,7 +1563,7 @@ 
     {

         // Set x and y positions

         $this->setX($x);

-        $this->setY($y,false);

+        $this->setY($y, false);

     }

     

     /**

@@ -1584,31 +1584,31 @@ 
      *                      The default value is false. <br/>

      * @return string

      */

-    public function Output(string $dest='', string $name='', bool $isUTF8=false) : string

+    public function Output(string $dest = '', string $name = '', bool $isUTF8 = false) : string

     {

         // Output PDF to some destination

         $this->Close();

-        if(strlen($name)==1 && strlen($dest)!=1)

+        if (strlen($name) == 1 && strlen($dest) != 1)

         {

             // Fix parameter order

             $tmp = $dest;

             $dest = $name;

             $name = $tmp;

         }

-        if($dest=='')

+        if ($dest == '')

             $dest = 'I';

-        if($name=='')

+        if ($name == '')

             $name = 'doc.pdf';

-        switch(strtoupper($dest))

+        switch (strtoupper($dest))

         {

             case 'I':

                 // Send to standard output

                 $this->checkOutput();

-                if(PHP_SAPI!='cli')

+                if (PHP_SAPI != 'cli')

                 {

                     // We send to a browser

                     header('Content-Type: application/pdf; charset=UTF-8');

-                    header('Content-Disposition: inline; '.$this->httpEncode('filename',$name,$isUTF8));

+                    header('Content-Disposition: inline; ' . $this->httpEncode('filename', $name, $isUTF8));

                     header('Cache-Control: private, max-age=0, must-revalidate');

                     header('Pragma: public');

                 }

@@ -1618,21 +1618,21 @@ 
                 // Download file

                 $this->checkOutput();

                 header('Content-Type: application/x-download');

-                header('Content-Disposition: attachment; '.$this->httpEncode('filename',$name,$isUTF8));

+                header('Content-Disposition: attachment; ' . $this->httpEncode('filename', $name, $isUTF8));

                 header('Cache-Control: private, max-age=0, must-revalidate');

                 header('Pragma: public');

                 echo $this->buffer;

                 break;

             case 'F':

                 // Save to local file

-                if(!file_put_contents($name,$this->buffer))

-                    $this->Error('Unable to create output file: '.$name);

+                if (!file_put_contents($name, $this->buffer))

+                    $this->Error('Unable to create output file: ' . $name);

                 break;

             case 'S':

                 // Return as a string

                 return $this->buffer;

             default:

-                $this->Error('Incorrect output destination: '.$dest);

+                $this->Error('Incorrect output destination: ' . $dest);

         }

         return '';

     }

@@ -1761,7 +1761,7 @@ 
             $this->CurOrientation = $orientation;

             $this->CurPageSize = $size;

         }

-        if($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1]) {

+        if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1]) {

             $this->PageInfo[$this->page]['size'] = array($this->wPt, $this->hPt);

         }

         if ($rotation != 0) {

@@ -1896,7 +1896,7 @@ 
             strpos($s, ')') !== false || 

             strpos($s, '\\') !== false || 

             strpos($s, "\r") !== false) {

-            $s = str_replace(array('\\','(',')',"\r"), array('\\\\','\\(','\\)','\\r'), $s);

+            $s = str_replace(array('\\', '(', ')', "\r"), array('\\\\', '\\(', '\\)', '\\r'), $s);

         }

         return $s;

     }

@@ -1927,7 +1927,7 @@ 
         // Underline text

         $up = $this->CurrentFont['up'];

         $ut = $this->CurrentFont['ut'];

-        $w = $this->getStringWidth($txt) + $this->ws * substr_count($txt,' ');

+        $w = $this->getStringWidth($txt) + $this->ws * substr_count($txt, ' ');

         return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ($this->h - ($y - $up / 1000 * $this->FontSize)) * $this->k, $w * $this->k, -$ut / 1000 * $this->FontSizePt);

     }

     

@@ -2056,7 +2056,7 @@ 
                         $trns = array($pos);

                     }

                 }

-                $this->readStream($f,4);

+                $this->readStream($f, 4);

             } elseif ($type == 'IDAT') {

                 // Read image data block

                 $data .= $this->readStream($f, $n);

@@ -2094,7 +2094,7 @@ 
             $alpha = '';

             if ($ct == 4) {

                 // Gray image

-                $len = 2*$w;

+                $len = 2 * $w;

                 for ($i = 0; $i < $h; $i++) {

                     $pos = (1 + $len) * $i;

                     $color .= $data[$pos];

@@ -2251,7 +2251,7 @@ 
      * Begin a new object.

      * @param int $n

      */

-    protected function newObject(?int $n=null) : void

+    protected function newObject(?int $n = null) : void

     {

         // Begin a new object

         if ($n === null) {

@@ -2336,7 +2336,7 @@ 
             $this->put(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageInfo[$n]['size'][0], $this->PageInfo[$n]['size'][1]));

         }

         if (isset($this->PageInfo[$n]['rotation'])) {

-            $this->put('/Rotate '.$this->PageInfo[$n]['rotation']);

+            $this->put('/Rotate ' . $this->PageInfo[$n]['rotation']);

         }

         $this->put('/Resources 2 0 R');

         if (isset($this->PageLinks[$n])) {

@@ -2352,12 +2352,12 @@ 
                     if (isset($this->PageInfo[$l[0]]['size'])) {

                         $h = $this->PageInfo[$l[0]]['size'][1];

                     } else {

-                        $h = ($this->DefOrientation=='P') ? $this->DefPageSize[1] * $this->k : $this->DefPageSize[0] * $this->k;

+                        $h = ($this->DefOrientation == 'P') ? $this->DefPageSize[1] * $this->k : $this->DefPageSize[0] * $this->k;

                     }

                     $annots .= sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>', $this->PageInfo[$l[0]]['n'], $h - $l[1] * $this->k);

                 }

             }

-            $this->put($annots.']');

+            $this->put($annots . ']');

         }

         if ($this->WithAlpha) {

             $this->put('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');

@@ -2394,7 +2394,7 @@ 
             }

             $this->put('/Length1 ' . $info['length1']);

             if (isset($info['length2'])) {

-                $this->put('/Length2 '.$info['length2'].' /Length3 0');

+                $this->put('/Length2 ' . $info['length2'] . ' /Length3 0');

             }

             $this->put('>>');

             $this->putStream($font);

@@ -2431,7 +2431,7 @@ 
             if ($font['subsetted']) {

                 $name = 'AAAAAA+' . $name;

             }

-            if ($type=='Core') {

+            if ($type == 'Core') {

                 // Core font

                 $this->newObject();

                 $this->put('<</Type /Font');

@@ -2549,7 +2549,7 @@ 
      */

     protected function putImages() : void

     {

-        foreach(array_keys($this->images) as $file) {

+        foreach (array_keys($this->images) as $file) {

             $this->putImage($this->images[$file]);

             unset($this->images[$file]['data']);

             unset($this->images[$file]['smask']);

@@ -2572,7 +2572,7 @@ 
             $this->put('/ColorSpace [/Indexed /DeviceRGB ' . (strlen($info['pal']) / 3 - 1) . ' ' . ($this->n + 1) . ' 0 R]');

         } else {

             $this->put('/ColorSpace /' . $info['cs']);

-            if($info['cs']=='DeviceCMYK') {

+            if ($info['cs'] == 'DeviceCMYK') {

                 $this->put('/Decode [1 0 1 0 1 0 1 0]');

             }

         }

@@ -2583,7 +2583,7 @@ 
         if (isset($info['dp'])) {

             $this->put('/DecodeParms <<' . $info['dp'] . '>>');

         }

-        if (isset($info['trns']) && is_array($info['trns']))    {

+        if (isset($info['trns']) && is_array($info['trns'])) {

             $trns = '';

             $cnt = count($info['trns']);

             for ($i = 0; $i < $cnt; $i++) {

@@ -2592,7 +2592,7 @@ 
             $this->put('/Mask [' . $trns . ']');

         }

         if (isset($info['smask'])) {

-            $this->put('/SMask ' . ($this->n+1) . ' 0 R');

+            $this->put('/SMask ' . ($this->n + 1) . ' 0 R');

         }

         $this->put('/Length ' . strlen($info['data']) . '>>');

         $this->putStream($info['data']);

@@ -2673,13 +2673,13 @@ 
     protected function putBookmarks() : void

     {

         $nb = count($this->outlines);

-        if( $nb==0 ) {

+        if ($nb == 0) {

             return;

         }

         $lru = array();

         $level = 0;

         foreach ($this->outlines as $i => $o) {

-            if ($o['l']>0) {

+            if ($o['l'] > 0) {

                 $parent = $lru[$o['l'] - 1];

                 // Set parent and last pointers

                 $this->outlines[$i]['parent'] = $parent;

@@ -2701,7 +2701,7 @@ 
                 $level = $o['l'];

         }

         // Outline items

-        $n = $this->n+1;

+        $n = $this->n + 1;

         foreach ($this->outlines as $i=>$o) {

             $this->newObject();

             $this->put('<</Title ' . $this->textString($o['t']));

@@ -2726,7 +2726,7 @@ 
         $this->newObject();

         $this->outlineRoot = $this->n;

         $this->put('<</Type /Outlines /First ' . $n . ' 0 R');

-        $this->put('/Last ' . ($n+$lru[0]) . ' 0 R>>');

+        $this->put('/Last ' . ($n + $lru[0]) . ' 0 R>>');

         $this->put('endobj');

     }

     

@@ -2760,24 +2760,24 @@ 
         $n = $this->PageInfo[1]['n'];

         $this->put('/Type /Catalog');

         $this->put('/Pages 1 0 R');

-        if($this->ZoomMode=='fullpage') {

+        if ($this->ZoomMode == 'fullpage') {

             $this->put('/OpenAction [' . $n . ' 0 R /Fit]');

-        } elseif ($this->ZoomMode=='fullwidth') {

+        } elseif ($this->ZoomMode == 'fullwidth') {

             $this->put('/OpenAction [' . $n . ' 0 R /FitH null]');

-        } elseif($this->ZoomMode=='real') {

+        } elseif ($this->ZoomMode == 'real') {

             $this->put('/OpenAction [' . $n . ' 0 R /XYZ null null 1]');

-        } elseif(!is_string($this->ZoomMode)) {

+        } elseif (!is_string($this->ZoomMode)) {

             $this->put('/OpenAction [' . $n . ' 0 R /XYZ null null ' . sprintf('%.2F', $this->ZoomMode / 100) . ']');

         }

-        if($this->LayoutMode=='single') {

+        if ($this->LayoutMode == 'single') {

             $this->put('/PageLayout /SinglePage');

-        } elseif($this->LayoutMode=='continuous') {

+        } elseif ($this->LayoutMode == 'continuous') {

             $this->put('/PageLayout /OneColumn');

-        } elseif($this->LayoutMode=='two') {

+        } elseif ($this->LayoutMode == 'two') {

             $this->put('/PageLayout /TwoColumnLeft');

         }

         if (count($this->outlines) > 0) {

-            $this->put('/Outlines ' . $this->outlineRoot.' 0 R');

+            $this->put('/Outlines ' . $this->outlineRoot . ' 0 R');

             $this->put('/PageMode /UseOutlines');

         }

         

Braces +231 added lines, -171 removed lines

@@ -259,8 +259,9 @@ 
         // Set left, top and right margins

         $this->lMargin = $left;

         $this->tMargin = $top;

-        if($right===null)

-            $right = $left;

+        if($right===null) {

+                    $right = $left;

+        }

         $this->rMargin = $right;

     }

 

@@ -274,8 +275,9 @@ 
     {

         // Set left margin

         $this->lMargin = $margin;

-        if($this->page>0 && $this->x<$margin)

-            $this->x = $margin;

+        if($this->page>0 && $this->x<$margin) {

+                    $this->x = $margin;

+        }

     }

 

     /**

@@ -347,14 +349,16 @@ 
     public function SetDisplayMode($zoom, string $layout='default') : void

     {

         // Set display mode in viewer

-        if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))

-            $this->ZoomMode = $zoom;

-        else

-            $this->Error('Incorrect zoom display mode: '.$zoom);

-        if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')

-            $this->LayoutMode = $layout;

-        else

-            $this->Error('Incorrect layout display mode: '.$layout);

+        if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom)) {

+                    $this->ZoomMode = $zoom;

+        } else {

+                    $this->Error('Incorrect zoom display mode: '.$zoom);

+        }

+        if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default') {

+                    $this->LayoutMode = $layout;

+        } else {

+                    $this->Error('Incorrect layout display mode: '.$layout);

+        }

     }

 

     /**

@@ -369,10 +373,11 @@ 
     public function SetCompression(bool $compress) : void

     {

         // Set page compression

-        if(function_exists('gzcompress'))

-            $this->compress = $compress;

-        else

-            $this->compress = false;

+        if(function_exists('gzcompress')) {

+                    $this->compress = $compress;

+        } else {

+                    $this->compress = false;

+        }

     }

 

     /**

@@ -463,10 +468,12 @@ 
     public function Close() : void

     {

         // Terminate document

-        if($this->state==3)

-            return;

-        if($this->page==0)

-            $this->addPage();

+        if($this->state==3) {

+                    return;

+        }

+        if($this->page==0) {

+                    $this->addPage();

+        }

         // Page footer

         $this->InFooter = true;

         $this->Footer();

@@ -682,8 +689,9 @@ 
         $cw = &$this->CurrentFont['cw'];

         $w = 0;

         $l = strlen($s);

-        for($i=0;$i<$l;$i++)

-            $w += $cw[$s[$i]];

+        for($i=0;$i<$l;$i++) {

+                    $w += $cw[$s[$i]];

+        }

         return $w*$this->FontSize/1000;

     }

     

@@ -697,8 +705,9 @@ 
     {

         // Set line width

         $this->LineWidth = $width;

-        if($this->page>0)

-            $this->out(sprintf('%.2F w',$width*$this->k));

+        if($this->page>0) {

+                    $this->out(sprintf('%.2F w',$width*$this->k));

+        }

     }

     

     /**

@@ -734,12 +743,13 @@ 
     public function Rect(float $x, float $y, float $w, float $h, string $style='') : void

     {

         // Draw a rectangle

-        if($style=='F')

-            $op = 'f';

-        elseif($style=='FD' || $style=='DF')

-            $op = 'B';

-        else

-            $op = 'S';

+        if($style=='F') {

+                    $op = 'f';

+        } elseif($style=='FD' || $style=='DF') {

+                    $op = 'B';

+        } else {

+                    $op = 'S';

+        }

         $this->out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));

     }

     

@@ -764,23 +774,27 @@ 
     {

         // Add a TrueType, OpenType or Type1 font

         $family = strtolower($family);

-        if($file=='')

-            $file = str_replace(' ','',$family).strtolower($style).'.php';

+        if($file=='') {

+                    $file = str_replace(' ','',$family).strtolower($style).'.php';

+        }

         $style = strtoupper($style);

-        if($style=='IB')

-            $style = 'BI';

+        if($style=='IB') {

+                    $style = 'BI';

+        }

         $fontkey = $family.$style;

-        if(isset($this->fonts[$fontkey]))

-            return;

+        if(isset($this->fonts[$fontkey])) {

+                    return;

+        }

         $info = $this->loadFont($file);

         $info['i'] = count($this->fonts)+1;

         if(!empty($info['file']))

         {

             // Embedded font

-            if($info['type']=='TrueType')

-                $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

-            else

-                $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+            if($info['type']=='TrueType') {

+                            $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);

+            } else {

+                            $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);

+            }

         }

         $this->fonts[$fontkey] = $info;

     }

@@ -823,42 +837,49 @@ 
     public function SetFont(string $family, string $style='', float $size=0) : void

     {

         // Select a font; size given in points

-        if($family=='')

-            $family = $this->FontFamily;

-        else

-            $family = strtolower($family);

+        if($family=='') {

+                    $family = $this->FontFamily;

+        } else {

+                    $family = strtolower($family);

+        }

         $style = strtoupper($style);

         if(strpos($style,'U')!==false)

         {

             $this->underline = true;

             $style = str_replace('U','',$style);

+        } else {

+                    $this->underline = false;

+        }

+        if($style=='IB') {

+                    $style = 'BI';

+        }

+        if($size==0) {

+                    $size = $this->FontSizePt;

         }

-        else

-            $this->underline = false;

-        if($style=='IB')

-            $style = 'BI';

-        if($size==0)

-            $size = $this->FontSizePt;

         // Test if font is already selected

-        if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size)

-            return;

+        if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {

+                    return;

+        }

         // Test if font is already loaded

         $fontkey = $family.$style;

         if(!isset($this->fonts[$fontkey]))

         {

             // Test if one of the core fonts

-            if($family=='arial')

-                $family = 'helvetica';

+            if($family=='arial') {

+                            $family = 'helvetica';

+            }

             if(in_array($family,$this->CoreFonts))

             {

-                if($family=='symbol' || $family=='zapfdingbats')

-                    $style = '';

+                if($family=='symbol' || $family=='zapfdingbats') {

+                                    $style = '';

+                }

                 $fontkey = $family.$style;

-                if(!isset($this->fonts[$fontkey]))

-                    $this->addFont($family,$style);

+                if(!isset($this->fonts[$fontkey])) {

+                                    $this->addFont($family,$style);

+                }

+            } else {

+                            $this->Error('Undefined font: '.$family.' '.$style);

             }

-            else

-                $this->Error('Undefined font: '.$family.' '.$style);

         }

         // Select it

         $this->FontFamily = $family;

@@ -866,8 +887,9 @@ 
         $this->FontSizePt = $size;

         $this->FontSize = $size/$this->k;

         $this->CurrentFont = &$this->fonts[$fontkey];

-        if($this->page>0)

-            $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        if($this->page>0) {

+                    $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        }

     }

     

     /**

@@ -877,12 +899,14 @@ 
     public function SetFontSize(float $size) : void

     {

         // Set font size in points

-        if($this->FontSizePt==$size)

-            return;

+        if($this->FontSizePt==$size) {

+                    return;

+        }

         $this->FontSizePt = $size;

         $this->FontSize = $size/$this->k;

-        if($this->page>0)

-            $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        if($this->page>0) {

+                    $this->out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));

+        }

     }

     

     /**

@@ -909,10 +933,12 @@ 
     public function SetLink(int $link, float $y=0, int $page=-1) : void

     {

         // Set destination of internal link

-        if($y==-1)

-            $y = $this->y;

-        if($page==-1)

-            $page = $this->page;

+        if($y==-1) {

+                    $y = $this->y;

+        }

+        if($page==-1) {

+                    $page = $this->page;

+        }

         $this->links[$link] = array($page, $y);

     }

     

@@ -946,13 +972,16 @@ 
     public function Text(float $x, float $y, string $txt) : void

     {

         // Output a string

-        if(!isset($this->CurrentFont))

-            $this->Error('No font has been set');

+        if(!isset($this->CurrentFont)) {

+                    $this->Error('No font has been set');

+        }

         $s = sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->escape($txt));

-        if($this->underline && $txt!='')

-            $s .= ' '.$this->doUnderline($x,$y,$txt);

-        if($this->ColorFlag)

-            $s = 'q '.$this->TextColor.' '.$s.' Q';

+        if($this->underline && $txt!='') {

+                    $s .= ' '.$this->doUnderline($x,$y,$txt);

+        }

+        if($this->ColorFlag) {

+                    $s = 'q '.$this->TextColor.' '.$s.' Q';

+        }

         $this->out($s);

     }

     

@@ -1032,62 +1061,76 @@ 
                 $this->out(sprintf('%.3F Tw',$ws*$k));

             }

         }

-        if($w==0)

-            $w = $this->w-$this->rMargin-$this->x;

+        if($w==0) {

+                    $w = $this->w-$this->rMargin-$this->x;

+        }

         $s = '';

         if($fill || $border==1)

         {

-            if($fill)

-                $op = ($border==1) ? 'B' : 'f';

-            else

-                $op = 'S';

+            if($fill) {

+                            $op = ($border==1) ? 'B' : 'f';

+            } else {

+                            $op = 'S';

+            }

             $s = sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);

         }

         if(is_string($border))

         {

             $x = $this->x;

             $y = $this->y;

-            if(strpos($border,'L')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

-            if(strpos($border,'T')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

-            if(strpos($border,'R')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

-            if(strpos($border,'B')!==false)

-                $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+            if(strpos($border,'L')!==false) {

+                            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);

+            }

+            if(strpos($border,'T')!==false) {

+                            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);

+            }

+            if(strpos($border,'R')!==false) {

+                            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+            }

+            if(strpos($border,'B')!==false) {

+                            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);

+            }

         }

         if($txt!=='')

         {

-            if(!isset($this->CurrentFont))

-                $this->Error('No font has been set');

-            if($align=='R')

-                $dx = $w-$this->cMargin-$this->getStringWidth($txt);

-            elseif($align=='C')

-                $dx = ($w-$this->getStringWidth($txt))/2;

-            else

-                $dx = $this->cMargin;

-            if($this->ColorFlag)

-                $s .= 'q '.$this->TextColor.' ';

+            if(!isset($this->CurrentFont)) {

+                            $this->Error('No font has been set');

+            }

+            if($align=='R') {

+                            $dx = $w-$this->cMargin-$this->getStringWidth($txt);

+            } elseif($align=='C') {

+                            $dx = ($w-$this->getStringWidth($txt))/2;

+            } else {

+                            $dx = $this->cMargin;

+            }

+            if($this->ColorFlag) {

+                            $s .= 'q '.$this->TextColor.' ';

+            }

             $s .= sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$this->escape($txt));

-            if($this->underline)

-                $s .= ' '.$this->doUnderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

-            if($this->ColorFlag)

-                $s .= ' Q';

-            if($link)

-                $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->getStringWidth($txt),$this->FontSize,$link);

-        }

-        if($s)

-            $this->out($s);

+            if($this->underline) {

+                            $s .= ' '.$this->doUnderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);

+            }

+            if($this->ColorFlag) {

+                            $s .= ' Q';

+            }

+            if($link) {

+                            $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->getStringWidth($txt),$this->FontSize,$link);

+            }

+        }

+        if($s) {

+                    $this->out($s);

+        }

         $this->lasth = $h;

         if($ln>0)

         {

             // Go to next line

             $this->y += $h;

-            if($ln==1)

-                $this->x = $this->lMargin;

+            if($ln==1) {

+                            $this->x = $this->lMargin;

+            }

+        } else {

+                    $this->x += $w;

         }

-        else

-            $this->x += $w;

     }

     

     /**

@@ -1121,16 +1164,19 @@ 
     public function MultiCell(float $w, float $h, string $txt, $border=0, string $align='J', bool $fill=false) : void

     {

         // Output text with automatic or explicit line breaks

-        if(!isset($this->CurrentFont))

-            $this->Error('No font has been set');

+        if(!isset($this->CurrentFont)) {

+                    $this->Error('No font has been set');

+        }

         $cw = &$this->CurrentFont['cw'];

-        if($w==0)

-            $w = $this->w-$this->rMargin-$this->x;

+        if($w==0) {

+                    $w = $this->w-$this->rMargin-$this->x;

+        }

         $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

         $s = str_replace("\r",'',$txt);

         $nb = strlen($s);

-        if($nb>0 && $s[$nb-1]=="\n")

-            $nb--;

+        if($nb>0 && $s[$nb-1]=="\n") {

+                    $nb--;

+        }

         $b = 0;

         $b2 = '';

         if($border)

@@ -1140,14 +1186,15 @@ 
                 $border = 'LTRB';

                 $b = 'LRT';

                 $b2 = 'LR';

-            }

-            else

+            } else

             {

                 $b2 = '';

-                if(strpos($border,'L')!==false)

-                    $b2 .= 'L';

-                if(strpos($border,'R')!==false)

-                    $b2 .= 'R';

+                if(strpos($border,'L')!==false) {

+                                    $b2 .= 'L';

+                }

+                if(strpos($border,'R')!==false) {

+                                    $b2 .= 'R';

+                }

                 $b = (strpos($border,'T')!==false) ? $b2.'T' : $b2;

             }

         }

@@ -1177,8 +1224,9 @@ 
                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

-                    $b = $b2;

+                if($border && $nl==2) {

+                                    $b = $b2;

+                }

                 continue;

             }

             if($c==' ')

@@ -1193,16 +1241,16 @@ 
                 // Automatic line break

                 if($sep==-1)

                 {

-                    if($i==$j)

-                        $i++;

+                    if($i==$j) {

+                                            $i++;

+                    }

                     if($this->ws>0)

                     {

                         $this->ws = 0;

                         $this->out('0 Tw');

                     }

                     $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

-                }

-                else

+                } else

                 {

                     if($align=='J')

                     {

@@ -1217,11 +1265,12 @@ 
                 $l = 0;

                 $ns = 0;

                 $nl++;

-                if($border && $nl==2)

-                    $b = $b2;

+                if($border && $nl==2) {

+                                    $b = $b2;

+                }

+            } else {

+                            $i++;

             }

-            else

-                $i++;

         }

         // Last chunk

         if($this->ws>0)

@@ -1229,8 +1278,9 @@ 
             $this->ws = 0;

             $this->out('0 Tw');

         }

-        if($border && strpos($border,'B')!==false)

-            $b .= 'B';

+        if($border && strpos($border,'B')!==false) {

+                    $b .= 'B';

+        }

         $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);

         $this->x = $this->lMargin;

     }

@@ -1248,8 +1298,9 @@ 
     public function Write(float $h, string $txt, $link='') : void

     {

         // Output text in flowing mode

-        if(!isset($this->CurrentFont))

-            $this->Error('No font has been set');

+        if(!isset($this->CurrentFont)) {

+                    $this->Error('No font has been set');

+        }

         $cw = &$this->CurrentFont['cw'];

         $w = $this->w-$this->rMargin-$this->x;

         $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

@@ -1281,8 +1332,9 @@ 
                 $nl++;

                 continue;

             }

-            if($c==' ')

-                $sep = $i;

+            if($c==' ') {

+                            $sep = $i;

+            }

             $l += $cw[$c];

             if($l>$wmax)

             {

@@ -1300,11 +1352,11 @@ 
                         $nl++;

                         continue;

                     }

-                    if($i==$j)

-                        $i++;

+                    if($i==$j) {

+                                            $i++;

+                    }

                     $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',false,$link);

-                }

-                else

+                } else

                 {

                     $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',false,$link);

                     $i = $sep+1;

@@ -1319,13 +1371,14 @@ 
                     $wmax = ($w-2*$this->cMargin)*1000/$this->FontSize;

                 }

                 $nl++;

+            } else {

+                            $i++;

             }

-            else

-                $i++;

         }

         // Last chunk

-        if($i!=$j)

-            $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+        if($i!=$j) {

+                    $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',false,$link);

+        }

     }

     

     /**

@@ -1339,10 +1392,11 @@ 
     {

         // Line feed; default value is the last cell height

         $this->x = $this->lMargin;

-        if($h===null)

-            $this->y += $this->lasth;

-        else

-            $this->y += $h;

+        if($h===null) {

+                    $this->y += $this->lasth;

+        } else {

+                    $this->y += $h;

+        }

     }

     

     /**

@@ -1520,10 +1574,11 @@ 
     public function SetX(float $x) : void

     {

         // Set x position

-        if($x>=0)

-            $this->x = $x;

-        else

-            $this->x = $this->w+$x;

+        if($x>=0) {

+                    $this->x = $x;

+        } else {

+                    $this->x = $this->w+$x;

+        }

     }

 

     /**

@@ -1545,12 +1600,14 @@ 
     public function SetY(float $y, bool $resetX=true) : void

     {

         // Set y position and optionally reset x

-        if($y>=0)

-            $this->y = $y;

-        else

-            $this->y = $this->h+$y;

-        if($resetX)

-            $this->x = $this->lMargin;

+        if($y>=0) {

+                    $this->y = $y;

+        } else {

+                    $this->y = $this->h+$y;

+        }

+        if($resetX) {

+                    $this->x = $this->lMargin;

+        }

     }

     

     /**

@@ -1595,10 +1652,12 @@ 
             $dest = $name;

             $name = $tmp;

         }

-        if($dest=='')

-            $dest = 'I';

-        if($name=='')

-            $name = 'doc.pdf';

+        if($dest=='') {

+                    $dest = 'I';

+        }

+        if($name=='') {

+                    $name = 'doc.pdf';

+        }

         switch(strtoupper($dest))

         {

             case 'I':

@@ -1625,8 +1684,9 @@ 
                 break;

             case 'F':

                 // Save to local file

-                if(!file_put_contents($name,$this->buffer))

-                    $this->Error('Unable to create output file: '.$name);

+                if(!file_put_contents($name,$this->buffer)) {

+                                    $this->Error('Unable to create output file: '.$name);

+                }

                 break;

             case 'S':

                 // Return as a string

@@ -2688,9 +2748,9 @@ 
                     // Level increasing: set first pointer

                     $this->outlines[$parent]['first'] = $i;

                 }

+            } else {

+                            $this->outlines[$i]['parent'] = $nb;

             }

-            else

-                $this->outlines[$i]['parent'] = $nb;

                 if ($o['l'] <= $level && $i > 0) {

                     // Set prev and next pointers

                     $prev = $lru[$o['l']];

XFPDFExample.class.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
      * define table columns

      * @param string $orientation

      */

-    public function __construct(string $orientation='P') 

+    public function __construct(string $orientation = 'P') 

     {

         // first call parent constructor for general initialization

         parent::__construct($orientation);

@@ -46,14 +46,14 @@ 
         $this->SetPageFooter("Page: {PN}/{NP}\tAuthor: S.Kien\t{D} {T}");

         

         // now we define the columns of our report

-        $this->AddCol('Row',            10, 'R', XPDF::COL_ROW_NR,     XPDF::FLAG_TOTALS_TEXT);

-        $this->AddCol('Date',           35, 'C', 'date',               XPDF::FLAG_DATE);

-        $this->AddCol('Text',           -1, 'L', 'text');

-        $this->AddCol('Grp.',           12, 'C', self::MY_GRP_COL);

-        $this->AddCol('Weight',         20, 'R', 'weight',             XPDF::FLAG_TOTALS_CALC | XPDF::FLAG_NUMBER);

-        $iImgCol = $this->AddCol(-1,     8, 'C', self::MY_IMAGE_COL,   XPDF::FLAG_IMAGE | XPDF::FLAG_TOTALS_EMPTY);

-        $this->AddCol('Price',          25, 'R', 'price',              XPDF::FLAG_TOTALS_CALC | XPDF::FLAG_CUR_SYMBOL);

-        $this->AddCol('Cost per kg',    25, 'R', self::MY_CALC_COL,    XPDF::FLAG_TOTALS_EMPTY);

+        $this->AddCol('Row', 10, 'R', XPDF::COL_ROW_NR, XPDF::FLAG_TOTALS_TEXT);

+        $this->AddCol('Date', 35, 'C', 'date', XPDF::FLAG_DATE);

+        $this->AddCol('Text', -1, 'L', 'text');

+        $this->AddCol('Grp.', 12, 'C', self::MY_GRP_COL);

+        $this->AddCol('Weight', 20, 'R', 'weight', XPDF::FLAG_TOTALS_CALC | XPDF::FLAG_NUMBER);

+        $iImgCol = $this->AddCol(-1, 8, 'C', self::MY_IMAGE_COL, XPDF::FLAG_IMAGE | XPDF::FLAG_TOTALS_EMPTY);

+        $this->AddCol('Price', 25, 'R', 'price', XPDF::FLAG_TOTALS_CALC | XPDF::FLAG_CUR_SYMBOL);

+        $this->AddCol('Cost per kg', 25, 'R', self::MY_CALC_COL, XPDF::FLAG_TOTALS_EMPTY);

         

         // enable the totals/pagetotals and carry-over functionality

         $this->EnableTotals(XPDF::TOTALS | XPDF::PAGE_TOTALS | XPDF::CARRY_OVER);

@@ -67,7 +67,7 @@ 
         $this->SetNumberFormat(1, '', ' kg');

         

         // and set meassuring for the image col

-        $this->SetColImageInfo($iImgCol, 1.5, 2.5, 3 );

+        $this->SetColImageInfo($iImgCol, 1.5, 2.5, 3);

     }

     

     /**

@@ -88,7 +88,7 @@ 
         $strCol = '';

         switch ($iCol) {

             case self::MY_GRP_COL:

-                $aValues = array( '', 'Grp. A', 'Grp. B', 'Grp. C', 'Grp. D');

+                $aValues = array('', 'Grp. A', 'Grp. B', 'Grp. C', 'Grp. D');

                 if ($row['grp_id'] > 0 && $row['grp_id'] <= 4) {

                     $strCol = $aValues[$row['grp_id']];

                 }

@@ -109,7 +109,7 @@ 
             case self::MY_CALC_COL:

                 $fltPricePerKg = 0.0;

                 if (floatval($row['weight']) != 0) {

-                    $fltPricePerKg = floatval($row['price']) / floatval($row['weight']);;

+                    $fltPricePerKg = floatval($row['price']) / floatval($row['weight']); ;

                 }

                 $strCol = $this->formatCurrency($fltPricePerKg, true);

                 break;

@@ -139,7 +139,7 @@ 
         // for grouping

         $date = strtotime($row['date']);

         $strMonth = date('Y-m', $date);

-        if ( $this->strMonth != $strMonth) {

+        if ($this->strMonth != $strMonth) {

             // first row we have no subtotals...

             if ($this->strMonth != '') {

                 $this->EndGroup();

SKien/XFPDF/XPDF.php

Spacing +57 added lines, -57 removed lines

@@ -30,10 +30,10 @@ 
 class XPDF extends FPDF

 {

     /** predifined Col-ID for automated row number */

-    const COL_ROW_NR    = 1000;

+    const COL_ROW_NR = 1000;

     

     /** Bottom margin for trigger of the auto pagebreak */

-    const BOTTOM_MARGIN    = 12;

+    const BOTTOM_MARGIN = 12;

     

     /** totals info                         */

     const FLAG_TOTALS       = 0x0007;

@@ -161,11 +161,11 @@ 
     /** @var int        index of last totals col         */

     protected int $iMaxColTotals = -1;

     /** @var array      calculated totals        */

-    protected array $aTotals  = Array();

+    protected array $aTotals = Array();

     /** @var array      calculated subtotals         */

-    protected array $aSubTotals  = Array();

+    protected array $aSubTotals = Array();

     /** @var array      colspan of the totals        */

-    protected array $aTotalsColSpan  = Array();

+    protected array $aTotalsColSpan = Array();

     /** @var int        current rownumber    */

     protected int $iRow;

     /** @var float      lineheight in mm     */

@@ -197,11 +197,11 @@ 
      * @param string|array $size

      * @see FPDF::__construct()

      */

-    public function __construct(string $orientation='P', string $unit='mm', $size='A4') 

+    public function __construct(string $orientation = 'P', string $unit = 'mm', $size = 'A4') 

     {

         parent::__construct($orientation, $unit, $size);

         

-        $this->SetDisplayMode('fullpage','single');

+        $this->SetDisplayMode('fullpage', 'single');

         $this->SetAutoPageBreak(true, self::BOTTOM_MARGIN);

         $this->AliasNbPages('{NP}');

         $this->SetLocale("en_US.utf8, en_US");

@@ -226,7 +226,7 @@ 
      * @param string $strKeywords

      * @param bool $isUTF8  Indicates if the strings encoded in ISO-8859-1 (false) or UTF-8 (true). (Default: false)

      */

-    public function SetInfo(string $strTitle, string $strSubject, string $strAuthor, string $strKeywords='', bool $isUTF8=false) : void 

+    public function SetInfo(string $strTitle, string $strSubject, string $strAuthor, string $strKeywords = '', bool $isUTF8 = false) : void 

     {

         $this->SetTitle($strTitle, $isUTF8);

         $this->SetSubject($strSubject, $isUTF8);

@@ -292,7 +292,7 @@ 
      * @see XPDF:SetSubject()

      * @see XPDF:SetLogo()  

      */

-    public function SetPageHeader(string $strTitle, string $strHeaderSubject='', string $strLogo='') : void

+    public function SetPageHeader(string $strTitle, string $strHeaderSubject = '', string $strLogo = '') : void

     {

         $this->strPageTitle = $strTitle;

         if (strlen($strLogo) > 0) {

@@ -365,11 +365,11 @@ 
     public function InitGrid(string $strFilename = '') : void

     {

         $this->fontHeader   = new XPDFFont('Arial', 'B', 12);

-        $this->fontSubject  = new XPDFFont('Arial', 'I',  8);

-        $this->fontFooter   = new XPDFFont('Arial', 'I',  8);

-        $this->fontColHeader= new XPDFFont('Arial', 'B', 10);

-        $this->fontSubHeader= new XPDFFont('Arial', 'B', 10);

-        $this->fontRows     = new XPDFFont('Arial', '',  10);

+        $this->fontSubject  = new XPDFFont('Arial', 'I', 8);

+        $this->fontFooter   = new XPDFFont('Arial', 'I', 8);

+        $this->fontColHeader = new XPDFFont('Arial', 'B', 10);

+        $this->fontSubHeader = new XPDFFont('Arial', 'B', 10);

+        $this->fontRows     = new XPDFFont('Arial', '', 10);

         

         $this->fltLineHeight = 8.0;

         

@@ -401,27 +401,27 @@ 
             if ($jsonData) {

                 if (property_exists($jsonData, 'fontHeader')) {

                     $oFont = $jsonData->fontHeader;

-                    $this->fontHeader   = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontHeader = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 if (property_exists($jsonData, 'fontSubject')) {

                     $oFont = $jsonData->fontSubject;

-                    $this->fontSubject  = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontSubject = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 if (property_exists($jsonData, 'fontFooter')) {

                     $oFont = $jsonData->fontFooter;

-                    $this->fontFooter   = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontFooter = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 if (property_exists($jsonData, 'fontColHeader')) {

                     $oFont = $jsonData->fontColHeader;

-                    $this->fontColHeader= new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontColHeader = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 if (property_exists($jsonData, 'fontSubHeader')) {

                     $oFont = $jsonData->fontSubHeader;

-                    $this->fontSubHeader= new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontSubHeader = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 if (property_exists($jsonData, 'fontRows')) {

                     $oFont = $jsonData->fontRows;

-                    $this->fontRows     = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

+                    $this->fontRows = new XPDFFont($oFont->name, $oFont->style, $oFont->size);

                 }

                 

                 $this->fltLineHeight = $this->property($jsonData, 'dblLineHeight', $this->fltLineHeight);

@@ -445,9 +445,9 @@ 
                 $this->bStripped = $this->property($jsonData, 'bStripped', $this->bStripped);

                 $this->border = $this->property($jsonData, 'border', $this->border);

                 

-                $this->bCalcTotals               = $this->property($jsonData, 'bCalcTotals', $this->bCalcTotals);

-                $this->bPageTotals   = $this->property($jsonData, 'bPageTotals', $this->bPageTotals);

-                $this->bCarryOver        = $this->property($jsonData, 'bCarryOver', $this->bCarryOver);

+                $this->bCalcTotals = $this->property($jsonData, 'bCalcTotals', $this->bCalcTotals);

+                $this->bPageTotals = $this->property($jsonData, 'bPageTotals', $this->bPageTotals);

+                $this->bCarryOver = $this->property($jsonData, 'bCarryOver', $this->bCarryOver);

                 

                 $this->strTotals    = $this->property($jsonData, 'strTotals', $this->strTotals);

                 $this->strPageTotals = $this->property($jsonData, 'strPageTotals', $this->strPageTotals);

@@ -516,7 +516,7 @@ 
      * @param string $strSuffix

      * @see XPDF::InitGrid()

      */

-    public function SetNumberFormat(int $iDecimals, string $strPrefix='', string $strSuffix='') : void

+    public function SetNumberFormat(int $iDecimals, string $strPrefix = '', string $strSuffix = '') : void

     {

         $this->iNumberDecimals = $iDecimals;

         $this->strNumberPrefix = $strPrefix;

@@ -572,7 +572,7 @@ 
      */

     public function SetColHeaderFont(string $strFontname, string $strStyle, int $iSize) : void

     {

-        $this->fontColHeader= new XPDFFont($strFontname, $strStyle, $iSize);

+        $this->fontColHeader = new XPDFFont($strFontname, $strStyle, $iSize);

     }

 

     /**

@@ -585,7 +585,7 @@ 
      */

     public function SetSubHeaderFont(string $strFontname, string $strStyle, int $iSize) : void

     {

-        $this->fontSubHeader= new XPDFFont($strFontname, $strStyle, $iSize);

+        $this->fontSubHeader = new XPDFFont($strFontname, $strStyle, $iSize);

     }

     

     /**

@@ -598,7 +598,7 @@ 
      */

     public function SetRowFont(string $strFontname, string $strStyle, int $iSize) : void

     {

-        $this->fontRows     = new XPDFFont($strFontname, $strStyle, $iSize);

+        $this->fontRows = new XPDFFont($strFontname, $strStyle, $iSize);

         $this->SelectFont($this->fontRows);

     }

 

@@ -648,7 +648,7 @@ 
      * @param string $strFillColor

      * @param bool $bStripped

      */

-    public function SetRowColors(string $strTextColor, string $strDrawColor, string $strFillColor, bool $bStripped=true) : void 

+    public function SetRowColors(string $strTextColor, string $strDrawColor, string $strFillColor, bool $bStripped = true) : void 

     {

         $this->strRowTextColor = $strTextColor;

         $this->strRowDrawColor = $strDrawColor;

@@ -679,7 +679,7 @@ 
      * @see XPDF::InitGrid()

      * @param int $iTotals  combination of 

      */

-    public function EnableTotals(int $iTotals=self::TOTALS) : void

+    public function EnableTotals(int $iTotals = self::TOTALS) : void

     {

         $this->bCalcTotals = ($iTotals & self::TOTALS) != 0;

         $this->bPageTotals = ($iTotals & self::PAGE_TOTALS) != 0;

@@ -701,7 +701,7 @@ 
      * @param string $strPageTotals

      * @param string $strCarryOver

      */

-    public function SetTotalsText(string $strTotals, string $strPageTotals='', string $strCarryOver='') : void

+    public function SetTotalsText(string $strTotals, string $strPageTotals = '', string $strCarryOver = '') : void

     {

         $this->strTotals = $strTotals;

         if (strlen($strPageTotals) > 0) {

@@ -722,7 +722,7 @@ 
      * @param int $wFlags          Flags to define behaviour for column

      * @return int                 Index of the inserted col

      */

-    public function AddCol(string $strColHeader, float $fltWidth, string $strAlign, string $strField, int $wFlags=0) : int

+    public function AddCol(string $strColHeader, float $fltWidth, string $strAlign, string $strField, int $wFlags = 0) : int

     {

         $this->iMaxCol++;

         $this->aColWidth[$this->iMaxCol] = $fltWidth;

@@ -825,11 +825,11 @@ 
      * @param string $strTotals

      * @param string $strHeader

      */

-    public function StartGroup(string $strTotals, ?string $strHeader=null) : void

+    public function StartGroup(string $strTotals, ?string $strHeader = null) : void

     {

         $this->strSubTotals = $strTotals;

         $iCount = count($this->aSubTotals);

-        for ($i=0; $i < $iCount; $i++) {

+        for ($i = 0; $i < $iCount; $i++) {

             $this->aSubTotals[$i] = 0.0;

         }

         if ($strHeader) {

@@ -863,7 +863,7 @@ 
      */

     public function SelectTextColor(string $strColor) : void

     {

-        $r=0; $g=0; $b=0;

+        $r = 0; $g = 0; $b = 0;

         $this->getRGB($strColor, $r, $g, $b);

         $this->SetTextColor($r, $g, $b);

     }

@@ -874,7 +874,7 @@ 
      */

     public function SelectDrawColor(string $strColor) : void

     {

-        $r=0; $g=0; $b=0;

+        $r = 0; $g = 0; $b = 0;

         $this->getRGB($strColor, $r, $g, $b);

         $this->SetDrawColor($r, $g, $b);

     }

@@ -885,7 +885,7 @@ 
      */

     public function SelectFillColor(string $strColor) : void

     {

-        $r=0; $g=0; $b=0;

+        $r = 0; $g = 0; $b = 0;

         $this->getRGB($strColor, $r, $g, $b);

         $this->SetFillColor($r, $g, $b);

     }

@@ -1109,7 +1109,7 @@ 
             $bFill = $this->bStripped && (($this->iRow % 2) == 0);

             

             // calc totals if enabled

-            if ($this->bCalcTotals && ($wFlags & self::FLAG_TOTALS_CALC) !=  0) {

+            if ($this->bCalcTotals && ($wFlags & self::FLAG_TOTALS_CALC) != 0) {

                 if (is_numeric($row[$field]) || is_float($row[$field])) {

                     $this->aTotals[$i] += $row[$field]; 

                     $this->aSubTotals[$i] += $row[$field]; 

@@ -1134,7 +1134,7 @@ 
             $link = '';

             if (($wFlags & self::FLAG_INT_LINK) != 0) {

                 $link = $this->InternalLink($i, $row);

-                $this->SetFont('','U');

+                $this->SetFont('', 'U');

                 $this->SelectTextColor($this->strLinkTextColor);

             }

                     

@@ -1148,7 +1148,7 @@ 
                 if (isset($this->aImgInfo[$i])) {

                     $fltTop += $this->aImgInfo[$i]['fltTop'];

                     $fltLeft += $this->aImgInfo[$i]['fltLeft'];

-                    if ($this->aImgInfo[$i]['fltHeight'] > 0 ) {

+                    if ($this->aImgInfo[$i]['fltHeight'] > 0) {

                         $fltHeight = $this->aImgInfo[$i]['fltHeight'];

                     }

                     if ($this->aImgInfo[$i]['fltWidth'] > 0) {

@@ -1352,8 +1352,8 @@ 
      */

     protected function Col(int $iCol, array $row, /** @scrutinizer ignore-unused */ bool &$bFill) : string 

     {

-        $strCol  ='';

-        switch($iCol) {

+        $strCol = '';

+        switch ($iCol) {

             case self::COL_ROW_NR:

                 $strCol = $this->iRow;

                 break;

@@ -1383,14 +1383,14 @@ 
     protected function getRGB(string $strColor, int &$r, int &$g, int &$b) : void

     {

         if ($strColor[0] == '#') {

-            if (strlen( $strColor ) == 7) {

-                $r = intval( substr( $strColor, 1, 2 ), 16);

-                $g = intval( substr( $strColor, 3, 2 ), 16);

-                $b = intval( substr( $strColor, 5, 2 ), 16);

-            } elseif (strlen( $strColor ) == 4) {

-                $r = intval( substr( $strColor, 1, 1 ), 16);

-                $g = intval( substr( $strColor, 2, 1 ), 16);

-                $b = intval( substr( $strColor, 3, 1 ), 16);

+            if (strlen($strColor) == 7) {

+                $r = intval(substr($strColor, 1, 2), 16);

+                $g = intval(substr($strColor, 3, 2), 16);

+                $b = intval(substr($strColor, 5, 2), 16);

+            } elseif (strlen($strColor) == 4) {

+                $r = intval(substr($strColor, 1, 1), 16);

+                $g = intval(substr($strColor, 2, 1), 16);

+                $b = intval(substr($strColor, 3, 1), 16);

                 $r = $r + (16 * $r);

                 $g = $g + (16 * $g);

                 $b = $b + (16 * $b);

@@ -1429,12 +1429,12 @@ 
         // Restore line width

         if ($this->LineWidth != $a['lw']) {

             $this->LineWidth = $a['lw'];

-            $this->out(sprintf( '%.2F w', $a['lw'] * $this->k ));

+            $this->out(sprintf('%.2F w', $a['lw'] * $this->k));

         }

         // Restore font

         if (($a['family'] != $this->FontFamily) ||

-             $a['style']  != $this->FontStyle ||

-             $a['size']   != $this->FontSizePt) {

+             $a['style'] != $this->FontStyle ||

+             $a['size'] != $this->FontSizePt) {

             $this->SetFont($a['family'], $a['style'], $a['size']);

         }

         $this->underline = $a['ul'];

@@ -1442,11 +1442,11 @@ 
         // Restore colors

         if ($this->DrawColor != $a['dc']) {

             $this->DrawColor = $a['dc'];

-            $this->out( $a['dc']);

+            $this->out($a['dc']);

         }

         if ($this->FillColor != $a['fc']) {

             $this->FillColor = $a['fc'];

-            $this->out( $a['fc']);

+            $this->out($a['fc']);

         }

         $this->TextColor = $a['tc'];

         $this->ColorFlag = $a['cf'];

@@ -1460,7 +1460,7 @@ 
      * @param mixed $default

      * @return mixed

      */

-    protected function property(\stdClass $obj, string $strName, $default='')

+    protected function property(\stdClass $obj, string $strName, $default = '')

     {

         $value = $default; 

         if (property_exists($obj, $strName)) {

@@ -1479,7 +1479,7 @@ 
         if ($this->strCharset != 'UTF-8') {

             $strText = iconv('UTF-8', $this->strCharset, $strText);

         }

-        return html_entity_decode( $strText, ENT_QUOTES, 'UTF-8');

+        return html_entity_decode($strText, ENT_QUOTES, 'UTF-8');

     }

 

     /**

@@ -1554,7 +1554,7 @@ 
      * @param bool $bSymbol

      * @return string

      */

-    protected function formatCurrency(float $fltValue, bool $bSymbol=true) : string

+    protected function formatCurrency(float $fltValue, bool $bSymbol = true) : string

     {

         if (!$this->bInvalidLocale) {

             $li = localeconv();