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 Make the public directory mandatory (#10617)

Browse Source
This commit is contained in:
Guy Sartorelli 2022-12-14 16:08:47 +13:00 committed by GitHub
parent fa75a36267
commit b14de847a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Control/Director.php
View File

@ -75,15 +75,6 @@ class Director implements TemplateGlobalProvider
*/ */
private static $alternate_base_folder; private static $alternate_base_folder;
/**
* Override PUBLIC_DIR. Set to a non-null value to override.
* Setting to an empty string will disable public dir.
*
* @config
* @var bool|null
*/
private static $alternate_public_dir = null;
/** /**
* Base url to populate if cannot be determined otherwise. * Base url to populate if cannot be determined otherwise.
* Supports back-ticked vars; E.g. '`SS_BASE_URL`' * Supports back-ticked vars; E.g. '`SS_BASE_URL`'
@ -654,19 +645,12 @@ class Director implements TemplateGlobalProvider
} }
/** /**
* Check if using a separate public dir, and if so return this directory * The name of the public directory
* name.
*
* This will be removed in 5.0 and fixed to 'public'
* *
* @return string * @return string
*/ */
public static function publicDir() public static function publicDir()
{ {
$alternate = self::config()->uninherited('alternate_public_dir');
if (isset($alternate)) {
return $alternate;
}
return PUBLIC_DIR; return PUBLIC_DIR;
} }

2
src/View/PublicThemes.php
View File

@ -6,6 +6,6 @@ class PublicThemes implements ThemeList
{ {
public function getThemes() public function getThemes()
{ {
return PUBLIC_DIR ? ['/' . PUBLIC_DIR] : []; return ['/' . PUBLIC_DIR];
} }
} }

8
src/includes/constants.php
View File

@ -24,7 +24,7 @@ use SilverStripe\Core\TempFolder;
* - THEMES_PATH: Absolute filepath, e.g. "/var/www/my-webroot/themes" * - THEMES_PATH: Absolute filepath, e.g. "/var/www/my-webroot/themes"
* - FRAMEWORK_DIR: Path relative to webroot, e.g. "framework" * - FRAMEWORK_DIR: Path relative to webroot, e.g. "framework"
* - FRAMEWORK_PATH:Absolute filepath, e.g. "/var/www/my-webroot/framework" * - FRAMEWORK_PATH:Absolute filepath, e.g. "/var/www/my-webroot/framework"
* - PUBLIC_DIR: Webroot path relative to project root, e.g. "public" or "" * - PUBLIC_DIR: Webroot path relative to project root - always evaluates to "public"
* - PUBLIC_PATH: Absolute path to webroot, e.g. "/var/www/project/public" * - PUBLIC_PATH: Absolute path to webroot, e.g. "/var/www/project/public"
* - THIRDPARTY_DIR: Path relative to webroot, e.g. "framework/thirdparty" * - THIRDPARTY_DIR: Path relative to webroot, e.g. "framework/thirdparty"
* - THIRDPARTY_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/thirdparty" * - THIRDPARTY_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/thirdparty"
@ -70,10 +70,10 @@ if (!defined('BASE_PATH')) {
// Set public webroot dir / path // Set public webroot dir / path
if (!defined('PUBLIC_DIR')) { if (!defined('PUBLIC_DIR')) {
define('PUBLIC_DIR', is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'public') ? 'public' : ''); define('PUBLIC_DIR', 'public');
} }
if (!defined('PUBLIC_PATH')) { if (!defined('PUBLIC_PATH')) {
define('PUBLIC_PATH', PUBLIC_DIR ? BASE_PATH . DIRECTORY_SEPARATOR . PUBLIC_DIR : BASE_PATH); define('PUBLIC_PATH', BASE_PATH . DIRECTORY_SEPARATOR . PUBLIC_DIR);
} }
// Allow a first class env var to be set that disables .env file loading // Allow a first class env var to be set that disables .env file loading
@ -183,7 +183,7 @@ if (!defined('ASSETS_PATH')) {
call_user_func(function () { call_user_func(function () {
$paths = [ $paths = [
BASE_PATH, BASE_PATH,
(PUBLIC_DIR ? PUBLIC_DIR : null), PUBLIC_DIR,
ASSETS_DIR ASSETS_DIR
]; ];
define('ASSETS_PATH', implode(DIRECTORY_SEPARATOR, array_filter($paths ?? []))); define('ASSETS_PATH', implode(DIRECTORY_SEPARATOR, array_filter($paths ?? [])));

2
tests/php/Forms/HTMLEditor/TinyMCECombinedGeneratorTest.php
View File

@ -90,7 +90,7 @@ class TinyMCECombinedGeneratorTest extends SapphireTest
// Check plugin links included // Check plugin links included
$this->assertStringContainsString( $this->assertStringContainsString(
<<<EOS <<<EOS
tinymce.each('tinymce/langs/en.js,mycode/plugin1.js,tinymce/plugins/plugin4/plugin.min.js,tinymce/plugins/plugin4/langs/en.js,tinymce/plugins/plugin5/plugin.js,mycode/plugin6.js,mycode/plugin8.js?m= tinymce.each('tinymce/langs/en.js,mycode/plugin1.js,tinymce/plugins/plugin4/plugin.min.js,tinymce/plugins/plugin4/langs/en.js,tinymce/plugins/plugin5/plugin.js,mycode/plugin6.js,_resources/mycode/plugin8.js?m=
EOS EOS
, ,
$content $content