Merge remote-tracking branch 'origin/master' into reader-embed-media-support

# Conflicts:
#	src/PhpPresentation/Reader/PowerPoint2007.php
#	src/PhpPresentation/Slide/Background/Image.php

Author: Phil Wilkinson

.github/workflows/validator.yml

@@ -0,0 +1,28 @@
+name: Validator
+on: [push, pull_request]
+jobs:
+  odf:
+    name: ODF Validator
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv
+      - uses: actions/checkout@v2
+
+      - name: Composer Install
+        run: composer install --ansi --prefer-dist --no-interaction --no-progress
+
+      - name: Generate samples files
+        run: composer run samples
+
+      - name: Download ODFValidator
+        run: wget https://repo1.maven.org/maven2/org/odftoolkit/odfvalidator/0.12.0/odfvalidator-0.12.0-jar-with-dependencies.jar -O odfvalidator.jar
+
+      # https://odftoolkit.org/conformance/ODFValidator.html#what-is-checked
+      - name: Validate documents (ODF 1.2)
+        run: java -jar odfvalidator.jar -1.2 -e -r samples/results/ -x "^.*\/Sample_(04|22).*odp" 
+        ## 04 & 22 excluded
+        ## Cause : src/PhpPresentation/Writer/ODPresentation/Content.php::writeTableStyle

.gitignore

@@ -14,7 +14,7 @@ php-cs-fixer.phar
 .phpunit.result.cache
 composer.phar
 vendor
-/batch_CI.bat
+/odfvalidator.jar
 
 ### Samples
 /samples/Sample_00_Test.php

README.md

@@ -139,7 +139,5 @@ More examples are provided in the [samples folder](samples/). You can also read
 
 We welcome everyone to contribute to PHPPresentation. Below are some of the things that you can do to contribute:
 
