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

MINOR Linting fixes

Browse Source
This commit is contained in:
Damian Mooyman 2019-03-26 16:29:58 +13:00
parent 83ec0b69fa
commit 6dc41e50a0
No known key found for this signature in database
GPG Key ID: 4327857F75021D92
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/GridField/GridFieldLevelup.php
View File

@ -86,9 +86,9 @@ class GridFieldLevelup implements GridField_HTMLProvider
)); ));
$template = SSViewer::get_templates_by_class($this, '', __CLASS__); $template = SSViewer::get_templates_by_class($this, '', __CLASS__);
return array( return [
'before' => $forTemplate->renderWith($template), 'before' => $forTemplate->renderWith($template),
); ];
} }
public function setAttributes($attrs) public function setAttributes($attrs)

40
src/includes/constants.php
View File

@ -41,11 +41,12 @@ if (!defined('BASE_PATH')) {
define('BASE_PATH', call_user_func(function () { define('BASE_PATH', call_user_func(function () {
// Determine BASE_PATH based on the composer autoloader // Determine BASE_PATH based on the composer autoloader
foreach (debug_backtrace() as $backtraceItem) { foreach (debug_backtrace() as $backtraceItem) {
if (isset($backtraceItem['file']) && preg_match( if (isset($backtraceItem['file'])
'#^(?<base>.*)(/|\\\\)vendor(/|\\\\)composer(/|\\\\)autoload_real.php#', && preg_match(
$backtraceItem['file'], '#^(?<base>.*)(/|\\\\)vendor(/|\\\\)composer(/|\\\\)autoload_real.php#',
$matches $backtraceItem['file'],
)) { $matches
)) {
return realpath($matches['base']) ?: DIRECTORY_SEPARATOR; return realpath($matches['base']) ?: DIRECTORY_SEPARATOR;
} }
} }
@ -132,23 +133,24 @@ if (!defined('BASE_URL')) {
// When htaccess redirects from /base to /base/public folder, we need to only include /public // When htaccess redirects from /base to /base/public folder, we need to only include /public
// in the BASE_URL if it's also present in the request // in the BASE_URL if it's also present in the request
if ($baseURL if (!$baseURL
&& PUBLIC_DIR || !PUBLIC_DIR
&& isset($_SERVER['REQUEST_URI']) || !isset($_SERVER['REQUEST_URI'])
&& substr($baseURL, -strlen(PUBLIC_DIR)) === PUBLIC_DIR || substr($baseURL, -strlen(PUBLIC_DIR)) !== PUBLIC_DIR
) { ) {
$requestURI = $_SERVER['REQUEST_URI']; return $baseURL;
// Check if /base/public or /base are in the request
foreach ([$baseURL, dirname($baseURL)] as $candidate) {
if (stripos($requestURI, $candidate) === 0) {
return $candidate;
}
}
// Ambiguous
return '';
} }
return $baseURL; $requestURI = $_SERVER['REQUEST_URI'];
// Check if /base/public or /base are in the request
foreach ([$baseURL, dirname($baseURL)] as $candidate) {
if (stripos($requestURI, $candidate) === 0) {
return $candidate;
}
}
// Ambiguous
return '';
})); }));
} }