From 4a9f36800e3f55bc2cf61033573e1103594b4742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZE?= Date: Mon, 23 Aug 2010 08:21:41 +0200 Subject: [PATCH] Symfony/Components renamed into Symfony/Component --- bin/doctrine.php | 8 ++--- .../ORM/Mapping/Driver/YamlDriver.php | 2 +- .../Command/ClearCache/MetadataCommand.php | 8 ++--- .../Command/ClearCache/QueryCommand.php | 8 ++--- .../Command/ClearCache/ResultCommand.php | 8 ++--- .../Command/ConvertDoctrine1SchemaCommand.php | 8 ++--- .../Console/Command/ConvertMappingCommand.php | 8 ++--- .../EnsureProductionSettingsCommand.php | 8 ++--- .../Command/GenerateEntitiesCommand.php | 8 ++--- .../Command/GenerateProxiesCommand.php | 8 ++--- .../Command/GenerateRepositoriesCommand.php | 8 ++--- .../Tools/Console/Command/RunDqlCommand.php | 8 ++--- .../Command/SchemaTool/AbstractCommand.php | 12 +++---- .../Command/SchemaTool/CreateCommand.php | 10 +++--- .../Command/SchemaTool/DropCommand.php | 10 +++--- .../Command/SchemaTool/UpdateCommand.php | 10 +++--- .../Console/Command/ValidateSchemaCommand.php | 8 ++--- .../Console/Helper/EntityManagerHelper.php | 4 +-- .../ORM/Tools/ConvertDoctrine1Schema.php | 6 ++-- .../ORM/Tools/Export/Driver/YamlExporter.php | 4 +-- .../Console/Application.php | 32 +++++++++---------- .../Console/Command/Command.php | 14 ++++---- .../Console/Command/HelpCommand.php | 14 ++++---- .../Console/Command/ListCommand.php | 14 ++++---- .../Console/Helper/DialogHelper.php | 4 +-- .../Console/Helper/FormatterHelper.php | 2 +- .../Console/Helper/Helper.php | 2 +- .../Console/Helper/HelperInterface.php | 2 +- .../Console/Helper/HelperSet.php | 4 +-- .../Console/Input/ArgvInput.php | 2 +- .../Console/Input/ArrayInput.php | 2 +- .../Console/Input/Input.php | 2 +- .../Console/Input/InputArgument.php | 2 +- .../Console/Input/InputDefinition.php | 2 +- .../Console/Input/InputInterface.php | 2 +- .../Console/Input/InputOption.php | 2 +- .../Console/Input/StringInput.php | 2 +- .../Console/Output/ConsoleOutput.php | 2 +- .../Console/Output/NullOutput.php | 2 +- .../Console/Output/Output.php | 2 +- .../Console/Output/OutputInterface.php | 2 +- .../Console/Output/StreamOutput.php | 2 +- .../Console/Shell.php | 8 ++--- .../Console/Tester/ApplicationTester.php | 8 ++--- .../Console/Tester/CommandTester.php | 8 ++--- .../{Components => Component}/Yaml/Dumper.php | 2 +- .../Yaml/Exception.php | 2 +- .../{Components => Component}/Yaml/Inline.php | 2 +- .../{Components => Component}/Yaml/Parser.php | 2 +- .../Yaml/ParserException.php | 2 +- .../{Components => Component}/Yaml/Yaml.php | 2 +- .../ORM/Mapping/YamlMappingDriverTest.php | 4 +-- .../ORM/Tools/ConvertDoctrine1SchemaTest.php | 4 +-- .../Export/YamlClassMetadataExporterTest.php | 4 +-- tools/sandbox/doctrine.php | 4 +-- 55 files changed, 160 insertions(+), 160 deletions(-) rename lib/vendor/Symfony/{Components => Component}/Console/Application.php (96%) rename lib/vendor/Symfony/{Components => Component}/Console/Command/Command.php (97%) rename lib/vendor/Symfony/{Components => Component}/Console/Command/HelpCommand.php (83%) rename lib/vendor/Symfony/{Components => Component}/Console/Command/ListCommand.php (81%) rename lib/vendor/Symfony/{Components => Component}/Console/Helper/DialogHelper.php (96%) rename lib/vendor/Symfony/{Components => Component}/Console/Helper/FormatterHelper.php (97%) rename lib/vendor/Symfony/{Components => Component}/Console/Helper/Helper.php (95%) rename lib/vendor/Symfony/{Components => Component}/Console/Helper/HelperInterface.php (95%) rename lib/vendor/Symfony/{Components => Component}/Console/Helper/HelperSet.php (95%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/ArgvInput.php (99%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/ArrayInput.php (98%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/Input.php (99%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/InputArgument.php (98%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/InputDefinition.php (99%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/InputInterface.php (96%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/InputOption.php (99%) rename lib/vendor/Symfony/{Components => Component}/Console/Input/StringInput.php (98%) rename lib/vendor/Symfony/{Components => Component}/Console/Output/ConsoleOutput.php (96%) rename lib/vendor/Symfony/{Components => Component}/Console/Output/NullOutput.php (94%) rename lib/vendor/Symfony/{Components => Component}/Console/Output/Output.php (99%) rename lib/vendor/Symfony/{Components => Component}/Console/Output/OutputInterface.php (95%) rename lib/vendor/Symfony/{Components => Component}/Console/Output/StreamOutput.php (98%) rename lib/vendor/Symfony/{Components => Component}/Console/Shell.php (94%) rename lib/vendor/Symfony/{Components => Component}/Console/Tester/ApplicationTester.php (91%) rename lib/vendor/Symfony/{Components => Component}/Console/Tester/CommandTester.php (91%) rename lib/vendor/Symfony/{Components => Component}/Yaml/Dumper.php (97%) rename lib/vendor/Symfony/{Components => Component}/Yaml/Exception.php (93%) rename lib/vendor/Symfony/{Components => Component}/Yaml/Inline.php (99%) rename lib/vendor/Symfony/{Components => Component}/Yaml/Parser.php (99%) rename lib/vendor/Symfony/{Components => Component}/Yaml/ParserException.php (93%) rename lib/vendor/Symfony/{Components => Component}/Yaml/Yaml.php (98%) diff --git a/bin/doctrine.php b/bin/doctrine.php index 905dd17d2..a94cdff67 100644 --- a/bin/doctrine.php +++ b/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\ORM\Version::VERSION); +$cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', Doctrine\ORM\Version::VERSION); $cli->setCatchExceptions(true); $cli->setHelperSet($helperSet); $cli->addCommands(array( @@ -55,4 +55,4 @@ $cli->addCommands(array( new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(), )); -$cli->run(); \ No newline at end of file +$cli->run(); diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 5ab26e388..bcf21f04a 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -452,6 +452,6 @@ class YamlDriver extends AbstractFileDriver */ protected function _loadMappingFile($file) { - return \Symfony\Components\Yaml\Yaml::load($file); + return \Symfony\Component\Yaml\Yaml::load($file); } } diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php index 198f228b3..0bb318995 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\Tools\Console\Command\ClearCache; -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; /** * Command to clear the metadata cache of the various cache drivers. @@ -82,4 +82,4 @@ EOT $output->write('No entries to be deleted.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php index d42137e20..9b7129208 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\Tools\Console\Command\ClearCache; -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; /** * Command to clear the query cache of the various cache drivers. @@ -82,4 +82,4 @@ EOT $output->write('No entries to be deleted.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php index 2354360e5..d994d708f 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\Tools\Console\Command\ClearCache; -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; /** * Command to clear the result cache of the various cache drivers. @@ -165,4 +165,4 @@ EOT $output->write('No entries to be deleted.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php index 42985393b..a518b76e8 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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, Doctrine\ORM\Tools\Export\ClassMetadataExporter, Doctrine\ORM\Tools\ConvertDoctrine1Schema, Doctrine\ORM\Tools\EntityGenerator; @@ -220,4 +220,4 @@ EOT $output->write('No Metadata Classes to process.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index 6770e6360..ad3134779 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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, Doctrine\ORM\Tools\Console\MetadataFilter, Doctrine\ORM\Tools\Export\ClassMetadataExporter, Doctrine\ORM\Tools\EntityGenerator, @@ -147,4 +147,4 @@ EOT $output->write('No Metadata Classes to process.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php index 7c33174f5..4fdd8fad7 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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; /** * Command to ensure that Doctrine is properly configured for a production environment. @@ -82,4 +82,4 @@ EOT $output->write('Environment is correctly configured for production.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php index 7565442ca..08654ba18 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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, Doctrine\ORM\Tools\Console\MetadataFilter, Doctrine\ORM\Tools\EntityGenerator, Doctrine\ORM\Tools\DisconnectedClassMetadataFactory; @@ -142,4 +142,4 @@ EOT $output->write('No Metadata Classes to process.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php index 412cf869b..09376d867 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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, Doctrine\ORM\Tools\Console\MetadataFilter; /** @@ -112,4 +112,4 @@ EOT } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php index f417ee0f9..a70aa39d0 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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, Doctrine\ORM\Tools\Console\MetadataFilter, Doctrine\ORM\Tools\EntityRepositoryGenerator; @@ -113,4 +113,4 @@ EOT $output->write('No Metadata Classes to process.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php index fc375812b..678b045d3 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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; /** * Command to execute DQL queries in a given EntityManager. @@ -121,4 +121,4 @@ EOT \Doctrine\Common\Util\Debug::dump($resultSet, $input->getOption('depth')); } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php index 84267fbd7..cd53948c4 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php @@ -21,11 +21,11 @@ namespace Doctrine\ORM\Tools\Console\Command\SchemaTool; -use Symfony\Components\Console\Input\InputArgument, - Symfony\Components\Console\Input\InputOption, - Symfony\Components\Console\Input\InputInterface, - Symfony\Components\Console\Output\OutputInterface, - Symfony\Components\Console\Command\Command, +use Symfony\Component\Console\Input\InputArgument, + Symfony\Component\Console\Input\InputOption, + Symfony\Component\Console\Input\InputInterface, + Symfony\Component\Console\Output\OutputInterface, + Symfony\Component\Console\Command\Command, Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper, Doctrine\ORM\Tools\SchemaTool, Doctrine\ORM\Mapping\Driver\AbstractFileDriver; @@ -61,4 +61,4 @@ abstract class AbstractCommand extends Command $output->write('No Metadata Classes to process.' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php index 06332a3eb..c3870221b 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php @@ -21,10 +21,10 @@ namespace Doctrine\ORM\Tools\Console\Command\SchemaTool; -use Symfony\Components\Console\Input\InputArgument, - Symfony\Components\Console\Input\InputOption, - Symfony\Components\Console\Input\InputInterface, - Symfony\Components\Console\Output\OutputInterface, +use Symfony\Component\Console\Input\InputArgument, + Symfony\Component\Console\Input\InputOption, + Symfony\Component\Console\Input\InputInterface, + Symfony\Component\Console\Output\OutputInterface, Doctrine\ORM\Tools\SchemaTool; /** @@ -74,4 +74,4 @@ EOT $output->write('Database schema created successfully!' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php index 1c6d0c57a..0d6741717 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/DropCommand.php @@ -21,10 +21,10 @@ namespace Doctrine\ORM\Tools\Console\Command\SchemaTool; -use Symfony\Components\Console\Input\InputArgument, - Symfony\Components\Console\Input\InputOption, - Symfony\Components\Console\Input\InputInterface, - Symfony\Components\Console\Output\OutputInterface, +use Symfony\Component\Console\Input\InputArgument, + Symfony\Component\Console\Input\InputOption, + Symfony\Component\Console\Input\InputInterface, + Symfony\Component\Console\Output\OutputInterface, Doctrine\ORM\Tools\SchemaTool; /** @@ -75,4 +75,4 @@ EOT $output->write('Database schema dropped successfully!' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php index 32d8fd0f7..986d97954 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php @@ -21,10 +21,10 @@ namespace Doctrine\ORM\Tools\Console\Command\SchemaTool; -use Symfony\Components\Console\Input\InputArgument, - Symfony\Components\Console\Input\InputOption, - Symfony\Components\Console\Input\InputInterface, - Symfony\Components\Console\Output\OutputInterface, +use Symfony\Component\Console\Input\InputArgument, + Symfony\Component\Console\Input\InputOption, + Symfony\Component\Console\Input\InputInterface, + Symfony\Component\Console\Output\OutputInterface, Doctrine\ORM\Tools\SchemaTool; /** @@ -83,4 +83,4 @@ EOT $output->write('Database schema updated successfully!' . PHP_EOL); } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php index 29695ba12..994b89578 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ValidateSchemaCommand.php @@ -21,9 +21,9 @@ namespace Doctrine\ORM\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; /** * Validate that the current mapping is valid @@ -86,4 +86,4 @@ EOT exit($exit); } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php b/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php index 2636006e3..c28622ebb 100644 --- a/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php +++ b/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php @@ -21,7 +21,7 @@ namespace Doctrine\ORM\Tools\Console\Helper; -use Symfony\Components\Console\Helper\Helper, +use Symfony\Component\Console\Helper\Helper, Doctrine\ORM\EntityManager; /** @@ -71,4 +71,4 @@ class EntityManagerHelper extends Helper { return 'entityManager'; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index d0eb5e9f0..14c9ada9a 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -70,10 +70,10 @@ class ConvertDoctrine1Schema if (is_dir($path)) { $files = glob($path . '/*.yml'); foreach ($files as $file) { - $schema = array_merge($schema, (array) \Symfony\Components\Yaml\Yaml::load($file)); + $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($file)); } } else { - $schema = array_merge($schema, (array) \Symfony\Components\Yaml\Yaml::load($path)); + $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($path)); } } @@ -271,4 +271,4 @@ class ConvertDoctrine1Schema } } } -} \ No newline at end of file +} diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 28414cdbd..1c140e1bf 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -198,6 +198,6 @@ class YamlExporter extends AbstractExporter $array['lifecycleCallbacks'] = $metadata->lifecycleCallbacks; } - return \Symfony\Components\Yaml\Yaml::dump(array($metadata->name => $array), 10); + return \Symfony\Component\Yaml\Yaml::dump(array($metadata->name => $array), 10); } -} \ No newline at end of file +} diff --git a/lib/vendor/Symfony/Components/Console/Application.php b/lib/vendor/Symfony/Component/Console/Application.php similarity index 96% rename from lib/vendor/Symfony/Components/Console/Application.php rename to lib/vendor/Symfony/Component/Console/Application.php index 929bc6bc0..af488e347 100644 --- a/lib/vendor/Symfony/Components/Console/Application.php +++ b/lib/vendor/Symfony/Component/Console/Application.php @@ -1,22 +1,22 @@ markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.'); } return new YamlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'yaml'); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php index eafe63d1f..6f542dba9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php @@ -61,7 +61,7 @@ class ConvertDoctrine1SchemaTest extends \Doctrine\Tests\OrmTestCase public function testTest() { - if ( ! class_exists('Symfony\Components\Yaml\Yaml', true)) { + if ( ! class_exists('Symfony\Component\Yaml\Yaml', true)) { $this->markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.'); } @@ -100,4 +100,4 @@ class ConvertDoctrine1SchemaTest extends \Doctrine\Tests\OrmTestCase unlink(__DIR__ . '/convert/Profile.dcm.yml'); rmdir(__DIR__ . '/convert'); } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php index d7258a561..406101ac7 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php @@ -37,10 +37,10 @@ class YamlClassMetadataExporterTest extends AbstractClassMetadataExporterTest { protected function _getType() { - if (!class_exists('Symfony\Components\Yaml\Yaml', true)) { + if (!class_exists('Symfony\Component\Yaml\Yaml', true)) { $this->markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.'); } return 'yaml'; } -} \ No newline at end of file +} diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php index 9d498d440..fc3c96db4 100644 --- a/tools/sandbox/doctrine.php +++ b/tools/sandbox/doctrine.php @@ -18,7 +18,7 @@ $classLoader->register(); // Variable $helperSet is defined inside cli-config.php require __DIR__ . '/cli-config.php'; -$cli = new \Symfony\Components\Console\Application('Doctrine Command Line Interface', Doctrine\Common\Version::VERSION); +$cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', Doctrine\Common\Version::VERSION); $cli->setCatchExceptions(true); $helperSet = $cli->getHelperSet(); foreach ($helpers as $name => $helper) { @@ -46,4 +46,4 @@ $cli->addCommands(array( new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(), )); -$cli->run(); \ No newline at end of file +$cli->run();