dompdf / dompdf

src/Css/Style.php

Braces +12 added lines, -36 removed lines

@@ -1033,22 +1033,14 @@ 
             // Legacy support for unitless values, not covered by spec. Might
             // want to restrict this to unitless `0` in the future
             $value = $v;
-        }
-
-        elseif ($unit === "%") {
+        } elseif ($unit === "%") {
             $value = $v / 100 * $ref_size;
-        }
-
-        elseif ($unit === "px") {
+        } elseif ($unit === "px") {
             $dpi = $this->_stylesheet->get_dompdf()->getOptions()->getDpi();
             $value = ($v * 72) / $dpi;
-        }
-
-        elseif ($unit === "pt") {
+        } elseif ($unit === "pt") {
             $value = $v;
-        }
-
-        elseif ($unit === "rem") {
+        } elseif ($unit === "rem") {
             $tree = $this->_stylesheet->get_dompdf()->getTree();
             $root_style = $tree !== null ? $tree->get_root()->get_style() : null;
             $root_font_size = $root_style === null || $root_style === $this
@@ -1062,34 +1054,20 @@ 
             if ($root_style === null) {
                 return $value;
             }
-        }
-
-        elseif ($unit === "em") {
+        } elseif ($unit === "em") {
             $value = $v * $font_size;
-        }
-
-        elseif ($unit === "cm") {
+        } elseif ($unit === "cm") {
             $value = $v * 72 / 2.54;
-        }
-
-        elseif ($unit === "mm") {
+        } elseif ($unit === "mm") {
             $value = $v * 72 / 25.4;
-        }
-
-        elseif ($unit === "ex") {
+        } elseif ($unit === "ex") {
             // FIXME: em:ex ratio?
             $value = $v * $font_size / 2;
-        }
-
-        elseif ($unit === "in") {
+        } elseif ($unit === "in") {
             $value = $v * 72;
-        }
-
-        elseif ($unit === "pc") {
+        } elseif ($unit === "pc") {
             $value = $v * 12;
-        }
-
-        else {
+        } else {
             // Invalid or unsupported declaration
             $value = null;
         }
@@ -3674,9 +3652,7 @@ 
             elseif ($function === "url") {
                 $url = $this->parse_string($arguments);
                 $parts[] = new Url($url);
-            }
-
-            else {
+            } else {
                 return null;
             }
         }

Spacing +24 added lines, -24 removed lines

@@ -185,7 +185,7 @@ 
     protected const CSS_NUMBER = "[+-]?\d*\.?\d+(?:[eE][+-]?\d+)?";
     protected const CSS_STRING = "" .
         '"(?:[^"]|\\\\["])*(?<!\\\\)"|' . // String ""
