apply pull requests from @h3xx to php-epub-meta

seblucas · Mar 28, 2023 · c5ad516 · c5ad516
1 parent a424fd4
commit c5ad516
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/resources/php-epub-meta/composer.json b/resources/php-epub-meta/composer.json
@@ -20,9 +20,10 @@
     ],
     "license": "MIT",
     "require": {
+        "ext-dom": "*",
         "ext-xml": "*",
         "ext-zip": "*",
-        "seblucas/tbszip": "~2.16.0"
+        "seblucas/tbszip": "~2.16.1"
     },
     "require-dev": {
         "phpunit/phpunit": "9.*"

diff --git a/resources/php-epub-meta/composer.lock b/resources/php-epub-meta/composer.lock
diff --git a/resources/php-epub-meta/lib/EPub.php b/resources/php-epub-meta/lib/EPub.php
@@ -6,10 +6,9 @@
  * @author Sébastien Lucas <[email protected]>
  */
 
-define('METADATA_FILE', 'META-INF/container.xml');
-
 class EPub
 {
+    public const METADATA_FILE = 'META-INF/container.xml';
     public $xml; //FIXME: change to protected, later
     public $toc;
     protected $xpath;
@@ -38,11 +37,11 @@ public function __construct($file, $zipClass = 'clsTbsZip')
         }
 
         // read container data
-        if (!$this->zip->FileExists(METADATA_FILE)) {
+        if (!$this->zip->FileExists(self::METADATA_FILE)) {
             throw new Exception('Unable to find metadata.xml');
         }
 
-        $data = $this->zip->FileRead(METADATA_FILE);
+        $data = $this->zip->FileRead(self::METADATA_FILE);
         if ($data == false) {
             throw new Exception('Failed to access epub container data');
         }