From 822f9f4390b7c414059efdc704616df962558ec0 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 11 Jul 2016 12:08:17 +1200
Subject: [PATCH] Remove unnecessary require calls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that we have PSR-4 compliance on these classes, manual include
statements aren’t needed.
---
 cli-script.php                              | 3 ---
 core/startup/ParameterConfirmationToken.php | 1 -
 main.php                                    | 1 -
 3 files changed, 5 deletions(-)

diff --git a/cli-script.php b/cli-script.php
index 3800e0248..4af555bfe 100755
--- a/cli-script.php
+++ b/cli-script.php
@@ -80,9 +80,6 @@ global $databaseConfig;
 // We don't have a session in cli-script, but this prevents errors
 $_SESSION = null;
 
-require_once("ORM/DB.php");
-
-
 // Connect to database
 if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
 	echo "\nPlease configure your database connection details.  You can do this by creating a file
diff --git a/core/startup/ParameterConfirmationToken.php b/core/startup/ParameterConfirmationToken.php
index 426cd4458..27821130e 100644
--- a/core/startup/ParameterConfirmationToken.php
+++ b/core/startup/ParameterConfirmationToken.php
@@ -49,7 +49,6 @@ class ParameterConfirmationToken {
 	 */
 	protected function genToken() {
 		// Generate a new random token (as random as possible)
-		require_once(dirname(dirname(dirname(__FILE__))).'/security/RandomGenerator.php');
 		$rg = new RandomGenerator();
 		$token = $rg->randomToken('md5');
 
diff --git a/main.php b/main.php
index ab7c54f7c..719a978ab 100644
--- a/main.php
+++ b/main.php
@@ -147,7 +147,6 @@ $chain
 		require_once('core/Core.php');
 
 		// Connect to database
-		require_once('ORM/DB.php');
 		global $databaseConfig;
 		if ($databaseConfig) DB::connect($databaseConfig);