Merge remote-tracking branch 'origin/3'

.htaccess

@@ -23,10 +23,26 @@
 ErrorDocument 404 /assets/error-404.html
 ErrorDocument 500 /assets/error-500.html
 
+<IfModule mod_env.c>
+	# Ensure that X-Forwarded-Host is only allowed to determine the request
+	# hostname for servers ips defined by SS_TRUSTED_PROXY_IPS in your _ss_environment.php
+	# Note that in a future release this setting will be always on.
+	SetEnv BlockUntrustedIPs true
+</IfModule>
+
 <IfModule mod_rewrite.c>
+
+	# Turn off index.php handling requests to the homepage fixes issue in apache >=2.4
+	<IfModule mod_dir.c>
+		DirectoryIndex disabled
+	</IfModule>
+
 	SetEnv HTTP_MOD_REWRITE On
 	RewriteEngine On
 
+	# Enable HTTP Basic authentication workaround for PHP running in CGI mode
+	RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+	
 	# Deny access to potentially sensitive files and folders
 	RewriteRule ^vendor(/|$) - [F,L,NC]
 	RewriteRule silverstripe-cache(/|$) - [F,L,NC]

Makefile

@@ -1,9 +0,0 @@
-#
-# This makefile is a secondary way of installing SilverStripe.
-# It is used for things like continuous integration
-#
-# Most users should simply visit the site root in your web browser.
-#
-
-test:
-	$(MAKE) QUERYSTRING="$(QUERYSTRING)" -C framework test

behat.yml

@@ -1,3 +1,7 @@
+# Behat integration test setup (see behat.org).
+# More information about running these tests can be found under
+# https://github.com/silverstripe-labs/silverstripe-behat-extension.
+# It is safe to remove this file for normal website operation.
 default:
   filters:
     tags: "~@todo"

build.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- 
-# phing installation
+Phing build tooling for SilverStripe releases (see phing.info).
-sudo pear channel-discover pear.phing.info
+Install through "pear channel-discover pear.phing.info && pear install phing/phing".
-sudo pear install phing/phing
+Most tooling is placed in a separate module, install with "composer require silverstripe/buildtools".
-sudo pear install pear/VersionControl_Git-0.4.4
+It is safe to remove this file for normal website operation.
 -->
 
 <project name="silverstripe-installer" default="help" phingVersion="2.4.5">
 
-	<!-- Install with "composer require silverstripe/buildtools" -->
 	<import file="buildtools/build.xml" optional="true" />
 
 	<property name="basedir" value="." override="true" />

composer.json

@@ -7,10 +7,16 @@
 		"silverstripe/framework": "self.version",
 		"silverstripe-themes/simple": "*"
 	},
+	"require-dev": {
+		"phpunit/PHPUnit": "~3.7@stable"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "4.0.x-dev"
 		}
 	},
+	"config": {
+		"process-timeout": 600
+	},
 	"minimum-stability": "dev"
 }

phpunit.teamcity.postgresql.xml

@@ -1,33 +0,0 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
-
-	<testsuite name="Default">
-		<directory>mysite/tests</directory>
-		<directory>cms/tests</directory>
-		<directory>framework/tests</directory>
-		<directory>postgresql/tests</directory>
-	</testsuite>
-
-	<listeners>
-		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
-    	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
-	</listeners>
-
-	<groups>
-		<exclude>
-			<group>sanitychecks</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<!-- 
-			Set different database connection.
-			Relies on the presence of the 'zframeworktest_dbswitcher' module
-			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-			as well as on constants in _ss_environment.php (see module README).
-		-->
-	  <get name="db" value="postgresql"/>
-	  <!-- Always flush the manifest -->
-	  <get name="flush" value="1"/>
-	</php>
-
-</phpunit>

phpunit.teamcity.sqlite3.xml

@@ -1,33 +0,0 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
-
-	<testsuite name="Default">
-		<directory>mysite/tests</directory>
-		<directory>cms/tests</directory>
-		<directory>framework/tests</directory>
-		<directory>sqlite3/tests</directory>
-	</testsuite>
-
-	<listeners>
-		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
-    	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
-	</listeners>
-
-	<groups>
-		<exclude>
-			<group>sanitychecks</group>
-		</exclude>
-	</groups>
-
-	<php>
-		<!-- 
-			Set different database connection.
-			Relies on the presence of the 'zframeworktest_dbswitcher' module
-			(https://github.com/silverstripe-labs/zframeworktest_dbswitcher),
-			as well as on constants in _ss_environment.php (see module README).
-		-->
-	  <get name="db" value="sqlite3"/>
-	  <!-- Always flush the manifest -->
-	  <get name="flush" value="1"/>
-	</php>
-
-</phpunit>

phpunit.teamcity.xml

@@ -1,38 +0,0 @@
-<!-- 
-	PHPUnit configuration for SilverStripe
-
-	Requires PHPUnit 3.5+
-
-	Usage: 
-	 - "phpunit": Runs all tests in all folders
-	 - "phpunit framework/tests/": Run all tests of the framework module
-	 - "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module
-	 - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
-	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
-	
-	Further information:
-	- http://www.phpunit.de/manual/current/en/textui.html for more commandline options.
-	- http://github.com/chillu/silverstripe-doc-restructuring/blob/master/master/cms/docs/en/howto/phpunit-configuration.md
-	  for more information on configuration and execution options.
-	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
--->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
-
-	<testsuite name="Default">
-		<directory>mysite/tests</directory>
-		<directory>cms/tests</directory>
-		<directory>framework/tests</directory>
-	</testsuite>
-
-	<listeners>
-		<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
-    	<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
-	</listeners>
-
-	<groups>
-		<exclude>
-			<group>sanitychecks</group>
-		</exclude>
-	</groups>
-	
-</phpunit>

phpunit.xml.dist

@@ -13,6 +13,8 @@
 	More information:
 	- http://www.phpunit.de/manual/current/en/textui.html
 	- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
+
+	It is safe to remove this file for normal website operation.
 -->
 <phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
 

web.config

@@ -1,3 +1,4 @@
+<--! Routing configuration for Microsoft IIS web server -->
 <configuration>
 	<system.webServer>
 		<security>