-- Read [our contributing guide](https://github.com/PHPOffice/PHPPresentation/blob/master/CONTRIBUTING.md)
-- [Fork us](https://github.com/PHPOffice/PHPPresentation/fork) and [request a pull](https://github.com/PHPOffice/PHPPresentation/pulls) to the [develop](https://github.com/PHPOffice/PHPPresentation/tree/develop) branch
+- [Fork us](https://github.com/PHPOffice/PHPPresentation/fork) and [request a pull](https://github.com/PHPOffice/PHPPresentation/pulls) to the [master](https://github.com/PHPOffice/PHPPresentation) branch
 - Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPPresentation/issues) to GitHub
-- Follow [@PHPOffice](https://twitter.com/PHPOffice) on Twitter

composer.json

@@ -28,7 +28,8 @@
     "require-dev": {
         "phpunit/phpunit": ">=7.0",
         "phpmd/phpmd": "2.*",
-        "phpstan/phpstan": "^0.12.88 || ^1.0.0"
+        "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+        "dompdf/dompdf": "^3.1"
     },
     "suggest": {
         "ext-gd": "Required to add images"

docs/changes/1.2.0.md

@@ -4,23 +4,32 @@
 
 ## Enhancements
 
-- `phpoffice/phpspreadsheet`: Allow version 1.9 or 2.0 by [@Progi1984](https://github.com/Progi1984) fixing [#790](https://github.com/PHPOffice/PHPPresentation/pull/790), [#812](https://github.com/PHPOffice/PHPPresentation/pull/812) in [#816](https://github.com/PHPOffice/PHPPresentation/pull/816)
+- `phpoffice/phpspreadsheet`: Allow version 1.9 or 2.0 by [@Progi1984](https://github.com/Progi1984) fixing [#790](https://github.com/PHPOffice/PHPPresentation/issues/790), [#812](https://github.com/PHPOffice/PHPPresentation/pull/812) in [#816](https://github.com/PHPOffice/PHPPresentation/pull/816)
 - Group Shape: moving the shape now moves all contained shapes. Offsets and size are calculated based on the contained shapes by [@DennisBirkholz](https://github.com/DennisBirkholz) in [#690](https://github.com/PHPOffice/PHPPresentation/pull/690)
 - Added support for PHP 8.4 by [@Progi1984](https://github.com/Progi1984) in [#839](https://github.com/PHPOffice/PHPPresentation/pull/839)
-- `phpoffice/phpspreadsheet`: Allow version 3.0 by [@Progi1984](https://github.com/Progi1984) fixing [#836](https://github.com/PHPOffice/PHPPresentation/pull/836) in [#839](https://github.com/PHPOffice/PHPPresentation/pull/839)
+- `phpoffice/phpspreadsheet`: Allow version 3.0 by [@Progi1984](https://github.com/Progi1984) fixing [#836](https://github.com/PHPOffice/PHPPresentation/issues/836) in [#839](https://github.com/PHPOffice/PHPPresentation/pull/839)
 - `createAutoShape` : Add method to create geometric shapes by [@mhasanshahid](https://github.com/mhasanshahid) & [@Progi1984](https://github.com/Progi1984) in [#848](https://github.com/PHPOffice/PHPPresentation/pull/848)
+- Reader : Option to not load images by [@Progi1984](https://github.com/Progi1984) fixing [#795](https://github.com/PHPOffice/PHPPresentation/issues/795) in [#850](https://github.com/PHPOffice/PHPPresentation/pull/850)
+- ODPresentation Writer : Support for rotation for RichText  by [@Progi1984](https://github.com/Progi1984) fixing [#279](https://github.com/PHPOffice/PHPPresentation/pull/279) in [#409](https://github.com/PHPOffice/PHPPresentation/pull/409)
+- HTML Writer by [@Progi1984](https://github.com/Progi1984) fixing [#221](https://github.com/PHPOffice/PHPPresentation/pull/221), [#567](https://github.com/PHPOffice/PHPPresentation/pull/567), [#644](https://github.com/PHPOffice/PHPPresentation/pull/644) in [#850](https://github.com/PHPOffice/PHPPresentation/pull/855)
+- PDF Writer by [@Progi1984](https://github.com/Progi1984) fixing [#181](https://github.com/PHPOffice/PHPPresentation/pull/181), [#381](https://github.com/PHPOffice/PHPPresentation/pull/381), [#472](https://github.com/PHPOffice/PHPPresentation/pull/472), [#693](https://github.com/PHPOffice/PHPPresentation/pull/693), [#725](https://github.com/PHPOffice/PHPPresentation/pull/725) in [#850](https://github.com/PHPOffice/PHPPresentation/pull/855)
+- PowerPoint2007 Reader : Support for BarChart by [@Progi1984](https://github.com/Progi1984) fixing [#824](https://github.com/PHPOffice/PHPPresentation/pull/824) in [#856](https://github.com/PHPOffice/PHPPresentation/pull/856)
 
 ## Bug fixes
 
-- Word2007 Reader: Fixed cast of spacing by [@Progi1984](https://github.com/Progi1984) fixing [#729](https://github.com/PHPOffice/PHPPresentation/pull/729), [#796](https://github.com/PHPOffice/PHPPresentation/pull/796) in [#818](https://github.com/PHPOffice/PHPPresentation/pull/818)
+- PowerPoint2007 Reader: Fixed cast of spacing by [@Progi1984](https://github.com/Progi1984) fixing [#729](https://github.com/PHPOffice/PHPPresentation/pull/729), [#796](https://github.com/PHPOffice/PHPPresentation/pull/796) in [#818](https://github.com/PHPOffice/PHPPresentation/pull/818)
 - CI : Fixed PHPCSFixer by [@kw-pr](https://github.com/kw-pr) in [#835](https://github.com/PHPOffice/PHPPresentation/pull/835)
-- Word2007 Reader: Fixed cast of color by [@Progi1984](https://github.com/Progi1984) fixing [#826](https://github.com/PHPOffice/PHPPresentation/pull/826) in [#840](https://github.com/PHPOffice/PHPPresentation/pull/840)
-- Word2007 Reader: Fixed panose with 20 characters by [@Progi1984](https://github.com/Progi1984) fixing [#798](https://github.com/PHPOffice/PHPPresentation/pull/798) in [#842](https://github.com/PHPOffice/PHPPresentation/pull/842)
+- PowerPoint2007 Reader: Fixed cast of color by [@Progi1984](https://github.com/Progi1984) fixing [#826](https://github.com/PHPOffice/PHPPresentation/pull/826) in [#840](https://github.com/PHPOffice/PHPPresentation/pull/840)
+- PowerPoint2007 Reader: Fixed panose with 20 characters by [@Progi1984](https://github.com/Progi1984) fixing [#798](https://github.com/PHPOffice/PHPPresentation/pull/798) in [#842](https://github.com/PHPOffice/PHPPresentation/pull/842)
 - `Gd::setImageResource()` : Fixed when imagecreatetruecolor returns false  by [@jaapdh](https://github.com/jaapdh) in [#843](https://github.com/PHPOffice/PHPPresentation/pull/843)
-- Word2007 Writer: LineChart supports LabelPosition for Series by [@pal-software](https://github.com/pal-software) fixing [#606](https://github.com/PHPOffice/PHPPresentation/pull/606) in [#8434](https://github.com/PHPOffice/PHPPresentation/pull/844)
+- PowerPoint2007 Writer: LineChart supports LabelPosition for Series by [@pal-software](https://github.com/pal-software) fixing [#606](https://github.com/PHPOffice/PHPPresentation/pull/606) in [#8434](https://github.com/PHPOffice/PHPPresentation/pull/844)
 - `createDrawingShape` has no container defined by [@Progi1984](https://github.com/Progi1984) fixing [#820](https://github.com/PHPOffice/PHPPresentation/pull/820) in [#845](https://github.com/PHPOffice/PHPPresentation/pull/845)
 - ODPresentation Reader : Read differents units for margin by [@Progi1984](https://github.com/Progi1984) fixing [#830](https://github.com/PHPOffice/PHPPresentation/pull/830) in [#847](https://github.com/PHPOffice/PHPPresentation/pull/847)
+- PowerPoint2007 Reader : Fixed loading of fonts by [@ag3202](https://github.com/ag3202) and [@Progi1984](https://github.com/Progi1984) in [#851](https://github.com/PHPOffice/PHPPresentation/pull/851)
+- PhpOffice\PhpPresentation\Style\TextStyle : Fixed typo for default indent by [@Progi1984](https://github.com/Progi1984) in [#857](https://github.com/PHPOffice/PHPPresentation/pull/857)
 
 ## Miscellaneous
+- CI: Added ODFValidator by [@Progi1984](https://github.com/Progi1984) fixing [#678](https://github.com/PHPOffice/PHPWord/issues/678) in [#653](https://github.com/PHPOffice/PHPWord/pull/653)
 
 ## BC Breaks
+- \PhpOffice\PhpPresentation\Style\Border::lineWidth use pixels as reference (and not anymore points)

docs/index.md

@@ -35,6 +35,8 @@ Documentation.
 - Output to different file formats:
     - PowerPoint 2007 (.pptx)
     - OpenDocument Presentation (.odp)
+    - HTML (.html)
+    - PDF (.pdf)
     - Serialized Spreadsheet
 - ... and lots of other things!
 
@@ -50,15 +52,15 @@ Below are the supported features for each file formats.
 | **Document**              | Mark as final        |       |       |       | :material-check: |
 | **Document Properties**   | Standard             |       | :material-check: |       | :material-check: |
 |                           | Custom               |       | :material-check: |       | :material-check: |
-| **Slides**                |                      |       | :material-check: |       | :material-check: |
+| **Slides**                |                      | :material-check: | :material-check: | :material-check: | :material-check: |
 |                           | Name                 |       | :material-check: |       |       |
 | **Element Shape**         | AutoShape            |       |       |       | :material-check: |
-|                           | Image                |       | :material-check: |       | :material-check: |
-|                           | Hyperlink            |       | :material-check: |       | :material-check: |
+|                           | Image                | :material-check: | :material-check: | :material-check: | :material-check: |
+|                           | Hyperlink            | :material-check: | :material-check: | :material-check: | :material-check: |
 |                           | Line                 |       | :material-check: |       | :material-check: |
-|                           | MemoryImage          |       | :material-check: |       | :material-check: |
+|                           | MemoryImage          | :material-check: | :material-check: | :material-check: | :material-check: |
 |                           | RichText             |       | :material-check: |       | :material-check: |
-|                           | Table                |       | :material-check: |       | :material-check: |
+|                           | Table                | :material-check: | :material-check: | :material-check: | :material-check: |
 |                           | Text                 |       | :material-check: |       | :material-check: |
 | **Charts**                | Area                 |       | :material-check: |       | :material-check: |
 |                           | Bar                  |       | :material-check: |       | :material-check: |
@@ -84,10 +86,10 @@ Below are the supported features for each file formats.
 |                           | Image                | :material-check: | :material-check: | :material-check: |
 |                           | Hyperlink            | :material-check: | :material-check: | :material-check: |
 |                           | RichText             | :material-check: | :material-check: | :material-check: |
-|                           | Table                |       |       |       |
+|                           | Table                |       |       | :material-check: |
 |                           | Text                 | :material-check: | :material-check: | :material-check: |
 | **Charts**                | Area                 |       |       |       |
-|                           | Bar                  |       |       |       |
+|                           | Bar                  |       |       | :material-check: |
 |                           | Bar3D                |       |       |       |
 |                           | Doughnut             |       |       |       |
 |                           | Line                 |       |       |       |
@@ -101,7 +103,5 @@ Below are the supported features for each file formats.
 
 We welcome everyone to contribute to PHPPresentation. Below are some of the things that you can do to contribute:
 
--  Read [our contributing guide](https://github.com/PHPOffice/PHPPresentation/blob/master/CONTRIBUTING.md)
--  [Fork us](https://github.com/PHPOffice/PHPPresentation/fork) and [request a pull](https://github.com/PHPOffice/PHPPresentation/pulls) to the [develop](https://github.com/PHPOffice/PHPPresentation/tree/develop) branch
+-  [Fork us](https://github.com/PHPOffice/PHPPresentation/fork) and [request a pull](https://github.com/PHPOffice/PHPPresentation/pulls) to the [master](https://github.com/PHPOffice/PHPPresentation) branch
 -  Submit [bug reports or feature requests](https://github.com/PHPOffice/PHPPresentation/issues) to GitHub
--  Follow [@PHPOffice](https://twitter.com/PHPOffice) on Twitter

docs/usage/readers.md

@@ -10,6 +10,21 @@ $reader = IOFactory::createReader('ODPresentation');
 $reader->load(__DIR__ . '/sample.odp');
 ```
 
+### Options
+
+#### Load without images
+
+You can load a presentation without images.
+
+``` php
+<?php
+
+use PhpOffice\PhpPresentation\Reader\ODPresentation;
+
+$reader = new ODPresentation();
+$reader->load(__DIR__ . '/sample.odp', ODPresentation::SKIP_IMAGES);
+```
+
 ## PowerPoint97
 The name of the reader is `PowerPoint97`.
 
@@ -20,6 +35,21 @@ $reader = IOFactory::createReader('PowerPoint97');
 $reader->load(__DIR__ . '/sample.ppt');
 ```
 
+### Options
+
+#### Load without images
+
+You can load a presentation without images.
+
+``` php
+<?php
+
+use PhpOffice\PhpPresentation\Reader\PowerPoint97;
+
+$reader = new PowerPoint97();
+$reader->load(__DIR__ . '/sample.ppt', PowerPoint97::SKIP_IMAGES);
+```
+
 ## PowerPoint2007
 The name of the reader is `PowerPoint2007`.
 
@@ -30,6 +60,21 @@ $reader = IOFactory::createReader('PowerPoint2007');
 $reader->load(__DIR__ . '/sample.pptx');
 ```
 
+### Options
+
+#### Load without images
+
+You can load a presentation without images.
+
+``` php
+<?php
+
+use PhpOffice\PhpPresentation\Reader\PowerPoint2007;
+
+$reader = new PowerPoint2007();
+$reader->load(__DIR__ . '/sample.pptx', PowerPoint2007::SKIP_IMAGES);
+```
+
 ## Serialized
 The name of the reader is `Serialized`.
 

docs/usage/writers.md

@@ -1,5 +1,15 @@
 # Writers
 
+## HTML
+The name of the writer is `HTML`.
+
+``` php
+<?php
+
+$writer = IOFactory::createWriter($oPhpPresentation, 'HTML');
+$writer->save(__DIR__ . '/sample.html');
+```
+
 ## ODPresentation
 The name of the writer is `ODPresentation`.
 
@@ -10,6 +20,19 @@ $writer = IOFactory::createWriter($oPhpPresentation, 'PowerPoint2007');
 $writer->save(__DIR__ . '/sample.pptx');
 ```
 
+## PDF
+The name of the writer is `PDF`.
+
+``` php
+<?php
+
+use PhpOffice\PhpPresentation\Writer\PDF\DomPDF;
+
+$writer = IOFactory::createWriter($oPhpPresentation, 'PDF');
+$writer->setPDFAdapter(new DomPDF());
+$writer->save(__DIR__ . '/sample.pdf');
+```
+
 ## PowerPoint2007
 The name of the writer is `PowerPoint2007`.
 

phpmd.xml.dist

@@ -26,7 +26,7 @@
         <!-- PptSlides needs more coupling (default: 13) -->
         <!-- Writer/Office2007/AbstractSlide needs more coupling (default: 13) -->
 		<properties>
-            <property name="maximum" value="35" />
+            <property name="maximum" value="38" />
         </properties>
     </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">

phpstan.neon.dist

@@ -24,6 +24,8 @@ parameters:
     - '#^Parameter \#1 \$image of function imagesy expects GdImage, resource given\.#'
     - '#^Parameter \#1 \$image of function imagealphablending expects GdImage, resource given\.#'
     - '#^Parameter \#1 \$image of function imagesavealpha expects GdImage, resource given\.#'
+    # # PHP 8.0 & Attribute
+    - '#^Attribute class PHPUnit\\Framework\\Attributes\\DataProvider does not exist\.#'
 
   ## Remove after remove ArrayObject
   treatPhpDocTypesAsCertain: false