Browse files

removed @var for private properties

changed fqn to short class name, if use statement exist
revert usage of comments for phpdoc in DoctrineBundle class
added for this inheritDoc
  • Loading branch information...
1 parent f0300fc commit 86b1d3a0a5eb3a67ccde65b18d9ad93c3d4dc3de @Engerim Engerim committed Jul 1, 2012
View
2 Command/DoctrineCommand.php
@@ -27,7 +27,7 @@
/**
* get a doctrine entity generator
*
- * @return \Doctrine\ORM\Tools\EntityGenerator
+ * @return EntityGenerator
*/
protected function getEntityGenerator()
{
View
11 ConnectionFactory.php
@@ -24,19 +24,8 @@
*/
class ConnectionFactory
{
- /**
- * @var array
- */
private $typesConfig = array();
-
- /**
- * @var array
- */
private $commentedTypes = array();
-
- /**
- * @var bool
- */
private $initialized = false;
/**
View
8 DependencyInjection/Configuration.php
@@ -111,7 +111,7 @@ private function addDbalSection(ArrayNodeDefinition $node)
/**
* Return the dbal connections node
*
- * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
+ * @return ArrayNodeDefinition
*/
private function getDbalConnectionsNode()
{
@@ -165,7 +165,7 @@ private function getDbalConnectionsNode()
*
* These keys are available for slave configurations too.
*
- * @param \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition $node
+ * @param ArrayNodeDefinition $node
*/
private function configureDbalDriverNode(ArrayNodeDefinition $node)
{
@@ -282,7 +282,7 @@ private function getOrmTargetEntityResolverNode()
/**
* Return ORM entity manager node
*
- * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
+ * @return ArrayNodeDefinition
*/
private function getOrmEntityManagersNode()
{
@@ -390,7 +390,7 @@ private function getOrmEntityManagersNode()
*
* @param string $name
*
- * @return \Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition
+ * @return ArrayNodeDefinition
*/
private function getOrmCacheDriverNode($name)
{
View
21 DoctrineBundle.php
@@ -34,9 +34,6 @@
*/
class DoctrineBundle extends Bundle
{
- /**
- * @var Closure
- */
private $autoloader;
/**
@@ -55,11 +52,12 @@ public function build(ContainerBuilder $container)
}
/**
- * Register an autoloader for proxies to avoid issues when unserializing them
- * when the ORM is used.
+ * {@inheritDoc}
*/
public function boot()
{
+ // Register an autoloader for proxies to avoid issues when unserializing them
+ // when the ORM is used.
if ($this->container->hasParameter('doctrine.orm.proxy_namespace')) {
$namespace = $this->container->getParameter('doctrine.orm.proxy_namespace');
$dir = $this->container->getParameter('doctrine.orm.proxy_dir');
@@ -105,7 +103,7 @@ public function boot()
}
/**
- * unregister the autoloader
+ * {@inheritDoc}
*/
public function shutdown()
{
@@ -116,22 +114,19 @@ public function shutdown()
}
/**
- * Register the default logic when the ORM is available.
- * This avoids listing all ORM commands by hand.
- * If ORM is not available register only the DBAL commands if the ORM is not available.
- *
- * @param Application $application
- *
- * @return null
+ * {@inheritDoc}
*/
public function registerCommands(Application $application)
{
+ // Use the default logic when the ORM is available.
+ // This avoids listing all ORM commands by hand.
if (class_exists('Doctrine\\ORM\\Version')) {
parent::registerCommands($application);
return;
}
+ // Register only the DBAL commands if the ORM is not available.
$application->add(new CreateDatabaseDoctrineCommand());
$application->add(new DropDatabaseDoctrineCommand());
$application->add(new RunSqlDoctrineCommand());
View
3 ManagerConfigurator.php
@@ -23,9 +23,6 @@
*/
class ManagerConfigurator
{
- /**
- * @var array
- */
private $enabledFilters = array();
/**
View
11 Mapping/ClassMetadataCollection.php
@@ -19,19 +19,8 @@
*/
class ClassMetadataCollection
{
- /**
- * @var string
- */
private $path;
-
- /**
- * @var string
- */
private $namespace;
-
- /**
- * @var array
- */
private $metadata;
/**
View
3 Mapping/MetadataFactory.php
@@ -26,9 +26,6 @@
*/
class MetadataFactory
{
- /**
- * @var \Doctrine\Common\Persistence\ManagerRegistry
- */
private $registry;
/**

0 comments on commit 86b1d3a

Please sign in to comment.