From 8c48804b8175f6ce0b0e77ac2ca2bd86475d9695 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 1 Nov 2016 15:08:28 +1300
Subject: [PATCH] FIX: Reply on Core/Core.php being in include path.

This lets us change the location of Core.php as long as we also
manipulate the include path.

This is necessary for https://github.com/silverstripe/silverstripe-framework/pull/6266
---
 .../BehatExtension/Compiler/CoreInitializationPass.php         | 3 +--
 .../BehatExtension/Console/Processor/InitProcessor.php         | 2 +-
 .../Context/Initializer/SilverStripeAwareInitializer.php       | 2 +-
 tests/bootstrap.php                                            | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/SilverStripe/BehatExtension/Compiler/CoreInitializationPass.php b/src/SilverStripe/BehatExtension/Compiler/CoreInitializationPass.php
index a6cda19..fd754fc 100644
--- a/src/SilverStripe/BehatExtension/Compiler/CoreInitializationPass.php
+++ b/src/SilverStripe/BehatExtension/Compiler/CoreInitializationPass.php
@@ -19,9 +19,8 @@ class CoreInitializationPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // Connect to database and build manifest
-        $frameworkPath = $container->getParameter('behat.silverstripe_extension.framework_path');
         $_GET['flush'] = 1;
-        require_once $frameworkPath . '/Core/Core.php';
+        require_once('Core/Core.php');
 
         SapphireTest::use_test_manifest();
 
diff --git a/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php b/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php
index 133d2f1..5f52abd 100644
--- a/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php
+++ b/src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php
@@ -66,7 +66,7 @@ class InitProcessor extends BaseProcessor
         // Bootstrap SS so we can use module listing
         $frameworkPath = $this->container->getParameter('behat.silverstripe_extension.framework_path');
         $_GET['flush'] = 1;
-        require_once $frameworkPath . '/Core/Core.php';
+        require_once('Core/Core.php');
         unset($_GET['flush']);
 
         $featuresPath = $input->getArgument('features');
diff --git a/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
index 24c9730..c26a577 100644
--- a/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
+++ b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
@@ -203,7 +203,7 @@ class SilverStripeAwareInitializer implements InitializerInterface
 
         // Connect to database and build manifest
         $_GET['flush'] = 1;
-        require_once $frameworkPath . '/Core/Core.php';
+        require_once('Core/Core.php');
         unset($_GET['flush']);
 
         // Remove the error handler so that PHPUnit can add its own
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d12525c..d4bfae0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,4 +4,4 @@ $frameworkDir = basename($frameworkPath);
 if (!defined('BASE_PATH')) {
     define('BASE_PATH', dirname($frameworkPath));
 }
-require_once $frameworkPath . '/Core/Core.php';
+require_once 'Core/Core.php';