Update besar apk finance
This commit is contained in:
+2
-2
@@ -23,9 +23,9 @@
|
||||
"require": {
|
||||
"php": "^7.1 || ^8.0",
|
||||
"ext-mbstring": "*",
|
||||
"sabberworm/php-css-parser": "^8.4"
|
||||
"sabberworm/php-css-parser": "^8.4 || ^9.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
|
||||
"phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11"
|
||||
}
|
||||
}
|
||||
|
||||
+6
-2
@@ -161,7 +161,9 @@ class Document extends AbstractTag
|
||||
}
|
||||
xml_parse($parser, "", true);
|
||||
|
||||
xml_parser_free($parser);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
xml_parser_free($parser);
|
||||
}
|
||||
|
||||
return $this->handleSizeAttributes($rootAttributes);
|
||||
}
|
||||
@@ -257,7 +259,9 @@ class Document extends AbstractTag
|
||||
|
||||
xml_parse($parser, "", true);
|
||||
|
||||
xml_parser_free($parser);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
xml_parser_free($parser);
|
||||
}
|
||||
}
|
||||
|
||||
protected function svgOffset($attributes)
|
||||
|
||||
+13
-2
@@ -109,6 +109,7 @@ class Style
|
||||
$class = isset($attributes["class"]) ? preg_split('/\s+/', trim($attributes["class"])) : null;
|
||||
|
||||
$stylesheets = $tag->getDocument()->getStyleSheets();
|
||||
$outputFormat = \Sabberworm\CSS\OutputFormat::createCompact();
|
||||
|
||||
$styles = array();
|
||||
|
||||
@@ -127,7 +128,12 @@ class Style
|
||||
if ($_selector === ".$_class") {
|
||||
/** @var \Sabberworm\CSS\Rule\Rule $_rule */
|
||||
foreach ($_decl->getRules() as $_rule) {
|
||||
$styles[$_rule->getRule()] = $_rule->getValue() . "";
|
||||
$value = $_rule->getValue();
|
||||
if ($value instanceof \Sabberworm\CSS\Value\Value) {
|
||||
$styles[$_rule->getRule()] = $value->render($outputFormat) . "";
|
||||
} else {
|
||||
$styles[$_rule->getRule()] = $value . "";
|
||||
}
|
||||
}
|
||||
|
||||
break 2;
|
||||
@@ -139,7 +145,12 @@ class Style
|
||||
if ($_selector === $tag->tagName) {
|
||||
/** @var \Sabberworm\CSS\Rule\Rule $_rule */
|
||||
foreach ($_decl->getRules() as $_rule) {
|
||||
$styles[$_rule->getRule()] = $_rule->getValue() . "";
|
||||
$value = $_rule->getValue();
|
||||
if ($value instanceof \Sabberworm\CSS\Value\Value) {
|
||||
$styles[$_rule->getRule()] = $value->render($outputFormat) . "";
|
||||
} else {
|
||||
$styles[$_rule->getRule()] = $value . "";
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
+19
-7
@@ -5612,7 +5612,9 @@ EOT;
|
||||
// Cast to 8bit+palette
|
||||
$imgalpha_ = @imagecreatefrompng($tempfile_alpha);
|
||||
imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx);
|
||||
imagedestroy($imgalpha_);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($imgalpha_);
|
||||
}
|
||||
imagepng($imgalpha, $tempfile_alpha);
|
||||
|
||||
// Make opaque image
|
||||
@@ -5658,7 +5660,9 @@ EOT;
|
||||
// Cast to 8bit+palette
|
||||
$imgalpha_ = @imagecreatefrompng($tempfile_alpha);
|
||||
imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx);
|
||||
imagedestroy($imgalpha_);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($imgalpha_);
|
||||
}
|
||||
imagepng($imgalpha, $tempfile_alpha);
|
||||
} else {
|
||||
$tempfile_alpha = null;
|
||||
@@ -5711,7 +5715,9 @@ EOT;
|
||||
// extract image without alpha channel
|
||||
$imgplain = imagecreatetruecolor($wpx, $hpx);
|
||||
imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
|
||||
imagedestroy($img);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($img);
|
||||
}
|
||||
|
||||
imagepng($imgalpha, $tempfile_alpha);
|
||||
imagepng($imgplain, $tempfile_plain);
|
||||
@@ -5722,13 +5728,17 @@ EOT;
|
||||
// embed mask image
|
||||
if ($tempfile_alpha) {
|
||||
$this->addImagePng($imgalpha, $tempfile_alpha, $x, $y, $w, $h, true);
|
||||
imagedestroy($imgalpha);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($imgalpha);
|
||||
}
|
||||
$this->imageCache[] = $tempfile_alpha;
|
||||
}
|
||||
|
||||
// embed image, masked with previously embedded mask
|
||||
$this->addImagePng($imgplain, $tempfile_plain, $x, $y, $w, $h, false, ($tempfile_alpha !== null));
|
||||
imagedestroy($imgplain);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($imgplain);
|
||||
}
|
||||
$this->imageCache[] = $tempfile_plain;
|
||||
}
|
||||
|
||||
@@ -5813,11 +5823,13 @@ EOT;
|
||||
}
|
||||
|
||||
imagecopy($img, $imgtmp, 0, 0, 0, 0, $sx, $sy);
|
||||
imagedestroy($imgtmp);
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($imgtmp);
|
||||
}
|
||||
}
|
||||
$this->addImagePng($img, $file, $x, $y, $w, $h);
|
||||
|
||||
if ($img) {
|
||||
if ($img && PHP_MAJOR_VERSION < 8) {
|
||||
imagedestroy($img);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user