From 652358a4de7766d4588b1a9b8992437cc085e98c Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:14:26 +0200 Subject: [PATCH 1/8] Add failing test for #5715 (unit test for MetadataFilter) --- .../ORM/Tools/Console/MetadataFilterTest.php | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php new file mode 100644 index 000000000..7922f9006 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -0,0 +1,78 @@ +createAnnotationDriver(); + $em = $this->_getTestEntityManager(); + $em->getConfiguration()->setMetadataDriverImpl($driver); + + $this->cmf = new DisconnectedClassMetadataFactory(); + $this->cmf->setEntityManager($em); + } + + public function testFilterWithArray() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, array( + 'MetadataFilterTestEntityAaa', + 'MetadataFilterTestEntityCcc', + )); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertContains($metadataCcc, $metadatas); + $this->assertCount(2, $metadatas); + } +} + +/** @Entity */ +class MetadataFilterTestEntityAaa +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBbb +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityCcc +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} From 87e9879edddefaa7b56f131aff9c9e2540633a16 Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:16:00 +0200 Subject: [PATCH 2/8] Fix MetadataFilter not testing filters after first --- lib/Doctrine/ORM/Tools/Console/MetadataFilter.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php index f480c3063..88357e35c 100644 --- a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php +++ b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php @@ -84,10 +84,6 @@ class MetadataFilter extends \FilterIterator implements \Countable ); } - if ($pregResult === 0) { - return false; - } - if ($pregResult) { return true; } From 1afa8a915db68abd1295d20f517c7d076ce4729c Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:16:44 +0200 Subject: [PATCH 3/8] Add more basic tests for MetadataFilter --- .../ORM/Tools/Console/MetadataFilterTest.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 7922f9006..fac23bc01 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -29,6 +29,54 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->cmf->setEntityManager($em); } + public function testFilterWithEmptyArray() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, array()); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertContains($metadataBbb, $metadatas); + $this->assertCount(count($originalMetadatas), $metadatas); + } + + public function testFilterWithString() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityAaa'); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertNotContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityBbb'); + + $this->assertNotContains($metadataAaa, $metadatas); + $this->assertContains($metadataBbb, $metadatas); + $this->assertNotContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityCcc'); + + $this->assertNotContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + } + public function testFilterWithArray() { $originalMetadatas = array( From a9cc522e8ae9b06c09f3a00760b3d95110e74169 Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:21:42 +0200 Subject: [PATCH 4/8] Add regex tests for MetadataFilter (PR #507) --- .../ORM/Tools/Console/MetadataFilterTest.php | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index fac23bc01..aed184e4c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -77,6 +77,23 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(1, $metadatas); } + public function testFilterWithString2() + { + $originalMetadatas = array( + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityFoo'); + + $this->assertContains($metadataFoo, $metadatas); + $this->assertContains($metadataFooBar, $metadatas); + $this->assertNotContains($metadataBar, $metadatas); + $this->assertCount(2, $metadatas); + } + public function testFilterWithArray() { $originalMetadatas = array( @@ -96,6 +113,31 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertContains($metadataCcc, $metadatas); $this->assertCount(2, $metadatas); } + + public function testFilterWithRegex() + { + $originalMetadatas = array( + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'Foo$'); + + $this->assertContains($metadataFoo, $metadatas); + $this->assertNotContains($metadataFooBar, $metadatas); + $this->assertNotContains($metadataBar, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'Bar$'); + + $this->assertNotContains($metadataFoo, $metadatas); + $this->assertContains($metadataFooBar, $metadatas); + $this->assertContains($metadataBar, $metadatas); + $this->assertCount(2, $metadatas); + } } /** @Entity */ @@ -124,3 +166,30 @@ class MetadataFilterTestEntityCcc /** @Id @Column(type="integer") */ protected $id; } + +/** @Entity */ +class MetadataFilterTestEntityFoo +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBar +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityFooBar +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} From f0e403211b62fb53a1671d8a6a42eadc469454dc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:17:18 +0200 Subject: [PATCH 5/8] #5715 adding return hints \(void\) to test methods --- .../Tests/ORM/Tools/Console/MetadataFilterTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index aed184e4c..1972b3fd1 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -17,7 +17,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase */ private $cmf; - protected function setUp() + protected function setUp() : void { parent::setUp(); @@ -29,7 +29,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->cmf->setEntityManager($em); } - public function testFilterWithEmptyArray() + public function testFilterWithEmptyArray() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -44,7 +44,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(count($originalMetadatas), $metadatas); } - public function testFilterWithString() + public function testFilterWithString() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -77,7 +77,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(1, $metadatas); } - public function testFilterWithString2() + public function testFilterWithString2() : void { $originalMetadatas = array( $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), @@ -94,7 +94,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(2, $metadatas); } - public function testFilterWithArray() + public function testFilterWithArray() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -114,7 +114,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(2, $metadatas); } - public function testFilterWithRegex() + public function testFilterWithRegex() : void { $originalMetadatas = array( $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), From 2ce40a6aebb5e274ebca50bb619619cf1c9a7a86 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:18:24 +0200 Subject: [PATCH 6/8] #5715 s/CLASSNAME/class --- .../ORM/Tools/Console/MetadataFilterTest.php | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 1972b3fd1..2cc4e5f32 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -32,8 +32,8 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithEmptyArray() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), ); $metadatas = $originalMetadatas; @@ -47,9 +47,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), - $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), ); $metadatas = $originalMetadatas; @@ -80,9 +80,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString2() : void { $originalMetadatas = array( - $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), - $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), - $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), ); $metadatas = $originalMetadatas; @@ -97,9 +97,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithArray() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), - $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), ); $metadatas = $originalMetadatas; @@ -117,9 +117,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithRegex() : void { $originalMetadatas = array( - $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), - $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), - $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), ); $metadatas = $originalMetadatas; @@ -143,8 +143,6 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase /** @Entity */ class MetadataFilterTestEntityAaa { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -152,8 +150,6 @@ class MetadataFilterTestEntityAaa /** @Entity */ class MetadataFilterTestEntityBbb { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -161,8 +157,6 @@ class MetadataFilterTestEntityBbb /** @Entity */ class MetadataFilterTestEntityCcc { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -170,8 +164,6 @@ class MetadataFilterTestEntityCcc /** @Entity */ class MetadataFilterTestEntityFoo { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -179,8 +171,6 @@ class MetadataFilterTestEntityFoo /** @Entity */ class MetadataFilterTestEntityBar { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -188,8 +178,6 @@ class MetadataFilterTestEntityBar /** @Entity */ class MetadataFilterTestEntityFooBar { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } From 29fe76cced3adf0f8790e976f17846a80053ab09 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:20:30 +0200 Subject: [PATCH 7/8] #5715 short array notation --- .../ORM/Tools/Console/MetadataFilterTest.php | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 2cc4e5f32..4873e6ae9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -23,6 +23,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $driver = $this->createAnnotationDriver(); $em = $this->_getTestEntityManager(); + $em->getConfiguration()->setMetadataDriverImpl($driver); $this->cmf = new DisconnectedClassMetadataFactory(); @@ -31,13 +32,13 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithEmptyArray() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), - ); + ]; $metadatas = $originalMetadatas; - $metadatas = MetadataFilter::filter($metadatas, array()); + $metadatas = MetadataFilter::filter($metadatas, []); $this->assertContains($metadataAaa, $metadatas); $this->assertContains($metadataBbb, $metadatas); @@ -46,11 +47,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityAaa'); @@ -79,11 +80,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString2() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityFoo'); @@ -96,17 +97,17 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithArray() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), - ); + ]; $metadatas = $originalMetadatas; - $metadatas = MetadataFilter::filter($metadatas, array( + $metadatas = MetadataFilter::filter($metadatas, [ 'MetadataFilterTestEntityAaa', 'MetadataFilterTestEntityCcc', - )); + ]); $this->assertContains($metadataAaa, $metadatas); $this->assertNotContains($metadataBbb, $metadatas); @@ -116,11 +117,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithRegex() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'Foo$'); From 01d226aff0b9688141e5c5a5bb79f916e0667f91 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:21:22 +0200 Subject: [PATCH 8/8] #5715 removed superfluous mapping information --- .../Tests/ORM/Tools/Console/MetadataFilterTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 4873e6ae9..24f3b54a3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -144,41 +144,41 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase /** @Entity */ class MetadataFilterTestEntityAaa { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityBbb { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityCcc { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityFoo { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityBar { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityFooBar { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; }