initial steps to handling objects

Author: lsmith77

src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateFromDataFixturesCommand.php

@@ -22,6 +22,7 @@
 use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\DBAL\Migrations\Configuration\Configuration;
 use Symfony\Bundle\DoctrineMigrationsBundle\SQLLogger\FixturesToMigrationSQLLogger;
+use Symfony\Bundle\DoctrineMigrationsBundle\Command\DoctrineCommand;
 
 /**
  * Command for generating a Doctrine database migration class from a set of fixtures.
@@ -56,13 +57,14 @@ public function execute(InputInterface $input, OutputInterface $output)
 
  DoctrineCommand::setApplicationEntityManager($this->application, $emName);
 
+ $configuration = $this->getMigrationConfiguration($input, $output);
+ DoctrineCommand::configureMigrations($this->application->getKernel()->getContainer(), $configuration);
+
  $emServiceName = sprintf('doctrine.orm.%s_entity_manager', $emName);
  $em = $container->get($emServiceName);
 
  $em->getConnection()->getConfiguration()->setSQLLogger($sqlLogger);
 
- $configuration = $this->getMigrationConfiguration($input, $output);
-
  $dirOrFile = $input->getOption('fixtures');
  if ($dirOrFile) {
  $paths = is_array($dirOrFile) ? $dirOrFile : array($dirOrFile);
@@ -88,10 +90,23 @@ public function execute(InputInterface $input, OutputInterface $output)
  $executor->execute($fixtures);
 
  $queries = $sqlLogger->getQueries();
+ foreach ($queries as $key => $query) {
+ foreach ($query[1] as $key2 => $param) {
+ if (is_object($param)) {
+ if ($param instanceOf \DateTime) {
+ $queries[$key][1][$key2] = $param->format('Y-m-d\TH:i:s\Z');
+ } else if (in_array('__toString', get_class_methods($param))) {
+ $queries[$key][1][$key2] = (string)$param;
+ } else {
+ $output->writeln(sprintf(' <comment>></comment> <info>cannot convert object of type %s to a string</info>', get_class($param)));
+ }
+ }
+ }
+ }
 
  $output->writeln(sprintf(' <comment>></comment> <info>%s queries logged</info>', count($queries)));
  foreach ($queries as $query) {
- $output->writeln(sprintf(' <comment>-</comment> <info>%s (%s)</info>', $query[0], implode(',', $query[1]))); 
+ $output->writeln(sprintf(' <comment>-</comment> <info>%s (parameters? %s)</info>', $query[0], is_array($query[1]) ? 'yes' : 'no'));
  }
 
  $version = date('YmdHis');
@@ -110,8 +125,8 @@ private function buildCodeFromSql(Configuration $configuration, array $queries)
  if (strpos($query[0], $configuration->getMigrationsTableName()) !== false) {
  continue;
  }
- $code[] = sprintf("\$this->_addSql(\"%s\", %s);", $query[0], var_export($query[1], true));
+ $code[] = sprintf("\$this->addSql(\"%s\", %s);", $query[0], var_export($query[1], true));
  }
  return implode("\n", $code);
  }
-}
+}