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

Merge pull request #6651 from doctrine/fix/use-quote-model-set-when-available

Browse Source 
Replacing direct `quote` model-set schema creation with actually existing model-set setup
This commit is contained in:
Marco Pivetta 2017-08-26 14:23:26 +02:00 committed by GitHub
commit 7a0385634f
4 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\Phone;
use Doctrine\Tests\Models\Quote\User;
use Doctrine\Tests\Models\Quote\Address;
@ -13,21 +11,11 @@ use Doctrine\Tests\Models\Quote\Address;
*/
class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
protected function setUp()
protected function setUp() : void
{
parent::setUp();
$this->useModelSet('quote');
try {
$this->_schemaTool->createSchema(
[
$this->_em->getClassMetadata(User::class),
$this->_em->getClassMetadata(Group::class),
$this->_em->getClassMetadata(Phone::class),
$this->_em->getClassMetadata(Address::class),
]
);
} catch(\Exception $e) {
}
parent::setUp();
}
public function testCreateRetrieveUpdateDelete()

20
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
View File

@ -2,10 +2,7 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\Address;
use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\Phone;
use Doctrine\Tests\Models\Quote\User;
/**
* @group DDC-1845
@ -13,22 +10,11 @@ use Doctrine\Tests\Models\Quote\User;
*/
class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
protected function setUp()
protected function setUp() : void
{
parent::setUp();
$this->useModelSet('quote');
try {
$this->_schemaTool->createSchema(
[
$this->_em->getClassMetadata(User::class),
$this->_em->getClassMetadata(Group::class),
$this->_em->getClassMetadata(Phone::class),
$this->_em->getClassMetadata(Address::class),
]
);
} catch(\Exception $e) {
}
parent::setUp();
}
public function testCreateRetrieveUpdateDelete()

16
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
View File

@ -2,7 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\Address;
use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\User;
@ -18,20 +17,11 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
*/
private $user;
protected function setUp()
protected function setUp() : void
{
parent::setUp();
$this->useModelSet('quote');
try {
$this->_schemaTool->createSchema(
[
$this->_em->getClassMetadata(User::class),
$this->_em->getClassMetadata(Group::class),
$this->_em->getClassMetadata(Address::class),
]
);
} catch(\Exception $e) {
}
parent::setUp();
$user = new User();
$user->name = "FabioBatSilva";

2
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php
View File

@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\Address;
use Doctrine\Tests\Models\Quote\City;
use Doctrine\Tests\Models\Quote\FullAddress;
use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\Phone;
use Doctrine\Tests\Models\Quote\User;
use Doctrine\Tests\OrmFunctionalTestCase;