dompdf / dompdf

lib/Cpdf.php

Doc Comments +53 added lines, -53 removed lines

@@ -375,8 +375,8 @@ 
     /**
      * Destination object, used to specify the location for the user to jump to, presently on opening
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return string|null
      */
@@ -421,7 +421,7 @@ 
      * set the viewer preferences
      *
      * @param $id
-     * @param $action
+     * @param string $action
      * @param string|array $options
      * @return string|null
      */
@@ -529,8 +529,8 @@ 
     /**
      * define the document catalog, the overall controller for the document
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string|array $options
      * @return string|null
      */
@@ -603,8 +603,8 @@ 
     /**
      * object which is a parent to the pages in the document
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return string|null
      */
@@ -751,8 +751,8 @@ 
     /**
      * define the outlines in the doc, empty for now
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return string|null
      */
@@ -793,8 +793,8 @@ 
     /**
      * an object to hold the font description
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string|array $options
      * @return string|null
      */
@@ -982,8 +982,8 @@ 
     /**
      * a font descriptor, needed for including additional fonts
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1047,8 +1047,8 @@ 
     /**
      * the font encoding
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1101,7 +1101,7 @@ 
      * a descendent cid font, needed for unicode fonts
      *
      * @param $id
-     * @param $action
+     * @param string $action
      * @param string|array $options
      * @return null|string
      */
@@ -1197,7 +1197,7 @@ 
      * a font glyph to character map, needed for unicode fonts
      *
      * @param $id
-     * @param $action
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1253,8 +1253,8 @@ 
     /**
      * the document procset, solves some problems with printing to old PS printers
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1299,7 +1299,7 @@ 
     /**
      * define the document information
      *
-     * @param $id
+     * @param integer $id
      * @param $action
      * @param string $options
      * @return null|string
@@ -1365,8 +1365,8 @@ 
     /**
      * an action object, used to link to URLS initially
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1426,8 +1426,8 @@ 
      * an annotation object, this will add an annotation to the current page.
      * initially will support just link annotations
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1493,7 +1493,7 @@ 
      * a page object, it also creates a contents object to hold its contents
      *
      * @param $id
-     * @param $action
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1603,8 +1603,8 @@ 
     /**
      * the contents objects hold all of the content which appears on pages
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string|array $options
      * @return null|string
      */
@@ -1669,8 +1669,8 @@ 
     }
 
     /**
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @return string|null
      */
     protected function o_embedjs($id, $action)
@@ -1700,8 +1700,8 @@ 
     }
 
     /**
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $code
      * @return null|string
      */
@@ -1736,8 +1736,8 @@ 
     /**
      * an image object, will be an XObject in the document, includes description and data
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1878,8 +1878,8 @@ 
     /**
      * graphics state object
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return null|string
      */
@@ -1945,8 +1945,8 @@ 
     /**
      * encryption object.
      *
-     * @param $id
-     * @param $action
+     * @param integer $id
+     * @param string $action
      * @param string $options
      * @return string|null
      */
@@ -2580,7 +2580,7 @@ 
      * note that encoding='none' will need to be used for symbolic fonts
      * and 'differences' => an array of mappings between numbers 0->255 and character names.
      *
-     * @param $fontName
+     * @param string $fontName
      * @param string $encoding
      * @param bool $set
      * @return int
@@ -4069,11 +4069,11 @@ 
      *
      * @param $x
      * @param $y
-     * @param $angle
+     * @param integer $angle
      * @param $size
-     * @param $wa
+     * @param integer $wa
      * @param $text
