Merge branch 'master' of github.com:doctrine/dbal

bin/doctrine.php

@@ -21,16 +21,16 @@ if (file_exists($configFile)) {
     require $configFile;
     
     foreach ($GLOBALS as $helperSetCandidate) {
-        if ($helperSetCandidate instanceof \Symfony\Components\Console\Helper\HelperSet) {
+        if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) {
             $helperSet = $helperSetCandidate;
             break;
         }
     }
 }
 
-$helperSet = ($helperSet) ?: new \Symfony\Components\Console\Helper\HelperSet();
+$helperSet = ($helperSet) ?: new \Symfony\Component\Console\Helper\HelperSet();
 
-$cli = new \Symfony\Components\Console\Application('Doctrine Command Line Interface', Doctrine\DBAL\Version::VERSION);
+$cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', Doctrine\DBAL\Version::VERSION);
 $cli->setCatchExceptions(true);
 $cli->setHelperSet($helperSet);
 $cli->addCommands(array(

lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php

@@ -21,8 +21,8 @@
 
 namespace Doctrine\DBAL\Tools\Console\Command;
 
-use Symfony\Components\Console\Input\InputArgument,
-    Symfony\Components\Console;
+use Symfony\Component\Console\Input\InputArgument,
+    Symfony\Component\Console;
 
 /**
  * Task for executing arbitrary SQL that can come from a file or directly from

lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php

@@ -21,9 +21,9 @@
 
 namespace Doctrine\DBAL\Tools\Console\Command;
 
-use Symfony\Components\Console\Input\InputArgument,
-    Symfony\Components\Console\Input\InputOption,
-    Symfony\Components\Console;
+use Symfony\Component\Console\Input\InputArgument,
+    Symfony\Component\Console\Input\InputOption,
+    Symfony\Component\Console;
 
 /**
  * Task for executing arbitrary SQL that can come from a file or directly from

lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php

@@ -21,7 +21,7 @@
 
 namespace Doctrine\DBAL\Tools\Console\Helper;
 
-use Symfony\Components\Console\Helper\Helper,
+use Symfony\Component\Console\Helper\Helper,
     Doctrine\DBAL\Connection;
 
 /**

lib/vendor/Symfony/Components/Console/Application.php → lib/vendor/Symfony/Component/Console/Application.php

 <?php
 
-namespace Symfony\Components\Console;
-
-use Symfony\Components\Console\Input\InputInterface;
-use Symfony\Components\Console\Input\ArgvInput;
-use Symfony\Components\Console\Input\ArrayInput;
-use Symfony\Components\Console\Input\InputDefinition;
-use Symfony\Components\Console\Input\InputOption;
-use Symfony\Components\Console\Input\InputArgument;
-use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Components\Console\Output\Output;
-use Symfony\Components\Console\Output\ConsoleOutput;
-use Symfony\Components\Console\Command\Command;
-use Symfony\Components\Console\Command\HelpCommand;
-use Symfony\Components\Console\Command\ListCommand;
-use Symfony\Components\Console\Helper\HelperSet;
-use Symfony\Components\Console\Helper\FormatterHelper;
-use Symfony\Components\Console\Helper\DialogHelper;
+namespace Symfony\Component\Console;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\HelpCommand;
+use Symfony\Component\Console\Command\ListCommand;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\DialogHelper;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Command/Command.php → lib/vendor/Symfony/Component/Console/Command/Command.php

 <?php
 
-namespace Symfony\Components\Console\Command;
-
-use Symfony\Components\Console\Input\InputDefinition;
-use Symfony\Components\Console\Input\InputOption;
-use Symfony\Components\Console\Input\InputArgument;
-use Symfony\Components\Console\Input\InputInterface;
-use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Components\Console\Application;
+namespace Symfony\Component\Console\Command;
+
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Application;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Command/HelpCommand.php → lib/vendor/Symfony/Component/Console/Command/HelpCommand.php

 <?php
 
-namespace Symfony\Components\Console\Command;
+namespace Symfony\Component\Console\Command;
 
-use Symfony\Components\Console\Input\InputArgument;
-use Symfony\Components\Console\Input\InputOption;
-use Symfony\Components\Console\Input\InputInterface;
-use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Components\Console\Output\Output;
-use Symfony\Components\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Command\Command;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Command/ListCommand.php → lib/vendor/Symfony/Component/Console/Command/ListCommand.php

 <?php
 
-namespace Symfony\Components\Console\Command;
+namespace Symfony\Component\Console\Command;
 
-use Symfony\Components\Console\Input\InputArgument;
-use Symfony\Components\Console\Input\InputOption;
-use Symfony\Components\Console\Input\InputInterface;
-use Symfony\Components\Console\Output\OutputInterface;
-use Symfony\Components\Console\Output\Output;
-use Symfony\Components\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Command\Command;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Helper/DialogHelper.php → lib/vendor/Symfony/Component/Console/Helper/DialogHelper.php

 <?php
 
-namespace Symfony\Components\Console\Helper;
+namespace Symfony\Component\Console\Helper;
 
-use Symfony\Components\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Helper/FormatterHelper.php → lib/vendor/Symfony/Component/Console/Helper/FormatterHelper.php

 <?php
 
-namespace Symfony\Components\Console\Helper;
+namespace Symfony\Component\Console\Helper;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Helper/Helper.php → lib/vendor/Symfony/Component/Console/Helper/Helper.php

 <?php
 
-namespace Symfony\Components\Console\Helper;
+namespace Symfony\Component\Console\Helper;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Helper/HelperInterface.php → lib/vendor/Symfony/Component/Console/Helper/HelperInterface.php

 <?php
 
-namespace Symfony\Components\Console\Helper;
+namespace Symfony\Component\Console\Helper;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Helper/HelperSet.php → lib/vendor/Symfony/Component/Console/Helper/HelperSet.php

 <?php
 
-namespace Symfony\Components\Console\Helper;
+namespace Symfony\Component\Console\Helper;
 
-use Symfony\Components\Console\Command\Command;
+use Symfony\Component\Console\Command\Command;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/ArgvInput.php → lib/vendor/Symfony/Component/Console/Input/ArgvInput.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/ArrayInput.php → lib/vendor/Symfony/Component/Console/Input/ArrayInput.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/Input.php → lib/vendor/Symfony/Component/Console/Input/Input.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/InputArgument.php → lib/vendor/Symfony/Component/Console/Input/InputArgument.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/InputDefinition.php → lib/vendor/Symfony/Component/Console/Input/InputDefinition.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/InputInterface.php → lib/vendor/Symfony/Component/Console/Input/InputInterface.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/InputOption.php → lib/vendor/Symfony/Component/Console/Input/InputOption.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Input/StringInput.php → lib/vendor/Symfony/Component/Console/Input/StringInput.php

 <?php
 
-namespace Symfony\Components\Console\Input;
+namespace Symfony\Component\Console\Input;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Output/ConsoleOutput.php → lib/vendor/Symfony/Component/Console/Output/ConsoleOutput.php

 <?php
 
-namespace Symfony\Components\Console\Output;
+namespace Symfony\Component\Console\Output;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Output/NullOutput.php → lib/vendor/Symfony/Component/Console/Output/NullOutput.php

 <?php
 
-namespace Symfony\Components\Console\Output;
+namespace Symfony\Component\Console\Output;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Output/Output.php → lib/vendor/Symfony/Component/Console/Output/Output.php

 <?php
 
-namespace Symfony\Components\Console\Output;
+namespace Symfony\Component\Console\Output;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Output/OutputInterface.php → lib/vendor/Symfony/Component/Console/Output/OutputInterface.php

 <?php
 
-namespace Symfony\Components\Console\Output;
+namespace Symfony\Component\Console\Output;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Output/StreamOutput.php → lib/vendor/Symfony/Component/Console/Output/StreamOutput.php

 <?php
 
-namespace Symfony\Components\Console\Output;
+namespace Symfony\Component\Console\Output;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Shell.php → lib/vendor/Symfony/Component/Console/Shell.php

 <?php
 
-namespace Symfony\Components\Console;
+namespace Symfony\Component\Console;
 
-use Symfony\Components\Console\Application;
-use Symfony\Components\Console\Input\StringInput;
-use Symfony\Components\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
 
 /*
  * This file is part of the symfony framework.

lib/vendor/Symfony/Components/Console/Tester/ApplicationTester.php → lib/vendor/Symfony/Component/Console/Tester/ApplicationTester.php

 <?php
 
-namespace Symfony\Components\Console\Tester;
+namespace Symfony\Component\Console\Tester;
 
-use Symfony\Components\Console\Application;
-use Symfony\Components\Console\Input\ArrayInput;
-use Symfony\Components\Console\Output\StreamOutput;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\StreamOutput;
 
 class ApplicationTester
 {

lib/vendor/Symfony/Components/Console/Tester/CommandTester.php → lib/vendor/Symfony/Component/Console/Tester/CommandTester.php

 <?php
 
-namespace Symfony\Components\Console\Tester;
+namespace Symfony\Component\Console\Tester;
 
-use Symfony\Components\Console\Command\Command;
-use Symfony\Components\Console\Input\ArrayInput;
-use Symfony\Components\Console\Output\StreamOutput;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\StreamOutput;
 
 class CommandTester
 {

lib/vendor/Symfony/Components/Yaml/Dumper.php → lib/vendor/Symfony/Component/Yaml/Dumper.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

lib/vendor/Symfony/Components/Yaml/Exception.php → lib/vendor/Symfony/Component/Yaml/Exception.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

lib/vendor/Symfony/Components/Yaml/Inline.php → lib/vendor/Symfony/Component/Yaml/Inline.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

lib/vendor/Symfony/Components/Yaml/Parser.php → lib/vendor/Symfony/Component/Yaml/Parser.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

lib/vendor/Symfony/Components/Yaml/ParserException.php → lib/vendor/Symfony/Component/Yaml/ParserException.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

lib/vendor/Symfony/Components/Yaml/Yaml.php → lib/vendor/Symfony/Component/Yaml/Yaml.php

 <?php
 
-namespace Symfony\Components\Yaml;
+namespace Symfony\Component\Yaml;
 
 /*
  * This file is part of the symfony package.

doctrine-common @ df50f65e

-Subproject commit 0e78e1a21e69a22389bd3c113f786812c14bd407
+Subproject commit df50f65ee707bb148682232c516d5168cf46d987

tests/Doctrine/Tests/DbalFunctionalTestCase.php

@@ -18,7 +18,7 @@ class DbalFunctionalTestCase extends DbalTestCase
 
     protected function resetSharedConn()
     {
-        if ($this->sharedFixture['conn']) {
+        if (isset($this->sharedFixture['conn'])) {
             $this->sharedFixture['conn']->close();
             $this->sharedFixture['conn'] = null;
         }