feat: improved update handling of .htaccess file

CHANGELOG.md

@@ -8,6 +8,7 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 
 ### phpMyFAQ v4.0.1 - unreleased
 
+- improved update handling of .htaccess file (Thorsten)
 - updated 3rd party dependencies (Thorsten)
 
 ### phpMyFAQ v4.0.0 - 2024-12-06

composer.json

@@ -44,6 +44,7 @@
     "symfony/mailer": "^7.0",
     "symfony/routing": "^7.0",
     "tecnickcom/tcpdf": "~6.0",
+    "tivie/htaccess-parser": "0.3.0",
     "twig/intl-extra": "^3.10",
     "twig/twig": "^3.10"
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",

phpmyfaq/src/phpMyFAQ/Configuration.php

@@ -201,6 +201,11 @@ public function getDefaultUrl(): string
         return $defaultUrl;
     }
 
+    public function getRootPath(): string
+    {
+        return PMF_ROOT_DIR;
+    }
+
     /**
      * Returns a configuration item.
      *

phpmyfaq/src/phpMyFAQ/Controller/Administration/UpdateController.php

@@ -234,21 +234,22 @@ public function createTemporaryBackup(): StreamedResponse
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     #[Route('admin/api/install-package')]
     public function installPackage(): StreamedResponse
     {
         $this->userHasPermission(PermissionType::CONFIGURATION_EDIT);
 
         $upgrade = new Upgrade(new System(), $this->configuration);
-        return new StreamedResponse(static function () use ($upgrade) {
+        $configurator = $this->container->get('phpmyfaq.setup.environment_configurator');
+        return new StreamedResponse(static function () use ($upgrade, $configurator) {
             $progressCallback = static function ($progress) {
                 echo json_encode(['progress' => $progress]) . "\n";
                 ob_flush();
                 flush();
             };
-            if ($upgrade->installPackage($progressCallback)) {
+            if ($upgrade->installPackage($progressCallback) && $configurator->adjustRewriteBaseHtaccess()) {
                 echo json_encode(['message' => '✅ Package successfully installed.']);
             } else {
                 echo json_encode(['message' => 'Install package failed']);