-     * @return array
+     * @return double[]
      */
     private function getTextPosition($x, $y, $angle, $size, $wa, $text)
     {
@@ -4568,7 +4568,7 @@ 
     /**
      * add content to the documents info object
      *
-     * @param $label
+     * @param string $label
      * @param int $value
      */
     function addInfo($label, $value = 0)
@@ -4608,8 +4608,8 @@ 
      * extract an integer from a position in a byte stream
      *
      * @param $data
-     * @param $pos
-     * @param $num
+     * @param integer $pos
+     * @param integer $num
      * @return int
      */
     private function getBytes(&$data, $pos, $num)
@@ -4709,8 +4709,8 @@ 
      * @param $file
      * @param $x
      * @param $y
-     * @param $w
-     * @param $h
+     * @param integer $w
+     * @param integer $h
      * @param $byte
      */
     protected function addImagePngAlpha($file, $x, $y, $w, $h, $byte)
@@ -4976,14 +4976,14 @@ 
     /**
      * add a PNG image into the document, from a memory buffer of the file
      *
-     * @param $file
-     * @param $x
-     * @param $y
+     * @param string $file
+     * @param double $x
+     * @param double $y
      * @param float $w
      * @param float $h
-     * @param $data
+     * @param null|string $data
      * @param bool $is_mask
-     * @param null $mask
+     * @param boolean|null $mask
      */
     function addPngFromBuf($file, $x, $y, $w = 0.0, $h = 0.0, &$data, $is_mask = false, $mask = null)
     {
@@ -5319,7 +5319,7 @@ 
 
     /**
      * common code used by the two JPEG adding functions
-     * @param $data
+     * @param null|string $data
      * @param $x
      * @param $y
      * @param int $w
@@ -5453,7 +5453,7 @@ 
      * and for the user to add new ones for their fonts. The default bahavious can be overridden should
      * that be desired.
      *
-     * @param $family
+     * @param string $family
      * @param string $options
      */
     function setFontFamily($family, $options = '')

Spacing +5 added lines, -5 removed lines

@@ -343,7 +343,7 @@ 
     function __construct($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '')
     {
         $this->isUnicode = $isUnicode;
-        $this->fontcache = rtrim($fontcache, DIRECTORY_SEPARATOR."/\\");
+        $this->fontcache = rtrim($fontcache, DIRECTORY_SEPARATOR . "/\\");
         $this->tmp = ($tmp !== '' ? $tmp : sys_get_temp_dir());
         $this->newDocument($pageSize);
 
@@ -510,7 +510,7 @@ 
                     if (is_string($v)) {
                         $v = '/' . $v;
                     } elseif (is_int($v)) {
-                        $v = (string) $v;
+                        $v = (string)$v;
                     } elseif (is_bool($v)) {
                         $v = ($v ? 'true' : 'false');
                     } elseif (is_array($v)) {
@@ -1748,7 +1748,7 @@ 
                 // make the new object
                 $this->objects[$id] = array('t' => 'image', 'data' => &$options['data'], 'info' => array());
 
-                $info =& $this->objects[$id]['info'];
+                $info = & $this->objects[$id]['info'];
 
                 $info['Type'] = '/XObject';
                 $info['Subtype'] = '/Image';
@@ -2241,7 +2241,7 @@ 
         }
 
         if ($this->fileIdentifier === '') {
-            $tmp = implode('',  $this->objects[$this->infoObject]['info']);
+            $tmp = implode('', $this->objects[$this->infoObject]['info']);
             $this->fileIdentifier = md5('DOMPDF' . __FILE__ . $tmp . microtime() . mt_rand());
         }
 
@@ -2346,7 +2346,7 @@ 
 
         $fontcache = $this->fontcache;
         if ($fontcache == '') {
-            $fontcache = rtrim($dir, DIRECTORY_SEPARATOR."/\\");
+            $fontcache = rtrim($dir, DIRECTORY_SEPARATOR . "/\\");
         }
 
         //$name       filename without folder and extension of font metrics

Braces +6 added lines, -2 removed lines

@@ -3810,8 +3810,12 @@
             die("Unable to stream pdf: headers already sent");
         }
 
-        if (!isset($options["compress"])) $options["compress"] = true;
-        if (!isset($options["Attachment"])) $options["Attachment"] = true;
+        if (!isset($options["compress"])) {
+            $options["compress"] = true;
+        }
+        if (!isset($options["Attachment"])) {
+            $options["Attachment"] = true;
+        }
 
         $debug = !$options['compress'];
         $tmp = ltrim($this->output($debug));

src/Adapter/CPDF.php

Doc Comments +2 added lines, -2 removed lines

@@ -253,7 +253,7 @@ 
     /**
      * Returns the Cpdf instance
      *
-     * @return \Cpdf
+     * @return CPDF
      */
     public function get_cpdf()
     {
@@ -1134,7 +1134,7 @@ 
     /**
      * Returns the PDF as a string.
      *
-     * @param array $options Associative array: 'compress' => 1 or 0 (default 1).
+     * @param boolean $options Associative array: 'compress' => 1 or 0 (default 1).
      * @return string
      */
     public function output($options = array())

Braces +21 added lines, -7 removed lines

@@ -834,24 +834,32 @@ 
             case "gif":
             /** @noinspection PhpMissingBreakStatementInspection */
             case "bmp":
-                if ($debug_png) print '!!!bmp or gif!!!';
+                if ($debug_png) {
+                    print '!!!bmp or gif!!!';
+                }
                 // @todo use cache for BMP and GIF
                 $img = $this->_convert_gif_bmp_to_png($img, $type);
 
             case "png":
-                if ($debug_png) print '!!!png!!!';
+                if ($debug_png) {
+                    print '!!!png!!!';
+                }
 
                 $this->_pdf->addPngFromFile($img, $x, $this->y($y) - $h, $w, $h);
                 break;
 
             case "svg":
-                if ($debug_png) print '!!!SVG!!!';
+                if ($debug_png) {
+                    print '!!!SVG!!!';
+                }
 
                 $this->_pdf->addSvgFromFile($img, $x, $this->y($y) - $h, $w, $h);
                 break;
 
             default:
-                if ($debug_png) print '!!!unknown!!!';
+                if ($debug_png) {
+                    print '!!!unknown!!!';
+                }
         }
     }
 
@@ -1111,8 +1119,12 @@ 
             die("Unable to stream pdf: headers already sent");
         }
 
