From 9b4e7eb58d7363a917ecc4788ccc4c59777cf4be Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Sat, 19 Feb 2022 12:09:00 +0200 Subject: [PATCH] Fixed phpstan issues --- system/src/Grav/Common/Media/Traits/MediaObjectTrait.php | 2 +- system/src/Grav/Common/Page/Medium/AbstractMedia.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php index d5c9ec3ef..e2bb71cd4 100644 --- a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php +++ b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php @@ -586,7 +586,7 @@ trait MediaObjectTrait throw new RuntimeException(sprintf("Default thumbnail image '%s' does not exist!", $thumbnails['system']), 500); } - $image->parent = $this; + $image->set('parent', $this); $this->_thumbnail = $image; } diff --git a/system/src/Grav/Common/Page/Medium/AbstractMedia.php b/system/src/Grav/Common/Page/Medium/AbstractMedia.php index 4e639f16b..95cb2dd49 100644 --- a/system/src/Grav/Common/Page/Medium/AbstractMedia.php +++ b/system/src/Grav/Common/Page/Medium/AbstractMedia.php @@ -495,9 +495,9 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac $attr = $xml ? $xml->attributes() : null; if ($attr instanceof \SimpleXMLElement) { // Get the size from svg image. - if ($attr->width > 0 && $attr->height > 0) { - $width = $attr->width; - $height = $attr->height; + if ($attr->width && $attr->height) { + $width = (string)$attr->width; + $height = (string)$attr->height; } elseif ($attr->viewBox && 4 === count($size = explode(' ', (string)$attr->viewBox))) { [,$width,$height,] = $size; } @@ -940,7 +940,6 @@ abstract class AbstractMedia implements ExportInterface, MediaCollectionInterfac $config = $this->getConfig(); $exifEnabled = !empty($config->get('system.media.auto_metadata_exif')); - /** @var Reader|null $exifReader */ return $exifEnabled && isset($grav['exif']) ? $grav['exif']->getReader() : null; }