Skip to content

D
doctrine-dbal
Commit ef930a7f authored by Benjamin Eberlei's avatar Benjamin Eberlei
Browse files
Options

Merge branch 'DBAL-393' into 2.3

parents 292d5edd d605e048
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/doctrine-dbal.php
View file @ ef930a7f
...@@ -5,7 +5,7 @@ require_once 'Doctrine/Common/ClassLoader.php'; ...@@ -5,7 +5,7 @@ require_once 'Doctrine/Common/ClassLoader.php';
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine'); $classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
$classLoader->register(); $classLoader->register();
$classLoader = new \Doctrine\Common\ClassLoader('Symfony', 'Doctrine'); $classLoader = new \Doctrine\Common\ClassLoader('Symfony');
$classLoader->register(); $classLoader->register();
$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php'; $configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
...@@ -19,7 +19,7 @@ if (file_exists($configFile)) { ...@@ -19,7 +19,7 @@ if (file_exists($configFile)) {
} }
require $configFile; require $configFile;
foreach ($GLOBALS as $helperSetCandidate) { foreach ($GLOBALS as $helperSetCandidate) {
if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) { if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) {
$helperSet = $helperSetCandidate; $helperSet = $helperSetCandidate;
...@@ -40,4 +40,4 @@ $cli->addCommands(array( ...@@ -40,4 +40,4 @@ $cli->addCommands(array(
new \Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand(), new \Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand(),
)); ));
$cli->run(); $cli->run();
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment