Renamed the $entitymanager (property and variables) to $objectManager.

Author: Tommy Seus

src/DoctrineORMModule/Module.php

@@ -143,19 +143,19 @@ public function initializeConsole(EventInterface $event)
  'object-manager',
  null,
  InputOption::VALUE_OPTIONAL,
- 'The name of the object-manager to use.',
+ 'The name of the object manager to use.',
  'doctrine.entitymanager.orm_default'
  ));
 
  $cli->add($command);
  }
 
  $arguments = new ArgvInput();
- $objectManagerName = $arguments->getParameterOption('--object-manager');
- $objectManagerName = !empty($objectManagerName) ? $objectManagerName : 'doctrine.entitymanager.orm_default';
+ $objectManagerName = ($arguments->getParameterOption('--object-manager')) ?:
+   'doctrine.entitymanager.orm_default';
 
- /* @var $entityManager \Doctrine\ORM\EntityManagerInterface */
- $entityManager = $serviceLocator->get($objectManagerName);
+ /* @var $objectManager \Doctrine\ORM\EntityManagerInterface */
+ $objectManager = $serviceLocator->get($objectManagerName);
  $helperSet = $cli->getHelperSet();
 
  if (class_exists('Symfony\Component\Console\Helper\QuestionHelper')) {
@@ -164,7 +164,7 @@ public function initializeConsole(EventInterface $event)
  $helperSet->set(new DialogHelper(), 'dialog');
  }
 
- $helperSet->set(new ConnectionHelper($entityManager->getConnection()), 'db');
- $helperSet->set(new EntityManagerHelper($entityManager), 'em');
+ $helperSet->set(new ConnectionHelper($objectManager->getConnection()), 'db');
+ $helperSet->set(new EntityManagerHelper($objectManager), 'em');
  }
 }

tests/DoctrineORMModuleTest/CliTest.php

@@ -46,7 +46,7 @@ class CliTest extends PHPUnit_Framework_TestCase
  /**
  * @var \Doctrine\ORM\EntityManager
  */
- protected $entityManager;
+ protected $objectManager;
 
  /**
  * {@inheritDoc}
@@ -70,7 +70,7 @@ function () use (&$invocations) {
 
  $application->bootstrap();
  $this->serviceManager = $serviceManager;
- $this->entityManager = $serviceManager->get('doctrine.entitymanager.orm_default');
+ $this->objectManager = $serviceManager->get('doctrine.entitymanager.orm_default');
  $this->cli = $serviceManager->get('doctrine.cli');
  $this->assertSame(1, $invocations);
  }
@@ -82,12 +82,12 @@ public function testValidHelpers()
  /* @var $emHelper \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper */
  $emHelper = $helperSet->get('em');
  $this->assertInstanceOf('Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper', $emHelper);
- $this->assertSame($this->entityManager, $emHelper->getEntityManager());
+ $this->assertSame($this->objectManager, $emHelper->getEntityManager());
 
  /* @var $dbHelper \Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper */
  $dbHelper = $helperSet->get('db');
  $this->assertInstanceOf('Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper', $dbHelper);
- $this->assertSame($this->entityManager->getConnection(), $dbHelper->getConnection());
+ $this->assertSame($this->objectManager->getConnection(), $dbHelper->getConnection());
  }
 
  public function testOrmDefaultIsUsedAsTheEntityManagerIfNoneIsProvided()
@@ -101,7 +101,7 @@ public function testOrmDefaultIsUsedAsTheEntityManagerIfNoneIsProvided()
  /* @var $entityManagerHelper \Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper */
  $entityManagerHelper = $application->getHelperSet()->get('entityManager');
  $this->assertInstanceOf('Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper', $entityManagerHelper);
- $this->assertSame($this->entityManager, $entityManagerHelper->getEntityManager());
+ $this->assertSame($this->objectManager, $entityManagerHelper->getEntityManager());
  }
 
  /**
@@ -160,7 +160,7 @@ public function testValidCommands($commandName, $className)
  $this->assertFalse($entityManagerOption->isArray());
  $this->assertNull($entityManagerOption->getShortcut());
  $this->assertSame('doctrine.entitymanager.orm_default', $entityManagerOption->getDefault());
- $this->assertSame('The name of the object-manager to use.', $entityManagerOption->getDescription());
+ $this->assertSame('The name of the object manager to use.', $entityManagerOption->getDescription());
  }
 
  /**