Dedup initialize Roundcube environment

roundcube · Apr 20, 2024 · ee7f798 · ee7f798
1 parent 8c74725
commit ee7f798
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/src/ExtensionInstaller.php b/src/ExtensionInstaller.php
@@ -61,16 +61,19 @@ public function getInstallPath(PackageInterface $package)
             . str_replace('/', \DIRECTORY_SEPARATOR, $this->getPackageName($package));
     }
 
-    public function install(InstalledRepositoryInterface $repo, PackageInterface $package)
+    private function initializeRoundcubemailEnvironment(): void
     {
-        $this->setRoundcubemailInstallPath($repo);
-
         // initialize Roundcube environment
         if (!defined('INSTALL_PATH')) {
             define('INSTALL_PATH', $this->getRoundcubemailInstallPath() . '/');
         }
         require_once INSTALL_PATH . 'program/include/iniset.php';
+    }
 
+    public function install(InstalledRepositoryInterface $repo, PackageInterface $package)
+    {
+        $this->setRoundcubemailInstallPath($repo);
+        $this->initializeRoundcubemailEnvironment();
         $this->rcubeVersionCheck($package);
 
         $postInstall = function () use ($package) {
@@ -136,13 +139,7 @@ public function install(InstalledRepositoryInterface $repo, PackageInterface $pa
     public function update(InstalledRepositoryInterface $repo, PackageInterface $initial, PackageInterface $target)
     {
         $this->setRoundcubemailInstallPath($repo);
-
-        // initialize Roundcube environment
-        if (!defined('INSTALL_PATH')) {
-            define('INSTALL_PATH', $this->getRoundcubemailInstallPath() . '/');
-        }
-        require_once INSTALL_PATH . 'program/include/iniset.php';
-
+        $this->initializeRoundcubemailEnvironment();
         $this->rcubeVersionCheck($target);
 
         $extra = $target->getExtra();
@@ -212,12 +209,7 @@ public function update(InstalledRepositoryInterface $repo, PackageInterface $ini
     public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package)
     {
         $this->setRoundcubemailInstallPath($repo);
-
-        // initialize Roundcube environment
-        if (!defined('INSTALL_PATH')) {
-            define('INSTALL_PATH', $this->getRoundcubemailInstallPath() . '/');
-        }
-        require_once INSTALL_PATH . 'program/include/iniset.php';
+        $this->initializeRoundcubemailEnvironment();
 
         $config = $this->composer->getConfig()->get('roundcube');