tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NEW: Fixes to allow code files in src/ folder. 

Separated from the file renames for clarity.
This commit is contained in:
Damian Mooyman 2016-11-01 16:13:06 +13:00 committed by Sam Minnee
parent e9d2f2f733
commit 5650254b53
11 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_register_database.php
View File

@ -11,7 +11,7 @@ DatabaseAdapterRegistry::register(
'class' => 'MySQLDatabase', 'class' => 'MySQLDatabase',
'module' => 'framework', 'module' => 'framework',
'title' => 'MySQL 5.0+ (using MySQLi)', 'title' => 'MySQL 5.0+ (using MySQLi)',
'helperPath' => __DIR__ . '/Dev/Install/MySQLDatabaseConfigurationHelper.php', 'helperPath' => __DIR__ . '/src/Dev/Install/MySQLDatabaseConfigurationHelper.php',
'helperClass' => MySQLDatabaseConfigurationHelper::class, 'helperClass' => MySQLDatabaseConfigurationHelper::class,
'supported' => class_exists('MySQLi'), 'supported' => class_exists('MySQLi'),
'missingExtensionText' => 'missingExtensionText' =>
@ -27,7 +27,7 @@ DatabaseAdapterRegistry::register(
'class' => 'MySQLPDODatabase', 'class' => 'MySQLPDODatabase',
'module' => 'framework', 'module' => 'framework',
'title' => 'MySQL 5.0+ (using PDO)', 'title' => 'MySQL 5.0+ (using PDO)',
'helperPath' => __DIR__ . '/Dev/Install/MySQLDatabaseConfigurationHelper.php', 'helperPath' => __DIR__ . '/src/Dev/Install/MySQLDatabaseConfigurationHelper.php',
'helperClass' => MySQLDatabaseConfigurationHelper::class, 'helperClass' => MySQLDatabaseConfigurationHelper::class,
'supported' => (class_exists('PDO') && in_array('mysql', PDO::getAvailableDrivers())), 'supported' => (class_exists('PDO') && in_array('mysql', PDO::getAvailableDrivers())),
'missingExtensionText' => 'missingExtensionText' =>

22
composer.json
View File

@ -38,18 +38,18 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"SilverStripe\\Admin\\": "admin/code/", "SilverStripe\\Admin\\": "admin/code/",
"SilverStripe\\Assets\\": "Assets/", "SilverStripe\\Assets\\": "src/Assets/",
"SilverStripe\\Control\\": "Control/", "SilverStripe\\Control\\": "src/Control/",
"SilverStripe\\Core\\": "Core/", "SilverStripe\\Core\\": "src/Core/",
"SilverStripe\\Dev\\": "Dev/", "SilverStripe\\Dev\\": "src/Dev/",
"SilverStripe\\Forms\\": "Forms/", "SilverStripe\\Forms\\": "src/Forms/",
"SilverStripe\\i18n\\": "i18n/", "SilverStripe\\i18n\\": "src/i18n/",
"SilverStripe\\Logging\\": "Logging/", "SilverStripe\\Logging\\": "src/Logging/",
"SilverStripe\\ORM\\": "ORM/", "SilverStripe\\ORM\\": "src/ORM/",
"SilverStripe\\Security\\": "Security/", "SilverStripe\\Security\\": "src/Security/",
"SilverStripe\\View\\": "View/" "SilverStripe\\View\\": "src/View/"
}, },
"files": ["Core/Constants.php"], "files": ["src/Core/Constants.php"],
"classmap": ["tests/behat/features/bootstrap"] "classmap": ["tests/behat/features/bootstrap"]
}, },
"include-path": [ "include-path": [

2
src/Core/Constants.php
View File

@ -224,7 +224,7 @@ define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR);
// Relies on this being in a subdir of the framework. // Relies on this being in a subdir of the framework.
// If it isn't, or is symlinked to a folder with a different name, you must define FRAMEWORK_DIR // If it isn't, or is symlinked to a folder with a different name, you must define FRAMEWORK_DIR
define('FRAMEWORK_PATH', realpath(__DIR__ . '/../')); define('FRAMEWORK_PATH', realpath(__DIR__ . '/../../'));
if(strpos(FRAMEWORK_PATH, BASE_PATH) === 0) { if(strpos(FRAMEWORK_PATH, BASE_PATH) === 0) {
define('FRAMEWORK_DIR', trim(substr(FRAMEWORK_PATH, strlen(BASE_PATH)), DIRECTORY_SEPARATOR)); define('FRAMEWORK_DIR', trim(substr(FRAMEWORK_PATH, strlen(BASE_PATH)), DIRECTORY_SEPARATOR));
$frameworkDirSlashSuffix = FRAMEWORK_DIR ? FRAMEWORK_DIR . '/' : ''; $frameworkDirSlashSuffix = FRAMEWORK_DIR ? FRAMEWORK_DIR . '/' : '';

4
src/Dev/Install/DatabaseAdapterRegistry.php
View File

@ -110,7 +110,7 @@ class DatabaseAdapterRegistry {
* Detects all _register_database.php files and invokes them * Detects all _register_database.php files and invokes them
*/ */
public static function autodiscover() { public static function autodiscover() {
foreach(glob(dirname(__FILE__) . '/../../../*', GLOB_ONLYDIR) as $directory) { foreach(glob(__DIR__ . '/../../../../*', GLOB_ONLYDIR) as $directory) {
if(file_exists($directory . '/_register_database.php')) { if(file_exists($directory . '/_register_database.php')) {
include_once($directory . '/_register_database.php'); include_once($directory . '/_register_database.php');
} }
@ -122,7 +122,7 @@ class DatabaseAdapterRegistry {
* Called by ConfigureFromEnv.php * Called by ConfigureFromEnv.php
*/ */
public static function autoconfigure() { public static function autoconfigure() {
foreach(glob(dirname(__FILE__) . '/../../../*', GLOB_ONLYDIR) as $directory) { foreach(glob(__DIR__ . '/../../../../*', GLOB_ONLYDIR) as $directory) {
if(file_exists($directory . '/_configure_database.php')) { if(file_exists($directory . '/_configure_database.php')) {
include_once($directory . '/_configure_database.php'); include_once($directory . '/_configure_database.php');
} }

4
src/Dev/Install/config-form.html
View File

@ -7,8 +7,8 @@
<title>SilverStripe CMS / Framework Installation</title> <title>SilverStripe CMS / Framework Installation</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"> <meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="application/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> <script type="application/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/Dev/Install/client/dist/js/install.js"></script> <script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/js/install.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/Dev/Install/client/dist/styles/install.css"> <link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/styles/install.css">
<link rel="shortcut icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
</head> </head>
<body> <body>

4
src/Dev/Install/install.php
View File

@ -19,8 +19,8 @@ if (version_compare(phpversion(), '5.5.0', '<')) {
echo str_replace( echo str_replace(
array('$PHPVersion', 'sapphire'), array('$PHPVersion', 'sapphire'),
array(phpversion(), FRAMEWORK_NAME), array(phpversion(), FRAMEWORK_NAME),
file_get_contents(FRAMEWORK_NAME . "/Dev/Install/php5-required.html")); file_get_contents(__DIR__ . "/php5-required.html"));
die(); die();
} }
include(FRAMEWORK_NAME . '/Dev/Install/install.php5'); include(__DIR__ . '/install.php5');

31
src/Dev/Install/install.php5
View File

@ -39,10 +39,19 @@ if(function_exists('session_start') && !session_id()) {
} }
// require composers autoloader // require composers autoloader
if (file_exists($autoloadPath = dirname(__DIR__) . '/../../vendor/autoload.php')) { $autoloadPaths = [
require_once $autoloadPath; __DIR__ . '/../../../vendor/autoload.php', // framework/vendor
__DIR__ . '/../../../../vendor/autoload.php', // root vendor
];
$included = false;
foreach($autoloadPaths as $path) {
if (file_exists($path)) {
$included = true;
require_once $path;
break;
}
} }
else { if (!$included) {
if (!headers_sent()) { if (!headers_sent()) {
header($_SERVER['SERVER_PROTOCOL'] . " 500 Server Error"); header($_SERVER['SERVER_PROTOCOL'] . " 500 Server Error");
header('Content-Type: text/plain'); header('Content-Type: text/plain');
@ -54,8 +63,8 @@ else {
$envFileExists = defined('SS_ENVIRONMENT_FILE'); $envFileExists = defined('SS_ENVIRONMENT_FILE');
$usingEnv = $envFileExists && !empty($_REQUEST['useEnv']); $usingEnv = $envFileExists && !empty($_REQUEST['useEnv']);
require_once FRAMEWORK_NAME . '/Dev/Install/DatabaseConfigurationHelper.php'; require_once __DIR__ . '/DatabaseConfigurationHelper.php';
require_once FRAMEWORK_NAME . '/Dev/Install/DatabaseAdapterRegistry.php'; require_once __DIR__ . '/DatabaseAdapterRegistry.php';
// Set default locale, but try and sniff from the user agent // Set default locale, but try and sniff from the user agent
$defaultLocale = 'en_US'; $defaultLocale = 'en_US';
@ -240,7 +249,7 @@ if($installFromCli && ($req->hasErrors() || $dbReq->hasErrors())) {
if((isset($_REQUEST['go']) || $installFromCli) && !$req->hasErrors() && !$dbReq->hasErrors() && $adminConfig['username'] && $adminConfig['password']) { if((isset($_REQUEST['go']) || $installFromCli) && !$req->hasErrors() && !$dbReq->hasErrors() && $adminConfig['username'] && $adminConfig['password']) {
// Confirm before reinstalling // Confirm before reinstalling
if(!$installFromCli && $alreadyInstalled) { if(!$installFromCli && $alreadyInstalled) {
include(FRAMEWORK_NAME . '/Dev/Install/config-form.html'); include(__DIR__ . '/config-form.html');
} else { } else {
$inst = new Installer(); $inst = new Installer();
@ -253,7 +262,7 @@ if((isset($_REQUEST['go']) || $installFromCli) && !$req->hasErrors() && !$dbReq-
// Show the config form // Show the config form
} else { } else {
include(FRAMEWORK_NAME . '/Dev/Install/config-form.html'); include(__DIR__ . '/config-form.html');
} }
/** /**
@ -410,7 +419,7 @@ class InstallRequirements {
)); ));
// Check that we can identify the root folder successfully // Check that we can identify the root folder successfully
$this->requireFile(FRAMEWORK_NAME . '/Dev/Install/config-form.html', array("File permissions", $this->requireFile(FRAMEWORK_NAME . '/src/Dev/Install/config-form.html', array("File permissions",
"Does the webserver know where files are stored?", "Does the webserver know where files are stored?",
"The webserver isn't letting me identify where files are stored.", "The webserver isn't letting me identify where files are stored.",
$this->getBaseDir() $this->getBaseDir()
@ -1282,7 +1291,7 @@ class Installer extends InstallRequirements {
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>Installing SilverStripe...</title> <title>Installing SilverStripe...</title>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/Dev/Install/client/dist/styles/install.css"/> <link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/dist/styles/install.css"/>
<script src="//code.jquery.com/jquery-1.7.2.min.js"></script> <script src="//code.jquery.com/jquery-1.7.2.min.js"></script>
</head> </head>
<body> <body>
@ -1505,7 +1514,7 @@ PHP
$this->statusMessage("Checking that friendly URLs work..."); $this->statusMessage("Checking that friendly URLs work...");
$this->checkRewrite(); $this->checkRewrite();
} else { } else {
require_once 'core/startup/ParameterConfirmationToken.php'; require_once 'Core/Startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush'); $token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params()); $params = http_build_query($token->params());
@ -1661,7 +1670,7 @@ TEXT;
} }
public function checkRewrite() { public function checkRewrite() {
require_once 'core/startup/ParameterConfirmationToken.php'; require_once 'Core/Startup/ParameterConfirmationToken.php';
$token = new ParameterConfirmationToken('flush'); $token = new ParameterConfirmationToken('flush');
$params = http_build_query($token->params()); $params = http_build_query($token->params());

2
src/Dev/Install/php5-required.html
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<title>PHP 5.5.0 is required</title> <title>PHP 5.5.0 is required</title>
<link rel="stylesheet" type="text/css" href="framework/Dev/Install/client/dist/styles/install.css"> <link rel="stylesheet" type="text/css" href="framework/src/Dev/Install/client/dist/styles/install.css">
</head> </head>
<body> <body>
<div id="BgContainer"> <div id="BgContainer">

2
tests/PhpSyntaxTest.php
View File

@ -26,7 +26,7 @@ class PhpSyntaxTest extends SapphireTest {
$settingTests = array('short_open_tag=Off','short_open_tag=On -d asp_tags=On'); $settingTests = array('short_open_tag=Off','short_open_tag=On -d asp_tags=On');
$files = $this->getAllFiles('php'); $files = $this->getAllFiles('php');
$files[] = FRAMEWORK_PATH.'/dev/install/config-form.html'; $files[] = FRAMEWORK_PATH.'/src/Dev/Install/config-form.html';
foreach($files as $i => $file) { foreach($files as $i => $file) {
$CLI_file = escapeshellarg($file); $CLI_file = escapeshellarg($file);

2
tests/bootstrap/phpunit.php
View File

@ -6,7 +6,7 @@
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
require_once __DIR__ . '/../../Core/Core.php'; require_once __DIR__ . '/../../src/Core/Core.php';
require_once __DIR__ . '/../FakeController.php'; require_once __DIR__ . '/../FakeController.php';
global $databaseConfig; global $databaseConfig;

4
webpack.config.js
View File

@ -17,8 +17,8 @@ const PATHS = {
FRAMEWORK_THIRDPARTY: './thirdparty', FRAMEWORK_THIRDPARTY: './thirdparty',
FRAMEWORK_CSS_SRC: './client/src/styles', FRAMEWORK_CSS_SRC: './client/src/styles',
FRAMEWORK_CSS_DIST: './client/dist/styles', FRAMEWORK_CSS_DIST: './client/dist/styles',
INSTALL_CSS_SRC: './dev/install/client/src/styles', INSTALL_CSS_SRC: './src/Dev/Install/client/src/styles',
INSTALL_CSS_DIST: './dev/install/client/dist/styles', INSTALL_CSS_DIST: './src/Dev/Install/client/dist/styles',
}; };
// Used for autoprefixing css properties (same as Bootstrap Aplha.2 defaults) // Used for autoprefixing css properties (same as Bootstrap Aplha.2 defaults)