Merge branch 'master' into fix/svg-error

Author: seanlynchwv

.github/workflows/php.yml

@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
         -   name: Setup PHP
             uses: shivammathur/setup-php@v2
@@ -68,30 +68,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
       -   name: Setup PHP
           uses: shivammathur/setup-php@v2
           with:
               php-version: ${{ matrix.php }}
               extensions: gd, xml, zip
-              coverage: ${{ (matrix.php == '7.3') && 'xdebug' || 'none' }}
+              coverage: ${{ (matrix.php == '8.3') && 'xdebug' || 'none' }}
 
       -   uses: actions/checkout@v2
 
       -   name: Composer Install
           run: composer install --ansi --prefer-dist --no-interaction --no-progress
 
       -   name: Run phpunit
-          if: matrix.php != '7.3'
+          if: matrix.php != '8.3'
           run: ./vendor/bin/phpunit -c phpunit.xml.dist --no-coverage
 
       -   name: Run phpunit
-          if: matrix.php == '7.3'
+          if: matrix.php == '8.3'
           run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
 
       -   name: Upload coverage results to Coveralls
-          if: matrix.php == '7.3'
+          if: matrix.php == '8.3'
           env:
             COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           run: |
@@ -105,7 +105,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
       -   name: Setup PHP
           uses: shivammathur/setup-php@v2

composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": "^7.1|^8.0",
+        "php": "^7.4|^8.0",
         "ext-xml": "*",
         "ext-zip": "*",
         "phpoffice/common": "^1",
