RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-13 18:53:15 +03:00
Code Issues Projects Releases Wiki Activity

correct code style

Browse Source
This commit is contained in:
Peter Gribanov 2016-06-08 11:47:09 +03:00
parent 0b5b7190d7
commit c0a87597fa
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Doctrine/ORM/EntityManager.php
View File

@ -821,7 +821,7 @@ use Doctrine\Common\Util\ClassUtils;
/** /**
* Factory method to create EntityManager instances. * Factory method to create EntityManager instances.
* *
* @param array|Connection $conn An array with the connection parameters or an existing Connection instance. * @param array|Connection $connection An array with the connection parameters or an existing Connection instance.
* @param Configuration $config The Configuration instance to use. * @param Configuration $config The Configuration instance to use.
* @param EventManager $eventManager The EventManager instance to use. * @param EventManager $eventManager The EventManager instance to use.
* *
@ -830,21 +830,21 @@ use Doctrine\Common\Util\ClassUtils;
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @throws ORMException * @throws ORMException
*/ */
public static function create($conn, Configuration $config, EventManager $eventManager = null) public static function create($connection, Configuration $config, EventManager $eventManager = null)
{ {
if ( ! $config->getMetadataDriverImpl()) { if ( ! $config->getMetadataDriverImpl()) {
throw ORMException::missingMappingDriverImpl(); throw ORMException::missingMappingDriverImpl();
} }
$conn = static::createConnection($conn, $config, $eventManager); $connection = static::createConnection($connection, $config, $eventManager);
return new EntityManager($conn, $config, $conn->getEventManager()); return new EntityManager($connection, $config, $connection->getEventManager());
} }
/** /**
* Factory method to create Connection instances. * Factory method to create Connection instances.
* *
* @param array|Connection $conn An array with the connection parameters or an existing Connection instance. * @param array|Connection $connection An array with the connection parameters or an existing Connection instance.
* @param Configuration $config The Configuration instance to use. * @param Configuration $config The Configuration instance to use.
* @param EventManager $eventManager The EventManager instance to use. * @param EventManager $eventManager The EventManager instance to use.
* *
@ -852,17 +852,17 @@ use Doctrine\Common\Util\ClassUtils;
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
protected static function createConnection($conn, Configuration $config, EventManager $eventManager = null) protected static function createConnection($connection, Configuration $config, EventManager $eventManager = null)
{ {
if (is_array($conn)) { if (is_array($connection)) {
return DriverManager::getConnection( return DriverManager::getConnection($connection, $config, $eventManager ?: new EventManager());
$conn, $config, ($eventManager ?: new EventManager())
);
} elseif ( ! $conn instanceof Connection) {
throw new \InvalidArgumentException("Invalid argument: " . $conn);
} }
return $conn; if ( ! $connection instanceof Connection) {
throw new \InvalidArgumentException("Invalid argument: " . $connection);
}
return $connection;
} }
/** /**