ENH Remove references to non-existent installer tool

silverstripe · Jun 11, 2024 · b179993 · b179993
1 parent b53cda8
commit b179993
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 28 deletions.
diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
@@ -304,28 +304,6 @@ protected function detectLegacyEnvironment()
         throw new HTTPResponse_Exception($response);
     }
 
-    /**
-     * If missing configuration, redirect to install.php if it exists.
-     * Otherwise show a server error to the user.
-     *
-     * @param string $msg Optional message to show to the user on an installed project (install.php missing).
-     */
-    protected function redirectToInstaller($msg = '')
-    {
-        // Error if installer not available
-        if (!file_exists(Director::publicFolder() . '/install.php')) {
-            throw new HTTPResponse_Exception(
-                $msg,
-                500
-            );
-        }
-
-        // Redirect to installer
-        $response = new HTTPResponse();
-        $response->redirect(Director::absoluteURL('install.php'));
-        throw new HTTPResponse_Exception($response);
-    }
-
     /**
      * @return ManifestCacheFactory
      */

diff --git a/src/Core/CoreKernel.php b/src/Core/CoreKernel.php
@@ -47,12 +47,12 @@ public function boot($flush = false)
     protected function validateDatabase()
     {
         $databaseConfig = DB::getConfig();
-        // Gracefully fail if no DB is configured
+        // Fail if no DB is configured
         if (empty($databaseConfig['database'])) {
             $msg = 'Silverstripe Framework requires a "database" key in DB::getConfig(). ' .
                 'Did you forget to set SS_DATABASE_NAME or SS_DATABASE_CHOOSE_NAME in your environment?';
             $this->detectLegacyEnvironment();
-            $this->redirectToInstaller($msg);
+            throw new HTTPResponse_Exception($msg, 500);
         }
     }
 

diff --git a/tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json b/tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json
@@ -18,8 +18,6 @@
         "public-files-installed": [
             ".htaccess",
             "index.php",
-            "install-frameworkmissing.html",
-            "install.php",
             "web.config"
         ],
         "resources-dir": "customised-resources-dir"

diff --git a/tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json b/tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json
@@ -18,8 +18,6 @@
         "public-files-installed": [
             ".htaccess",
             "index.php",
-            "install-frameworkmissing.html",
-            "install.php",
             "web.config"
         ]
     },