@@ -28,7 +28,7 @@
     "require-dev": {
         "phpunit/phpunit": ">=7.0",
         "phpmd/phpmd": "2.*",
-        "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+        "phpstan/phpstan": "^2.2",
         "dompdf/dompdf": "^3.1"
     },
     "suggest": {

docs/changes/1.3.0.md

@@ -4,7 +4,11 @@
 
 ## Enhancements
 - `phpoffice/phpspreadsheet`: Allow version 5.0 by [@seanlynchwv](http://github.com/seanlynchwv) in [#879](https://github.com/PHPOffice/PHPPresentation/pull/879)
+- Raised the minimum PHP version to 7.4 (dropped 7.1, 7.2 and 7.3) by [@slayerfx](http://github.com/slayerfx) in [#894](https://github.com/PHPOffice/PHPPresentation/pull/894)
 
 ## Bug fixes
 - Fixed adding custom SVGs by [@seanlynchwv](http://github.com/seanlynchwv) in [#881](https://github.com/PHPOffice/PHPPresentation/pull/881)
+- Guarded `imagedestroy()` calls behind a PHP version check (no-op since PHP 8.0, deprecated in PHP 8.5) by [@slayerfx](http://github.com/slayerfx) in [#893](https://github.com/PHPOffice/PHPPresentation/pull/893)
+- Fixed code coverage configuration for PHPUnit 10+ by [@slayerfx](http://github.com/slayerfx) in [#895](https://github.com/PHPOffice/PHPPresentation/pull/895)
+- Fixed static analysis on PHP 8.4 and 8.5 (PHPStan 1.x could not resolve the symbols of PHPUnit 13) by [@yasumorishima](http://github.com/yasumorishima) in [#897](https://github.com/PHPOffice/PHPPresentation/pull/897)
 

phpunit.xml.dist

@@ -2,20 +2,17 @@
 <phpunit 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     backupGlobals="false"
-    backupStaticAttributes="false"
     bootstrap="./tests/bootstrap.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertDeprecationsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
+  </source>
+  <coverage>
     <report>
       <clover outputFile="./build/logs/clover.xml"/>
       <html outputDirectory="./build/coverage"/>

src/PhpPresentation/GeometryCalculator.php

@@ -37,7 +37,7 @@ public static function calculateOffsets(ShapeContainerInterface $container): arr
     {
         $offsets = [self::X => 0, self::Y => 0];
 
-        if (null !== $container && 0 != count($container->getShapeCollection())) {
+        if (0 != count($container->getShapeCollection())) {
             $shapes = $container->getShapeCollection();
             if (null !== $shapes[0]) {
                 $offsets[self::X] = $shapes[0]->getOffsetX();
@@ -70,7 +70,7 @@ public static function calculateExtents(ShapeContainerInterface $container): arr
         /** @var array<string, int> $extents */
         $extents = [self::X => 0, self::Y => 0];
 
-        if (null !== $container && 0 != count($container->getShapeCollection())) {
+        if (0 != count($container->getShapeCollection())) {
             $shapes = $container->getShapeCollection();
             if (null !== $shapes[0]) {
                 $extents[self::X] = (int) ($shapes[0]->getOffsetX() + $shapes[0]->getWidth());

src/PhpPresentation/Reader/ODPresentation.php

@@ -63,7 +63,7 @@ class ODPresentation implements ReaderInterface
     protected $oZip;
 
     /**
-     * @var array<string, array{alignment: null|Alignment, background: null, shadow: null|Shadow, fill: null|Fill, spacingAfter: null|int, spacingBefore: null|int, lineSpacingMode: null, lineSpacing: null, font: null, listStyle: null}>
+     * @var array<string, array{alignment: null|Alignment, background: null|BackgroundColor|Image, fill: null|Fill, font: null|Font, shadow: null|Shadow, listStyle: null|array<int, array{alignment: Alignment, bullet: Bullet}>, spacingAfter: null|float, spacingBefore: null|float, lineSpacingMode: null|string, lineSpacing: null|string}>
      */
     protected $arrayStyles = [];
 
@@ -662,7 +662,7 @@ protected function readParagraph(RichText $oShape, DOMElement $oNodeParent): voi
                     $oParagraph->setLineSpacingMode($this->arrayStyles[$keyStyle]['lineSpacingMode']);
                 }
                 if (!empty($this->arrayStyles[$keyStyle]['lineSpacing'])) {
-                    $oParagraph->setLineSpacing($this->arrayStyles[$keyStyle]['lineSpacing']);
+                    $oParagraph->setLineSpacing((int) $this->arrayStyles[$keyStyle]['lineSpacing']);
                 }
             }
         }

src/PhpPresentation/Reader/PowerPoint2007.php

@@ -237,20 +237,26 @@ protected function loadDocumentProperties(string $sPart): void
                 '/cp:coreProperties/dc:subject' => 'setSubject',
                 '/cp:coreProperties/cp:keywords' => 'setKeywords',
                 '/cp:coreProperties/cp:category' => 'setCategory',
-                '/cp:coreProperties/dcterms:created' => 'setCreated',
-                '/cp:coreProperties/dcterms:modified' => 'setModified',
                 '/cp:coreProperties/cp:revision' => 'setRevision',
                 '/cp:coreProperties/cp:contentStatus' => 'setStatus',
             ];
+            $arrayDateProperties = [
+                '/cp:coreProperties/dcterms:created' => 'setCreated',
+                '/cp:coreProperties/dcterms:modified' => 'setModified',
+            ];
             $oProperties = $this->oPhpPresentation->getDocumentProperties();
             foreach ($arrayProperties as $path => $property) {
                 $oElement = $xmlReader->getElement($path);
                 if ($oElement instanceof DOMElement) {
-                    if ($oElement->hasAttribute('xsi:type') && 'dcterms:W3CDTF' == $oElement->getAttribute('xsi:type')) {
-                        $dateTime = DateTime::createFromFormat(DateTime::W3C, $oElement->nodeValue);
+                    $oProperties->{$property}((string) $oElement->nodeValue);
+                }
+            }
+            foreach ($arrayDateProperties as $path => $property) {
+                $oElement = $xmlReader->getElement($path);
+                if ($oElement instanceof DOMElement) {
+                    $dateTime = DateTime::createFromFormat(DateTime::W3C, (string) $oElement->nodeValue);
+                    if (false !== $dateTime) {
                         $oProperties->{$property}($dateTime->getTimestamp());
-                    } else {
-                        $oProperties->{$property}($oElement->nodeValue);
                     }
                 }
             }
@@ -905,44 +911,42 @@ protected function loadShapeDrawing(XMLReader $document, DOMElement $node, Abstr
      */
     protected function loadShadow(XMLReader $document, DOMElement $node): ?Shadow
     {
-        if ($node instanceof DOMElement) {
-            $aNodes = $document->getElements('*', $node);
-            foreach ($aNodes as $nodeShadow) {
-                $type = explode(':', $nodeShadow->tagName);
-                $type = array_pop($type);
-                if ($type == Shadow::TYPE_SHADOW_INNER || $type == Shadow::TYPE_SHADOW_OUTER || $type == Shadow::TYPE_REFLECTION) {
-                    $oShadow = new Shadow();
-                    $oShadow->setVisible(true);
-                    $oShadow->setType($type);
-                    if ($nodeShadow->hasAttribute('blurRad')) {
-                        $oShadow->setBlurRadius((int) CommonDrawing::emuToPixels((int) $nodeShadow->getAttribute('blurRad')));
-                    }
-                    if ($nodeShadow->hasAttribute('dist')) {
-                        $oShadow->setDistance((int) CommonDrawing::emuToPixels((int) $nodeShadow->getAttribute('dist')));
-                    }
-                    if ($nodeShadow->hasAttribute('dir')) {
-                        $oShadow->setDirection((int) CommonDrawing::angleToDegrees((int) $nodeShadow->getAttribute('dir')));
-                    }
-                    if ($nodeShadow->hasAttribute('algn')) {
-                        $oShadow->setAlignment($node->getAttribute('algn'));
-                    }
-
-                    // Get color define by prstClr
-                    $oSubElement = $document->getElement('a:prstClr', $nodeShadow);
-                    if ($oSubElement instanceof DOMElement && $oSubElement->hasAttribute('val')) {
-                        $oColor = new Color();
-                        $oColor->setRGB($oSubElement->getAttribute('val'));
+        $aNodes = $document->getElements('*', $node);
+        foreach ($aNodes as $nodeShadow) {
+            $type = explode(':', $nodeShadow->tagName);
+            $type = array_pop($type);
+            if ($type == Shadow::TYPE_SHADOW_INNER || $type == Shadow::TYPE_SHADOW_OUTER || $type == Shadow::TYPE_REFLECTION) {
+                $oShadow = new Shadow();
+                $oShadow->setVisible(true);
+                $oShadow->setType($type);
+                if ($nodeShadow->hasAttribute('blurRad')) {
+                    $oShadow->setBlurRadius((int) CommonDrawing::emuToPixels((int) $nodeShadow->getAttribute('blurRad')));
+                }
+                if ($nodeShadow->hasAttribute('dist')) {
+                    $oShadow->setDistance((int) CommonDrawing::emuToPixels((int) $nodeShadow->getAttribute('dist')));
+                }
+                if ($nodeShadow->hasAttribute('dir')) {
+                    $oShadow->setDirection((int) CommonDrawing::angleToDegrees((int) $nodeShadow->getAttribute('dir')));
+                }
+                if ($nodeShadow->hasAttribute('algn')) {
+                    $oShadow->setAlignment($node->getAttribute('algn'));
+                }
 
-                        $oSubElt = $document->getElement('a:alpha', $oSubElement);
-                        if ($oSubElt instanceof DOMElement && $oSubElt->hasAttribute('val')) {
-                            $oColor->setAlpha((int) $oSubElt->getAttribute('val') / 1000);
-                        }
+                // Get color define by prstClr
+                $oSubElement = $document->getElement('a:prstClr', $nodeShadow);
+                if ($oSubElement instanceof DOMElement && $oSubElement->hasAttribute('val')) {
+                    $oColor = new Color();
+                    $oColor->setRGB($oSubElement->getAttribute('val'));
 
-                        $oShadow->setColor($oColor);
+                    $oSubElt = $document->getElement('a:alpha', $oSubElement);
+                    if ($oSubElt instanceof DOMElement && $oSubElt->hasAttribute('val')) {
+                        $oColor->setAlpha((int) $oSubElt->getAttribute('val') / 1000);
                     }
 
-                    return $oShadow;
+                    $oShadow->setColor($oColor);
                 }
+
+                return $oShadow;
             }
         }
 

src/PhpPresentation/Shape/Chart/Series.php

@@ -134,7 +134,7 @@ class Series implements ComparableInterface
     /**
      * Values (key/value).
      *
-     * @var array<string, null|string>
+     * @var array<array-key, null|string>
      */
     private $values = [];
 
@@ -146,7 +146,7 @@ class Series implements ComparableInterface
     private $hashIndex;
 
     /**
-     * @param array<string, null|string> $values
+     * @param array<array-key, null|string> $values
      */
     public function __construct(string $title = 'Series Title', array $values = [])
     {
@@ -239,7 +239,7 @@ public function getDataPointFills(): array
     /**
      * Get Values.
      *
-     * @return array<string, null|string>
+     * @return array<array-key, null|string>
      */
     public function getValues(): array
     {
@@ -249,7 +249,7 @@ public function getValues(): array
     /**
      * Set Values.
      *
-     * @param array<string, null|string> $values
+     * @param array<array-key, null|string> $values
      */
     public function setValues(array $values = []): self
     {

src/PhpPresentation/Writer/ODPresentation/Content.php

@@ -461,9 +461,7 @@ protected function writeShapeDrawing(XMLWriter $objWriter, AbstractDrawingAdapte
         $objWriter->writeAttribute('draw:style-name', 'gr' . $this->shapeId);
         // draw:image
         $objWriter->startElement('draw:image');
-        if ($shape instanceof AbstractDrawingAdapter) {
-            $objWriter->writeAttribute('xlink:href', 'Pictures/' . $shape->getIndexedFilename());
-        }
+        $objWriter->writeAttribute('xlink:href', 'Pictures/' . $shape->getIndexedFilename());
         $objWriter->writeAttribute('xlink:type', 'simple');
         $objWriter->writeAttribute('xlink:show', 'embed');
         $objWriter->writeAttribute('xlink:actuate', 'onLoad');

src/PhpPresentation/Writer/ODPresentation/MetaInfManifest.php

@@ -106,7 +106,9 @@ public function render(): ZipInterface
             // PNG : 8bit, non-interlaced with full alpha transparency
             $gdImage = imagecreatefromstring(file_get_contents($pathThumbnail));
             if ($gdImage) {
-                imagedestroy($gdImage);
+                if (PHP_VERSION_ID < 80000) {
+                    imagedestroy($gdImage);
+                }
                 $objWriter->startElement('manifest:file-entry');
                 $objWriter->writeAttribute('manifest:media-type', 'image/png');
                 $objWriter->writeAttribute('manifest:full-path', 'Thumbnails/thumbnail.png');