-        if (!isset($options["compress"])) $options["compress"] = true;
-        if (!isset($options["Attachment"])) $options["Attachment"] = true;
+        if (!isset($options["compress"])) {
+            $options["compress"] = true;
+        }
+        if (!isset($options["Attachment"])) {
+            $options["Attachment"] = true;
+        }
 
         $this->_add_page_text();
 
@@ -1139,7 +1151,9 @@ 
      */
     public function output($options = array())
     {
-        if (!isset($options["compress"])) $options["compress"] = true;
+        if (!isset($options["compress"])) {
+            $options["compress"] = true;
+        }
 
         $this->_add_page_text();
 

src/FrameDecorator/Page.php

Unused Use Statements -2 removed lines

@@ -11,8 +11,6 @@
 use Dompdf\Dompdf;
 use Dompdf\Helpers;
 use Dompdf\Frame;
-use Dompdf\FrameDecorator\Table as TableFrameDecorator;
-use Dompdf\FrameDecorator\TableRow as TableRowFrameDecorator;
 use Dompdf\Renderer;
 
 /**

src/Helpers.php

Doc Comments +4 added lines, -1 removed lines

@@ -519,7 +519,7 @@ 
 
     /**
      * @param $c
-     * @return bool|string
+     * @return string|false
      */
     public static function unichr($c)
     {
@@ -865,6 +865,9 @@ 
         return array($result, $headers);
     }
 
+    /**
+     * @param string $str
+     */
     public static function mb_ucwords($str) {
         $max_len = mb_strlen($str);
         if ($max_len === 1) {

Braces +1 added lines, -2 removed lines

@@ -613,8 +613,7 @@
                 $width = (int)$meta['width'];
                 $height = (int)$meta['height'];
                 $type = "bmp";
-            }
-            else {
+            } else {
                 if (strpos($data, "<svg") !== false) {
                     $doc = new \Svg\Document();
                     $doc->loadFile($filename);

lib/html5lib/Data.php

Indentation +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
             // set up bits for UTF-8
             $x = ($code & 0x3F) | 0x80;
             if ($code < 0x800) {
-               $y = (($code & 0x7FF) >> 6) | 0xC0;
+                $y = (($code & 0x7FF) >> 6) | 0xC0;
             } else {
                 $y = (($code & 0xFC0) >> 6) | 0x80;
                 if ($code < 0x10000) {

src/FontMetrics.php

Spacing +5 added lines, -5 removed lines

@@ -97,8 +97,8 @@ 
             $cacheData .= sprintf("  '%s' => array(%s", addslashes($family), PHP_EOL);
             foreach ($variants as $variant => $path) {
                 $path = sprintf("'%s'", $path);
-                $path = str_replace('\'' . $this->getOptions()->getFontDir() , '$fontDir . \'' , $path);
-                $path = str_replace('\'' . $this->getOptions()->getRootDir() , '$rootDir . \'' , $path);
+                $path = str_replace('\'' . $this->getOptions()->getFontDir(), '$fontDir . \'', $path);
+                $path = str_replace('\'' . $this->getOptions()->getRootDir(), '$rootDir . \'', $path);
                 $cacheData .= sprintf("    '%s' => %s,%s", $variant, $path, PHP_EOL);
             }
             $cacheData .= sprintf("  ),%s", PHP_EOL);
@@ -189,7 +189,7 @@ 
         $localTempFile = tempnam($this->options->get("tempDir"), "dompdf-font-");
 
         $cacheEntry = $localFile;
-        $localFile .= ".".strtolower(pathinfo(parse_url($remoteFile, PHP_URL_PATH),PATHINFO_EXTENSION));
+        $localFile .= "." . strtolower(pathinfo(parse_url($remoteFile, PHP_URL_PATH), PATHINFO_EXTENSION));
 
         $entry[$styleString] = $cacheEntry;
 
@@ -213,14 +213,14 @@ 
 
         unlink($localTempFile);
 
-        if ( !file_exists("$cacheEntry.ufm") ) {
+        if (!file_exists("$cacheEntry.ufm")) {
             return false;
         }
 
         // Save the changes
         file_put_contents($localFile, $remoteFileContent);
 
-        if ( !file_exists($localFile) ) {
+        if (!file_exists($localFile)) {
             unlink("$cacheEntry.ufm");
             return false;
         }

src/FrameReflower/AbstractFrameReflower.php

Spacing +12 added lines, -12 removed lines

@@ -93,7 +93,7 @@ 
 
         // Collapse vertical margins:
         $n = $frame->get_next_sibling();
-        if ( $n && !$n->is_block() & !$n->is_table() ) {
+        if ($n && !$n->is_block() & !$n->is_table()) {
             while ($n = $n->get_next_sibling()) {
                 if ($n->is_block() || $n->is_table()) {
                     break;
@@ -116,13 +116,13 @@ 
         // Collapse our first child's margin, if there is no border or padding
         if ($style->get_border_top_width() == 0 && $style->length_in_pt($style->padding_top) == 0) {
             $f = $this->_frame->get_first_child();
-            if ( $f && !$f->is_block() && !$f->is_table() ) {
-                while ( $f = $f->get_next_sibling() ) {
-                    if ( $f->is_block() || $f->is_table() ) {
+            if ($f && !$f->is_block() && !$f->is_table()) {
+                while ($f = $f->get_next_sibling()) {
+                    if ($f->is_block() || $f->is_table()) {
                         break;
                     }
 
-                    if ( !$f->get_first_child() ) {
+                    if (!$f->get_first_child()) {
                         $f = null;
                         break;
                     }
@@ -133,7 +133,7 @@ 
             if ($f) {
                 $f_style = $f->get_style();
                 $t = max($t, (float)$f_style->length_in_pt($f_style->margin_top, $cb["h"]));
-                $style->margin_top = $t."pt";
+                $style->margin_top = $t . "pt";
                 $f_style->margin_top = "0pt";
             }
         }
@@ -141,13 +141,13 @@ 
         // Collapse our last child's margin, if there is no border or padding
         if ($style->get_border_bottom_width() == 0 && $style->length_in_pt($style->padding_bottom) == 0) {
             $l = $this->_frame->get_last_child();
-            if ( $l && !$l->is_block() && !$l->is_table() ) {
-                while ( $l = $l->get_prev_sibling() ) {
-                    if ( $l->is_block() || $l->is_table() ) {
+            if ($l && !$l->is_block() && !$l->is_table()) {
+                while ($l = $l->get_prev_sibling()) {
+                    if ($l->is_block() || $l->is_table()) {
                         break;
                     }
 
-                    if ( !$l->get_last_child() ) {
+                    if (!$l->get_last_child()) {
                         $l = null;
                         break;
                     }
@@ -158,7 +158,7 @@ 
             if ($l) {
                 $l_style = $l->get_style();
                 $b = max($b, (float)$l_style->length_in_pt($l_style->margin_bottom, $cb["h"]));
-                $style->margin_bottom = $b."pt";
+                $style->margin_bottom = $b . "pt";
                 $l_style->margin_bottom = "0pt";
             }
         }
@@ -283,7 +283,7 @@ 
 
         // Convert escaped hex characters into ascii characters (e.g. \A => newline)
         $string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})/",
-            function ($matches) { return \Dompdf\Helpers::unichr(hexdec($matches[1])); },
+            function($matches) { return \Dompdf\Helpers::unichr(hexdec($matches[1])); },
             $string);
         return $string;
     }

src/FrameReflower/Text.php

Braces +3 added lines, -2 removed lines

@@ -243,8 +243,9 @@
                 if (($tmp = $this->_line_break($text)) !== false) {
                     $add_line = $split < $tmp;
                     $split = min($tmp, $split);
-                } else
-                    $add_line = true;
+                } else {
+                                    $add_line = true;
+                }
 
                 break;
 

src/Frame/FrameTree.php

Spacing +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
         if (isset($previousChild, $nextChild)) {
             if ($previousChild->nodeName === "#text" && $nextChild->nodeName === "#text") {
                 $previousChild->nodeValue .= $nextChild->nodeValue;
-                $this->_remove_node($node, $children, $index+1);
+                $this->_remove_node($node, $children, $index + 1);
             }
         }
         array_splice($children, $index, 1);