RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 15:01:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1235-consistent-joined-subclass-persister-return-types'

Browse Source 
Close #1235
This commit is contained in:
Marco Pivetta 2014-12-31 09:46:31 +01:00
commit d13e2fbb83
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
View File

@ -127,7 +127,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
public function executeInserts()
{
if ( ! $this->queuedInserts) {
return;
return array();
}
$postInsertIds = array();

64
tests/Doctrine/Tests/ORM/Persisters/JoinedSubclassPersisterTest.php Normal file
View File

@ -0,0 +1,64 @@
<?php
/*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the MIT license. For more information, see
* <http://www.doctrine-project.org>.
*/
namespace Doctrine\Tests\ORM\Persisters;
use Doctrine\ORM\Persisters\JoinedSubclassPersister;
use Doctrine\Tests\OrmTestCase;
/**
* Tests for {@see \Doctrine\ORM\Persisters\JoinedSubclassPersister}
*
* @covers \Doctrine\ORM\Persisters\JoinedSubclassPersister
*/
class JoinedSubClassPersisterTest extends OrmTestCase
{
/**
* @var JoinedSubclassPersister
*/
protected $persister;
/**
* @var \Doctrine\ORM\EntityManager
*/
protected $em;
/**
* {@inheritDoc}
*/
protected function setUp()
{
parent::setUp();
$this->em = $this->_getTestEntityManager();
$this->persister = new JoinedSubclassPersister(
$this->em,
$this->em->getClassMetadata('Doctrine\Tests\Models\JoinedInheritanceType\RootClass')
);
}
/**
* @group DDC-3470
*/
public function testExecuteInsertsWillReturnEmptySetWithNoQueuedInserts()
{
$this->assertSame(array(), $this->persister->executeInserts());
}
}