From 71b625a06ee94962728bfd4a3d9fb7bfb1b3b707 Mon Sep 17 00:00:00 2001
From: Sambit Chakraborty <smbtchakraborty@gmail.com>
Date: Sat, 18 Jan 2025 00:08:50 +0530
Subject: [PATCH] Update: Code conventions for PHP 8.x & Update: .gitignore to
 include composer.lock (in support of PR #2722 : Autoload)

---
 .gitignore                                      |  1 +
 src/PhpWord/IOFactory.php                       |  2 +-
 src/PhpWord/Writer/{ePub3.php => EPub3.php}     | 13 ++++++-------
 .../{ePub3 => EPub3}/Part/AbstractPart.php      |  9 +++++----
 .../Writer/{ePub3 => EPub3}/Part/Content.php    |  7 ++++---
 .../Writer/{ePub3 => EPub3}/Part/Manifest.php   |  5 +++--
 .../Writer/{ePub3 => EPub3}/Part/Meta.php       |  7 ++++---
 .../Writer/{ePub3 => EPub3}/Part/Mimetype.php   |  5 +++--
 .../{ePub3 => EPub3}/Style/AbstractStyle.php    |  9 +++++----
 .../Writer/{ePub3 => EPub3}/Style/Font.php      |  5 +++--
 .../Writer/{ePub3 => EPub3}/Style/Paragraph.php |  5 +++--
 .../Writer/{ePub3 => EPub3}/Style/Table.php     |  5 +++--
 .../Writer/{ePub3Test.php => EPub3Test.php}     | 17 +++++++++--------
 13 files changed, 50 insertions(+), 40 deletions(-)
 rename src/PhpWord/Writer/{ePub3.php => EPub3.php} (88%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Part/AbstractPart.php (86%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Part/Content.php (90%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Part/Manifest.php (93%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Part/Meta.php (89%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Part/Mimetype.php (91%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Style/AbstractStyle.php (86%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Style/Font.php (92%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Style/Paragraph.php (92%)
 rename src/PhpWord/Writer/{ePub3 => EPub3}/Style/Table.php (93%)
 rename tests/PhpWordTests/Writer/{ePub3Test.php => EPub3Test.php} (92%)

diff --git a/.gitignore b/.gitignore
index 0b9d0608d0..6918df72e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ _build
 /build
 phpunit.xml
 composer.phar
+composer.lock
 vendor
 /report
 /build
diff --git a/src/PhpWord/IOFactory.php b/src/PhpWord/IOFactory.php
index 5325dbf4b3..50c419cae2 100644
--- a/src/PhpWord/IOFactory.php
+++ b/src/PhpWord/IOFactory.php
@@ -36,7 +36,7 @@ abstract class IOFactory
      */
     public static function createWriter(PhpWord $phpWord, $name = 'Word2007')
     {
-        if ($name !== 'WriterInterface' && !in_array($name, ['ODText', 'RTF', 'Word2007', 'HTML', 'PDF', 'EPUB'], true)) {
+        if ($name !== 'WriterInterface' && !in_array($name, ['ODText', 'RTF', 'Word2007', 'HTML', 'PDF', 'EPub3'], true)) {
             throw new Exception("\"{$name}\" is not a valid writer.");
         }
 
diff --git a/src/PhpWord/Writer/ePub3.php b/src/PhpWord/Writer/EPub3.php
similarity index 88%
rename from src/PhpWord/Writer/ePub3.php
rename to src/PhpWord/Writer/EPub3.php
index d273017118..b9eb5a00f2 100644
--- a/src/PhpWord/Writer/ePub3.php
+++ b/src/PhpWord/Writer/EPub3.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -19,17 +20,15 @@
 
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Writer\ePub3\Part\AbstractPart;
+use PhpOffice\PhpWord\Writer\EPub3\Part\AbstractPart;
 
 /**
- * ePub3 writer.
+ * EPub3 writer.
  */
-class ePub3 extends AbstractWriter implements WriterInterface
+class EPub3 extends AbstractWriter implements WriterInterface
 {
     /**
-     * Create new ePub3 writer.
-     *
-     * @param \PhpOffice\PhpWord\PhpWord
+     * Create new EPub3 writer.
      */
     public function __construct(?PhpWord $phpWord = null)
     {
@@ -47,7 +46,7 @@ public function __construct(?PhpWord $phpWord = null)
         foreach (array_keys($this->parts) as $partName) {
             $partClass = static::class . '\\Part\\' . $partName;
             if (class_exists($partClass)) {
-                /** @var \PhpOffice\PhpWord\Writer\ePub3\Part\AbstractPart $partObject Type hint */
+                /** @var AbstractPart $partObject Type hint */
                 $partObject = new $partClass();
                 $partObject->setParentWriter($this);
                 $this->writerParts[strtolower($partName)] = $partObject;
diff --git a/src/PhpWord/Writer/ePub3/Part/AbstractPart.php b/src/PhpWord/Writer/EPub3/Part/AbstractPart.php
similarity index 86%
rename from src/PhpWord/Writer/ePub3/Part/AbstractPart.php
rename to src/PhpWord/Writer/EPub3/Part/AbstractPart.php
index 25f5c930fd..c3b79b2d26 100644
--- a/src/PhpWord/Writer/ePub3/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/EPub3/Part/AbstractPart.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,19 +16,19 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Part;
+namespace PhpOffice\PhpWord\Writer\EPub3\Part;
 
 use PhpOffice\PhpWord\Writer\AbstractWriter;
 
 /**
- * Abstract class for ePub3 parts.
+ * Abstract class for EPub3 parts.
  */
 abstract class AbstractPart
 {
     /**
      * Parent writer.
      *
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var AbstractWriter
      */
     protected $parentWriter;
 
@@ -46,7 +47,7 @@ public function setParentWriter(AbstractWriter $writer)
     /**
      * Get parent writer.
      *
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @return AbstractWriter
      */
     public function getParentWriter()
     {
diff --git a/src/PhpWord/Writer/ePub3/Part/Content.php b/src/PhpWord/Writer/EPub3/Part/Content.php
similarity index 90%
rename from src/PhpWord/Writer/ePub3/Part/Content.php
rename to src/PhpWord/Writer/EPub3/Part/Content.php
index 1573c2db07..add42b35c5 100644
--- a/src/PhpWord/Writer/ePub3/Part/Content.php
+++ b/src/PhpWord/Writer/EPub3/Part/Content.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Part;
+namespace PhpOffice\PhpWord\Writer\EPub3\Part;
 
 /**
- * Class for ePub3 content part.
+ * Class for EPub3 content part.
  */
 class Content extends AbstractPart
 {
@@ -32,7 +33,7 @@ public function write()
         $content = '<?xml version="1.0" encoding="UTF-8"?>';
         $content .= '<package xmlns="http://www.idpf.org/2007/opf" version="3.0">';
         $content .= '<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">';
-        $content .= '<dc:title>Sample ePub3 Document</dc:title>';
+        $content .= '<dc:title>Sample EPub3 Document</dc:title>';
         $content .= '<dc:language>en</dc:language>';
         $content .= '</metadata>';
         $content .= '<manifest>';
diff --git a/src/PhpWord/Writer/ePub3/Part/Manifest.php b/src/PhpWord/Writer/EPub3/Part/Manifest.php
similarity index 93%
rename from src/PhpWord/Writer/ePub3/Part/Manifest.php
rename to src/PhpWord/Writer/EPub3/Part/Manifest.php
index cad39b1db4..9c5143f434 100644
--- a/src/PhpWord/Writer/ePub3/Part/Manifest.php
+++ b/src/PhpWord/Writer/EPub3/Part/Manifest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Part;
+namespace PhpOffice\PhpWord\Writer\EPub3\Part;
 
 /**
- * Class for ePub3 manifest part.
+ * Class for EPub3 manifest part.
  */
 class Manifest extends AbstractPart
 {
diff --git a/src/PhpWord/Writer/ePub3/Part/Meta.php b/src/PhpWord/Writer/EPub3/Part/Meta.php
similarity index 89%
rename from src/PhpWord/Writer/ePub3/Part/Meta.php
rename to src/PhpWord/Writer/EPub3/Part/Meta.php
index 5e30ac9af6..04531f45d2 100644
--- a/src/PhpWord/Writer/ePub3/Part/Meta.php
+++ b/src/PhpWord/Writer/EPub3/Part/Meta.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Part;
+namespace PhpOffice\PhpWord\Writer\EPub3\Part;
 
 /**
- * Class for ePub3 metadata part.
+ * Class for EPub3 metadata part.
  */
 class Meta extends AbstractPart
 {
@@ -31,7 +32,7 @@ public function write()
     {
         $content = '<?xml version="1.0" encoding="UTF-8"?>';
         $content .= '<metadata xmlns="http://www.idpf.org/2007/opf">';
-        $content .= '<dc:title>Sample ePub3 Document</dc:title>';
+        $content .= '<dc:title>Sample EPub3 Document</dc:title>';
         $content .= '<dc:language>en</dc:language>';
         $content .= '<dc:identifier id="bookid">urn:uuid:12345</dc:identifier>';
         $content .= '<meta property="dcterms:modified">2023-01-01T00:00:00Z</meta>';
diff --git a/src/PhpWord/Writer/ePub3/Part/Mimetype.php b/src/PhpWord/Writer/EPub3/Part/Mimetype.php
similarity index 91%
rename from src/PhpWord/Writer/ePub3/Part/Mimetype.php
rename to src/PhpWord/Writer/EPub3/Part/Mimetype.php
index 48251d2749..36dc9168b1 100644
--- a/src/PhpWord/Writer/ePub3/Part/Mimetype.php
+++ b/src/PhpWord/Writer/EPub3/Part/Mimetype.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Part;
+namespace PhpOffice\PhpWord\Writer\EPub3\Part;
 
 /**
- * Class for ePub3 mimetype part.
+ * Class for EPub3 mimetype part.
  */
 class Mimetype extends AbstractPart
 {
diff --git a/src/PhpWord/Writer/ePub3/Style/AbstractStyle.php b/src/PhpWord/Writer/EPub3/Style/AbstractStyle.php
similarity index 86%
rename from src/PhpWord/Writer/ePub3/Style/AbstractStyle.php
rename to src/PhpWord/Writer/EPub3/Style/AbstractStyle.php
index 0a566e4feb..49e22b5852 100644
--- a/src/PhpWord/Writer/ePub3/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/EPub3/Style/AbstractStyle.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,19 +16,19 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Style;
+namespace PhpOffice\PhpWord\Writer\EPub3\Style;
 
 use PhpOffice\PhpWord\Writer\AbstractWriter;
 
 /**
- * Abstract class for ePub3 styles.
+ * Abstract class for EPub3 styles.
  */
 abstract class AbstractStyle
 {
     /**
      * Parent writer.
      *
-     * @var \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @var AbstractWriter
      */
     protected $parentWriter;
 
@@ -46,7 +47,7 @@ public function setParentWriter(AbstractWriter $writer)
     /**
      * Get parent writer.
      *
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
+     * @return AbstractWriter
      */
     public function getParentWriter()
     {
diff --git a/src/PhpWord/Writer/ePub3/Style/Font.php b/src/PhpWord/Writer/EPub3/Style/Font.php
similarity index 92%
rename from src/PhpWord/Writer/ePub3/Style/Font.php
rename to src/PhpWord/Writer/EPub3/Style/Font.php
index 8c402d52b0..3f3ffd1544 100644
--- a/src/PhpWord/Writer/ePub3/Style/Font.php
+++ b/src/PhpWord/Writer/EPub3/Style/Font.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Style;
+namespace PhpOffice\PhpWord\Writer\EPub3\Style;
 
 /**
- * Class for ePub3 font styles.
+ * Class for EPub3 font styles.
  */
 class Font extends AbstractStyle
 {
diff --git a/src/PhpWord/Writer/ePub3/Style/Paragraph.php b/src/PhpWord/Writer/EPub3/Style/Paragraph.php
similarity index 92%
rename from src/PhpWord/Writer/ePub3/Style/Paragraph.php
rename to src/PhpWord/Writer/EPub3/Style/Paragraph.php
index c140609f25..dddc85e703 100644
--- a/src/PhpWord/Writer/ePub3/Style/Paragraph.php
+++ b/src/PhpWord/Writer/EPub3/Style/Paragraph.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Style;
+namespace PhpOffice\PhpWord\Writer\EPub3\Style;
 
 /**
- * Class for ePub3 paragraph styles.
+ * Class for EPub3 paragraph styles.
  */
 class Paragraph extends AbstractStyle
 {
diff --git a/src/PhpWord/Writer/ePub3/Style/Table.php b/src/PhpWord/Writer/EPub3/Style/Table.php
similarity index 93%
rename from src/PhpWord/Writer/ePub3/Style/Table.php
rename to src/PhpWord/Writer/EPub3/Style/Table.php
index 2fc39157ef..898ddebff5 100644
--- a/src/PhpWord/Writer/ePub3/Style/Table.php
+++ b/src/PhpWord/Writer/EPub3/Style/Table.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -15,10 +16,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Writer\ePub3\Style;
+namespace PhpOffice\PhpWord\Writer\EPub3\Style;
 
 /**
- * Class for ePub3 table styles.
+ * Class for EPub3 table styles.
  */
 class Table extends AbstractStyle
 {
diff --git a/tests/PhpWordTests/Writer/ePub3Test.php b/tests/PhpWordTests/Writer/EPub3Test.php
similarity index 92%
rename from tests/PhpWordTests/Writer/ePub3Test.php
rename to tests/PhpWordTests/Writer/EPub3Test.php
index 81ee17d3c9..44a2060e03 100644
--- a/tests/PhpWordTests/Writer/ePub3Test.php
+++ b/tests/PhpWordTests/Writer/EPub3Test.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -19,21 +20,21 @@
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\Writer\ePub3;
+use PhpOffice\PhpWord\Writer\EPub3;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Epub3.
  *
  * @runTestsInSeparateProcesses
  */
-class ePub3Test extends \PHPUnit\Framework\TestCase
+class EPub3Test extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test document construction.
      */
     public function testConstruct(): void
     {
-        $object = new ePub3(new PhpWord());
+        $object = new EPub3(new PhpWord());
         self::assertInstanceOf(PhpWord::class, $object->getPhpWord());
         self::assertEquals('./', $object->getDiskCachingDirectory());
         foreach (['Content', 'Manifest', 'Mimetype'] as $part) {
@@ -55,7 +56,7 @@ public function testConstructWithNull(): void
     {
         $this->expectException(\PhpOffice\PhpWord\Exception\Exception::class);
         $this->expectExceptionMessage('No PhpWord assigned.');
-        $object = new ePub3();
+        $object = new EPub3();
         $object->getPhpWord();
     }
 
@@ -76,7 +77,7 @@ public function testSave(): void
         $section->addTitle('Test', 1);
         $section->addPageBreak();
         $section->addImage($imageSrc);
-        $writer = new ePub3($phpWord);
+        $writer = new EPub3($phpWord);
         $writer->save($file);
         self::assertFileExists($file);
         unlink($file);
@@ -90,7 +91,7 @@ public function testSavePhpOutput(): void
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Test');
-        $writer = new ePub3($phpWord);
+        $writer = new EPub3($phpWord);
         ob_start();
         $writer->save('php://output');
         $contents = ob_get_contents();
@@ -103,7 +104,7 @@ public function testSavePhpOutput(): void
      */
     public function testSetGetUseDiskCaching(): void
     {
-        $object = new ePub3();
+        $object = new EPub3();
         $object->setUseDiskCaching(true, PHPWORD_TESTS_BASE_DIR);
         self::assertTrue($object->isUseDiskCaching());
         self::assertEquals(PHPWORD_TESTS_BASE_DIR, $object->getDiskCachingDirectory());
@@ -117,7 +118,7 @@ public function testSetUseDiskCachingException(): void
         $this->expectException(\PhpOffice\PhpWord\Exception\Exception::class);
         $dir = implode(DIRECTORY_SEPARATOR, [PHPWORD_TESTS_BASE_DIR, 'foo']);
 
-        $object = new ePub3();
+        $object = new EPub3();
         $object->setUseDiskCaching(true, $dir);
     }
 }