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

Merge pull request #131 from sminnee/core-reference-fix

Browse Source 
Core reference fix
This commit is contained in:
Damian Mooyman 2016-11-01 15:15:42 +13:00 committed by GitHub
commit 04696ef5a1
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -52,7 +52,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0.x-dev" "dev-master": "2.1.x-dev"
} }
}, },
"prefer-stable": true, "prefer-stable": true,

3
src/SilverStripe/BehatExtension/Compiler/CoreInitializationPass.php
View File

@ -19,9 +19,8 @@ class CoreInitializationPass implements CompilerPassInterface
public function process(ContainerBuilder $container) public function process(ContainerBuilder $container)
{ {
// Connect to database and build manifest // Connect to database and build manifest
$frameworkPath = $container->getParameter('behat.silverstripe_extension.framework_path');
$_GET['flush'] = 1; $_GET['flush'] = 1;
require_once $frameworkPath . '/Core/Core.php'; require_once('Core/Core.php');
SapphireTest::use_test_manifest(); SapphireTest::use_test_manifest();

2
src/SilverStripe/BehatExtension/Console/Processor/InitProcessor.php
View File

@ -66,7 +66,7 @@ class InitProcessor extends BaseProcessor
// Bootstrap SS so we can use module listing // Bootstrap SS so we can use module listing
$frameworkPath = $this->container->getParameter('behat.silverstripe_extension.framework_path'); $frameworkPath = $this->container->getParameter('behat.silverstripe_extension.framework_path');
$_GET['flush'] = 1; $_GET['flush'] = 1;
require_once $frameworkPath . '/Core/Core.php'; require_once('Core/Core.php');
unset($_GET['flush']); unset($_GET['flush']);
$featuresPath = $input->getArgument('features'); $featuresPath = $input->getArgument('features');

2
src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php
View File

@ -203,7 +203,7 @@ class SilverStripeAwareInitializer implements InitializerInterface
// Connect to database and build manifest // Connect to database and build manifest
$_GET['flush'] = 1; $_GET['flush'] = 1;
require_once $frameworkPath . '/Core/Core.php'; require_once('Core/Core.php');
unset($_GET['flush']); unset($_GET['flush']);
// Remove the error handler so that PHPUnit can add its own // Remove the error handler so that PHPUnit can add its own

2
tests/bootstrap.php
View File

@ -4,4 +4,4 @@ $frameworkDir = basename($frameworkPath);
if (!defined('BASE_PATH')) { if (!defined('BASE_PATH')) {
define('BASE_PATH', dirname($frameworkPath)); define('BASE_PATH', dirname($frameworkPath));
} }
require_once $frameworkPath . '/Core/Core.php'; require_once 'Core/Core.php';