tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

API Remove references to non-existent installation tool (#11274)

Browse Source
This commit is contained in:
Guy Sartorelli 2024-06-13 14:45:58 +12:00 committed by GitHub
parent 8179047af5
commit be6ca2a91d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Core/BaseKernel.php
View File

@ -27,7 +27,6 @@ use SilverStripe\View\SSViewer;
use SilverStripe\View\ThemeManifest;
use SilverStripe\View\ThemeResourceLoader;
use Exception;
use SilverStripe\Dev\Deprecation;
/**
* Simple Kernel container
@ -305,31 +304,6 @@ abstract class BaseKernel implements Kernel
throw new HTTPResponse_Exception($response);
}
/**
* If missing configuration, redirect to install.php if it exists.
* Otherwise show a server error to the user.
*
* @deprecated 5.3.0 Will be removed without equivalent functionality
*
* @param string $msg Optional message to show to the user on an installed project (install.php missing).
*/
protected function redirectToInstaller($msg = '')
{
Deprecation::notice('5.3.0', 'Will be removed without equivalent functionality');
// 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
*/

5
src/Core/CoreKernel.php
View File

@ -7,7 +7,6 @@ use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
use SilverStripe\ORM\DB;
use Exception;
use LogicException;
use SilverStripe\Dev\Deprecation;
/**
* Simple Kernel container
@ -48,12 +47,12 @@ class CoreKernel extends BaseKernel
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();
Deprecation::withNoReplacement(fn() => $this->redirectToInstaller($msg));
throw new HTTPResponse_Exception($msg, 500);
}
}

2
tests/php/Core/Manifest/fixtures/ss-projects/withCustomResourcesDir/composer.json
View File

@ -18,8 +18,6 @@
"public-files-installed": [
".htaccess",
"index.php",
"install-frameworkmissing.html",
"install.php",
"web.config"
],
"resources-dir": "customised-resources-dir"

2
tests/php/Core/Manifest/fixtures/ss-projects/withoutCustomResourcesDir/composer.json
View File

@ -18,8 +18,6 @@
"public-files-installed": [
".htaccess",
"index.php",
"install-frameworkmissing.html",
"install.php",
"web.config"
]
},