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

Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby

Browse Source 
Support custom main.php location
This commit is contained in:
Damian Mooyman 2017-10-03 16:11:06 +13:00 committed by GitHub
commit 67ed44823e
6 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/.htaccess Executable file → Normal file
View File

@ -5,7 +5,10 @@
# #
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
SetEnv HTTP_MOD_REWRITE On <IfModule mod_env.c>
SetEnv HTTP_MOD_REWRITE On
</IfModule>
RewriteEngine On RewriteEngine On
# Disable PHP handler # Disable PHP handler
@ -23,5 +26,5 @@
# Non existant files passed to requesthandler # Non existant files passed to requesthandler
RewriteCond %{REQUEST_URI} ^(.*)$ RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* ../framework/main.php?url=%1 [QSA] RewriteRule .* ../vendor/silverstripe/framework/main.php?url=%1 [QSA]
</IfModule> </IfModule>

4
behat.yml
View File

@ -4,7 +4,7 @@
# ========================================================================= # # ========================================================================= #
# composer require silverstripe/behat-extension:^3 silverstripe/serve:dev-master se/selenium-server-standalone:2.41.0 # composer require silverstripe/behat-extension:^3 silverstripe/serve:dev-master se/selenium-server-standalone:2.41.0
# vendor/bin/selenium-server-standalone -Dwebdriver.firefox.bin="/Applications/Firefox31.app/Contents/MacOS/firefox-bin" # vendor/bin/selenium-server-standalone -Dwebdriver.firefox.bin="/Applications/Firefox31.app/Contents/MacOS/firefox-bin"
# vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php # vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
# vendor/bin/behat @<module> # vendor/bin/behat @<module>
# ========================================================================= # # ========================================================================= #
default: default:
@ -16,6 +16,6 @@ default:
selenium2: selenium2:
browser: firefox browser: firefox
SilverStripe\BehatExtension\Extension: SilverStripe\BehatExtension\Extension:
bootstrap_file: cms/tests/behat/serve-bootstrap.php bootstrap_file: vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
screenshot_path: %paths.base%/artifacts/screenshots screenshot_path: %paths.base%/artifacts/screenshots
retry_seconds: 4 # default is 2 retry_seconds: 4 # default is 2

15
index.php
View File

@ -51,18 +51,9 @@ $_GET['url'] = $_REQUEST['url'] = $url;
$fileName = dirname($_SERVER['SCRIPT_FILENAME']) . '/' . $url; $fileName = dirname($_SERVER['SCRIPT_FILENAME']) . '/' . $url;
/** // Pass through references to existing files
* This code is a very simple wrapper for sending files
* Very quickly pass through references to files
*/
if ($url && file_exists($fileName)) { if ($url && file_exists($fileName)) {
$fileURL = (dirname($_SERVER['SCRIPT_NAME']) == '/' ? '' : dirname($_SERVER['SCRIPT_NAME'])) . '/' . $url; return false;
if (isset($_SERVER['QUERY_STRING'])) {
$fileURL .= '?' . $_SERVER['QUERY_STRING'];
}
header($_SERVER['SERVER_PROTOCOL'] . ' 301 Moved Permanently');
header("Location: $fileURL");
die();
} }
require_once 'framework/main.php'; require_once 'vendor/silverstripe/framework/main.php';

9
install-frameworkmissing.html
View File

@ -1,7 +1,6 @@
<html> <html>
<head> <head>
<title>The SilverStripe Framework is missing</title> <title>The SilverStripe Framework is missing</title>
<link rel="stylesheet" type="text/css" href="framework/dev/install/css/install.css" />
</head> </head>
<body> <body>
<div id="BgContainer"> <div id="BgContainer">
@ -9,14 +8,14 @@
<div id="Header"> <div id="Header">
<h1>SilverStripe CMS Installation</h1> <h1>SilverStripe CMS Installation</h1>
</div> </div>
<div id="Navigation">&nbsp;</div> <div id="Navigation">&nbsp;</div>
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>
<div id="Layout"> <div id="Layout">
<div class="typography"> <div class="typography">
<p><strong>The SilverStripe Framework is missing</strong> - To run the installer, at least the <strong>framework</strong> module is required.</p> <p><strong>The SilverStripe Framework is missing</strong> - To run the installer, at least the <strong>framework</strong> module is required.</p>
<p>If you downloaded a pre-packaged zip or tar.gz, something might have gone wrong with the packaging <p>If you downloaded a pre-packaged zip or tar.gz, something might have gone wrong with the packaging
process. Please try re-downloading, or try an older version.</p> process. Please try re-downloading, or try an older version.</p>
@ -25,7 +24,7 @@
</div> </div>
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>
</div> </div>
<div id="Footer"> <div id="Footer">
<div class="footerTop"><!-- --></div> <div class="footerTop"><!-- --></div>
<p><a href="http://silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008-2011 SilverStripe Limited</p> <p><a href="http://silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008-2011 SilverStripe Limited</p>

4
install.php
View File

@ -9,8 +9,8 @@
************************************************************************************ ************************************************************************************
************************************************************************************/ ************************************************************************************/
if (!file_exists('framework') || !file_exists('framework/_config.php')) { if (!file_exists(__DIR__ . '/vendor/silverstripe/framework') || !file_exists(__DIR__ . '/vendor/silverstripe/framework/_config.php')) {
include 'install-frameworkmissing.html'; include 'install-frameworkmissing.html';
} else { } else {
include './framework/src/Dev/Install/install.php'; include './vendor/silverstripe/framework/src/Dev/Install/install.php';
} }

26
phpunit.xml.dist
View File

@ -16,30 +16,30 @@
It is safe to remove this file for normal website operation. It is safe to remove this file for normal website operation.
--> -->
<phpunit bootstrap="framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>mysite/tests</directory> <directory>mysite/tests</directory>
<directory>cms/tests</directory> <directory>vendor/silverstripe/cms/tests/php</directory>
<directory>framework/tests</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite> </testsuite>
<!-- core components --> <!-- core components -->
<testsuite name="core"> <testsuite name="core">
<directory>framework/tests/php/</directory> <directory>vendor/silverstripe/framework/tests/php/</directory>
<directory>silverstripe-assets/tests/php/</directory> <directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>versioned/tests/php/</directory> <directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite> </testsuite>
<!-- admin components --> <!-- admin components -->
<testsuite name="admin"> <testsuite name="admin">
<directory>cms/tests/</directory> <directory>vendor/silverstripe/cms/tests/</directory>
<directory>silverstripe-admin/tests/php/</directory> <directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>campaign-admin/tests/php/</directory> <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>asset-admin/tests/php/</directory> <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>graphql/tests/</directory> <directory>vendor/silverstripe/graphql/tests/</directory>
<directory>siteconfig/tests/</directory> <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
<directory>reports/tests/</directory> <directory>vendor/silverstripe/reports/tests/</directory>
</testsuite> </testsuite>
<groups> <groups>