From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 18 Nov 2022 09:55:22 +0000 (+0100)
Subject: Remove PackageArchive::$package
X-Git-Tag: 6.0.0_Alpha_1~698^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3cee50f0273929dbc92433d5a8adfe919f06ba96;p=GitHub%2FWoltLab%2FWCF.git

Remove PackageArchive::$package

This property is no longer used.
---

diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
index 685a41e69a..783013fae1 100644
--- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
@@ -28,12 +28,6 @@ class PackageArchive
      */
     protected $archive;
 
-    /**
-     * package object of an existing package
-     * @var Package
-     */
-    protected $package;
-
     /**
      * tar archive object
      * @var Tar
@@ -95,13 +89,11 @@ class PackageArchive
      * Creates a new PackageArchive object.
      *
      * @param string $archive
-     * @param Package $package
      */
-    public function __construct($archive, ?Package $package = null)
+    public function __construct($archive)
     {
         $this->archive = $archive;  // be careful: this is a string within this class,
         // but an object in the packageStartInstallForm.class!
-        $this->package = $package;
     }
 
     /**
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 66063b83a6..59ca2d7935 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -477,7 +477,7 @@ class PackageInstallationDispatcher
                 }
             }
 
-            $this->archive = new PackageArchive($this->queue->archive, $this->getPackage());
+            $this->archive = new PackageArchive($this->queue->archive);
             if (!\str_starts_with(\realpath($this->archive->getArchive()), \TMP_DIR)) {
                 throw new \Exception('Refusing to handle an archive outside of the temporary directory.');
             }