Skip to content

Commit

Permalink
Symfony/Components renamed into Symfony/Component
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien HOUZE authored and jwage committed Aug 23, 2010
1 parent 2f00db0 commit 4a9f368
Show file tree
Hide file tree
Showing 55 changed files with 162 additions and 162 deletions.
8 changes: 4 additions & 4 deletions bin/doctrine.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
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(
Expand All @@ -55,4 +55,4 @@
new \Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand(),

));
$cli->run();
$cli->run();
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,6 @@ private function _getJoinColumnMapping($joinColumnElement)
*/
protected function _loadMappingFile($file)
{
return \Symfony\Components\Yaml\Yaml::load($file);
return \Symfony\Component\Yaml\Yaml::load($file);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -82,4 +82,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('No entries to be deleted.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -82,4 +82,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('No entries to be deleted.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -165,4 +165,4 @@ private function _printDeleted(Console\Output\OutputInterface $output, array $it
$output->write('No entries to be deleted.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -220,4 +220,4 @@ public function convertDoctrine1Schema($em, $fromPaths, $destPath, $toType, $num
$output->write('No Metadata Classes to process.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -147,4 +147,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('No Metadata Classes to process.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -82,4 +82,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('<info>Environment is correctly configured for production.</info>' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -142,4 +142,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('No Metadata Classes to process.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -112,4 +112,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
}

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -113,4 +113,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
$output->write('No Metadata Classes to process.' . PHP_EOL);
}
}
}
}
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -121,4 +121,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

\Doctrine\Common\Util\Debug::dump($resultSet, $input->getOption('depth'));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -61,4 +61,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
$output->write('No Metadata Classes to process.' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -74,4 +74,4 @@ protected function executeSchemaCommand(InputInterface $input, OutputInterface $
$output->write('Database schema created successfully!' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -75,4 +75,4 @@ protected function executeSchemaCommand(InputInterface $input, OutputInterface $
$output->write('Database schema dropped successfully!' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -83,4 +83,4 @@ protected function executeSchemaCommand(InputInterface $input, OutputInterface $
$output->write('Database schema updated successfully!' . PHP_EOL);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,4 +86,4 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O

exit($exit);
}
}
}
4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -71,4 +71,4 @@ public function getName()
{
return 'entityManager';
}
}
}
6 changes: 3 additions & 3 deletions lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public function getMetadata()
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));
}
}

Expand Down Expand Up @@ -271,4 +271,4 @@ private function _convertRelations($className, array $model, ClassMetadataInfo $
}
}
}
}
}
4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,6 @@ public function exportClassMetadata(ClassMetadataInfo $metadata)
$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);
}
}
}
Loading

0 comments on commit 4a9f368

Please sign in to comment.