-        "'(?:[^']|\\\\['])*(?<!\\\\)'";   // String ''
+        "'(?:[^']|\\\\['])*(?<!\\\\)'"; // String ''
 
     /**
      * https://www.w3.org/TR/css-values-3/#custom-idents
@@ -652,7 +652,7 @@ 
         if (!isset(self::$_defaults)) {
 
             // Shorthand
-            $d =& self::$_defaults;
+            $d = & self::$_defaults;
 
             // All CSS 2.1 properties, and their default values
             // Some properties are specified with their computed value for
@@ -990,11 +990,11 @@ 
 
             // Assume numeric values are already in points
             if (is_numeric($l)) {
-                $ret += (float) $l;
+                $ret += (float)$l;
                 continue;
             }
 
-            $val = $this->single_length_in_pt((string) $l, $ref_size, $font_size);
+            $val = $this->single_length_in_pt((string)$l, $ref_size, $font_size);
             $ret += $val ?? 0;
         }
 
@@ -1029,7 +1029,7 @@ 
             return null;
         }
 
-        $v = (float) $matches[1];
+        $v = (float)$matches[1];
         $unit = strtolower($matches[2]);
 
         if ($unit === "") {
@@ -1484,7 +1484,7 @@ 
             if (self::$_methods_cache[$method]) {
                 return $this->$method();
             } else {
-                return implode(" ", array_map(function ($sub_prop) {
+                return implode(" ", array_map(function($sub_prop) {
                     $val = $this->__get($sub_prop);
                     return \is_array($val) ? implode(" ", $val) : $val;
                 }, self::$_props_shorthand[$prop]));
@@ -1712,7 +1712,7 @@ 
         $font_size = $this->__get("font_size");
         $factor = $computed === "normal"
             ? self::$default_line_height
-            : (float) $computed;
+            : (float)$computed;
 
         return $factor * $font_size;
     }
@@ -1931,10 +1931,10 @@ 
         // Use a fixed ref size here. We don't know the border-box width here
         // and font size might be 0. Since we are only interested in whether
         // there is any border radius at all, this should do
-        $tl = (float) $this->length_in_pt($this->border_top_left_radius, 12);
-        $tr = (float) $this->length_in_pt($this->border_top_right_radius, 12);
-        $br = (float) $this->length_in_pt($this->border_bottom_right_radius, 12);
-        $bl = (float) $this->length_in_pt($this->border_bottom_left_radius, 12);
+        $tl = (float)$this->length_in_pt($this->border_top_left_radius, 12);
+        $tr = (float)$this->length_in_pt($this->border_top_right_radius, 12);
+        $br = (float)$this->length_in_pt($this->border_bottom_right_radius, 12);
+        $bl = (float)$this->length_in_pt($this->border_bottom_left_radius, 12);
 
         $this->has_border_radius_cache = $tl + $tr + $br + $bl > 0;
         return $this->has_border_radius_cache;
@@ -1967,10 +1967,10 @@ 
 
         // Resolve percentages relative to width, as long as we have no support
         // for per-axis radii
-        $tl = (float) $this->length_in_pt($this->border_top_left_radius, $w);
-        $tr = (float) $this->length_in_pt($this->border_top_right_radius, $w);
-        $br = (float) $this->length_in_pt($this->border_bottom_right_radius, $w);
-        $bl = (float) $this->length_in_pt($this->border_bottom_left_radius, $w);
+        $tl = (float)$this->length_in_pt($this->border_top_left_radius, $w);
+        $tr = (float)$this->length_in_pt($this->border_top_right_radius, $w);
+        $br = (float)$this->length_in_pt($this->border_bottom_right_radius, $w);
+        $bl = (float)$this->length_in_pt($this->border_bottom_left_radius, $w);
 
         if ($tl + $tr + $br + $bl > 0) {
             [$rx, $ry, $rw, $rh] = $render_box;
@@ -2118,7 +2118,7 @@ 
         // Convert escaped hex characters into ascii characters (e.g. \A => newline)
         return preg_replace_callback(
             "/\\\\([0-9a-fA-F]{0,6})/",
-            function ($matches) { return Helpers::unichr(hexdec($matches[1])); },
+            function($matches) { return Helpers::unichr(hexdec($matches[1])); },
             $string
         ) ?? "";
     }
@@ -2187,7 +2187,7 @@ 
     {
         $integer = self::CSS_INTEGER;
         return preg_match("/^$integer$/", $val)
-            ? (int) $val
+            ? (int)$val
             : null;
     }
 
@@ -2733,7 +2733,7 @@ 
             default:
                 $number = self::CSS_NUMBER;
                 $weight = preg_match("/^$number$/", $val)
-                    ? (int) $val
+                    ? (int)$val
                     : null;
                 return $weight !== null && $weight >= 1 && $weight <= 1000
                     ? $weight
@@ -2888,7 +2888,7 @@ 
 
         // Compute number values to string and lengths to float (in pt)
         if (is_numeric($val)) {
-            return (string) $val;
+            return (string)$val;
         }
 
         $font_size = $this->__get("font_size");
@@ -3560,7 +3560,7 @@ 
                 return null;
             }
 
-            $value = isset($match[2]) ? (int) $match[2] : $default;
+            $value = isset($match[2]) ? (int)$match[2] : $default;
             $counters[$name] = $sumDuplicates
                 ? ($counters[$name] ?? 0) + $value
                 : $value;
@@ -3855,9 +3855,9 @@ 
 
                             foreach ($values as $i => $value) {
                                 if (strpos($value, "rad")) {
-                                    $values[$i] = rad2deg((float) $value);
+                                    $values[$i] = rad2deg((float)$value);
                                 } else {
-                                    $values[$i] = (float) $value;
+                                    $values[$i] = (float)$value;
                                 }
                             }
 
@@ -3940,7 +3940,7 @@ 
 
         $values = preg_split("/\s+/", $computed);
 
-        $values = array_map(function ($value) {
+        $values = array_map(function($value) {
             if (\in_array($value, ["top", "left"], true)) {
                 return 0;
             } elseif (\in_array($value, ["bottom", "right"], true)) {
@@ -4020,7 +4020,7 @@ 
             return null;
         }
 
-        $v = (float) $matches[1];
+        $v = (float)$matches[1];
         $percent = $matches[2] === "%";
         $opacity = $percent ? ($v / 100) : $v;
 

src/FrameReflower/AbstractFrameReflower.php

Spacing +4 added lines, -4 removed lines

@@ -156,7 +156,7 @@ 
 
         // Collapse vertical margins:
         $n = $frame->get_next_sibling();
-        if ( $n && !($n->is_block_level() && $n->is_in_flow()) ) {
+        if ($n && !($n->is_block_level() && $n->is_in_flow())) {
             while ($n = $n->get_next_sibling()) {
                 if ($n->is_block_level() && $n->is_in_flow()) {
                     break;
@@ -181,7 +181,7 @@ 
         // Collapse our first child's margin, if there is no border or padding
         if ($style->border_top_width == 0 && $style->length_in_pt($style->padding_top) == 0) {
             $f = $this->_frame->get_first_child();
-            if ( $f && !($f->is_block_level() && $f->is_in_flow()) ) {
+            if ($f && !($f->is_block_level() && $f->is_in_flow())) {
                 while ($f = $f->get_next_sibling()) {
                     if ($f->is_block_level() && $f->is_in_flow()) {
                         break;
@@ -208,7 +208,7 @@ 
         // Collapse our last child's margin, if there is no border or padding
         if ($style->border_bottom_width == 0 && $style->length_in_pt($style->padding_bottom) == 0) {
             $l = $this->_frame->get_last_child();
-            if ( $l && !($l->is_block_level() && $l->is_in_flow()) ) {
+            if ($l && !($l->is_block_level() && $l->is_in_flow())) {
                 while ($l = $l->get_prev_sibling()) {
                     if ($l->is_block_level() && $l->is_in_flow()) {
                         break;
@@ -475,7 +475,7 @@ 
         ];
 
         // The containing block is not defined yet, treat percentages as 0
-        $delta = (float) $style->length_in_pt($dims, 0);
+        $delta = (float)$style->length_in_pt($dims, 0);
         $min += $delta;
         $max += $delta;
 

Braces +7 added lines, -21 removed lines

@@ -505,40 +505,26 @@
         foreach ($content as $val) {
             if ($val instanceof StringPart) {
                 $text .= $val->string;
-            }
-
-            elseif ($val instanceof OpenQuote) {
+            } elseif ($val instanceof OpenQuote) {
                 // FIXME: Take quotation depth into account
                 if ($quotes !== "none" && isset($quotes[0][0])) {
                     $text .= $quotes[0][0];
                 }
-            }
-
-            elseif ($val instanceof CloseQuote) {
+            } elseif ($val instanceof CloseQuote) {
                 // FIXME: Take quotation depth into account
                 if ($quotes !== "none" && isset($quotes[0][1])) {
                     $text .= $quotes[0][1];
                 }
-            }
-            
-            elseif ($val instanceof NoOpenQuote) {
+            } elseif ($val instanceof NoOpenQuote) {
                 // FIXME: Increment quotation depth
-            }
-
-            elseif ($val instanceof NoCloseQuote) {
+            } elseif ($val instanceof NoCloseQuote) {
                 // FIXME: Decrement quotation depth
-            }
-
-            elseif ($val instanceof Attr) {
+            } elseif ($val instanceof Attr) {
                 $text .= $frame->get_parent()->get_node()->getAttribute($val->attribute);
-            }
-
-            elseif ($val instanceof Counter) {
+            } elseif ($val instanceof Counter) {
                 $p = $frame->lookup_counter_frame($val->name, true);
                 $text .= $p->counter_value($val->name, $val->style);
-            }
-
-            elseif ($val instanceof Counters) {
+            } elseif ($val instanceof Counters) {
                 $p = $frame->lookup_counter_frame($val->name, true);
                 $tmp = [];
                 while ($p) {