RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Update message.

Browse Source
This commit is contained in:
SpacePossum 2016-11-18 08:06:11 +01:00
parent f9a605f6ca
commit e37041aa94
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -860,7 +860,13 @@ use Doctrine\Common\Util\ClassUtils;
} }
if ( ! $connection instanceof Connection) { if ( ! $connection instanceof Connection) {
throw new \InvalidArgumentException(sprintf('Invalid argument for connection "%s".', is_object($connection) ? get_class($connection) : gettype($connection) . '#' . $connection)); throw new \InvalidArgumentException(
sprintf(
'Invalid $connection argument of type %s given%s.',
is_object($connection) ? get_class($connection) : gettype($connection),
is_object($connection) ? '' : ': "' . $connection . '"'
)
);
} }
if ($eventManager !== null && $connection->getEventManager() !== $eventManager) { if ($eventManager !== null && $connection->getEventManager() !== $eventManager) {

7
tests/Doctrine/Tests/ORM/EntityManagerTest.php
View File

@ -208,12 +208,11 @@ class EntityManagerTest extends OrmTestCase
return 'callback'; return 'callback';
} }
/**
* @expectedException \InvalidArgumentException
* @expectedExceptionMessageRegExp /^Invalid argument for connection \"integer#1\".$/
*/
public function testCreateInvalidConnection() public function testCreateInvalidConnection()
{ {
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessageRegExp('/^Invalid \$connection argument of type integer given: \"1\".$/');
$config = new Configuration(); $config = new Configuration();
$config->setMetadataDriverImpl($this->createMock(MappingDriver::class)); $config->setMetadataDriverImpl($this->createMock(MappingDriver::class));
EntityManager::create(1, $config); EntityManager::create(1, $config);