@@ -88,18 +88,18 @@ discard block |
||
| 88 | 88 | { |
| 89 | 89 | $q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a"); |
| 90 | 90 | $q2 = $q->expireQueryCache(true) |
| 91 | - ->setQueryCacheLifetime(3600) |
|
| 92 | - ->setQueryCacheDriver(null) |
|
| 93 | - ->expireResultCache(true) |
|
| 94 | - ->setHint('foo', 'bar') |
|
| 95 | - ->setHint('bar', 'baz') |
|
| 96 | - ->setParameter(1, 'bar') |
|
| 97 | - ->setParameters(new ArrayCollection([new Parameter(2, 'baz')])) |
|
| 98 | - ->setResultCacheDriver(null) |
|
| 99 | - ->setResultCacheId('foo') |
|
| 100 | - ->setDQL('foo') |
|
| 101 | - ->setFirstResult(10) |
|
| 102 | - ->setMaxResults(10); |
|
| 91 | + ->setQueryCacheLifetime(3600) |
|
| 92 | + ->setQueryCacheDriver(null) |
|
| 93 | + ->expireResultCache(true) |
|
| 94 | + ->setHint('foo', 'bar') |
|
| 95 | + ->setHint('bar', 'baz') |
|
| 96 | + ->setParameter(1, 'bar') |
|
| 97 | + ->setParameters(new ArrayCollection([new Parameter(2, 'baz')])) |
|
| 98 | + ->setResultCacheDriver(null) |
|
| 99 | + ->setResultCacheId('foo') |
|
| 100 | + ->setDQL('foo') |
|
| 101 | + ->setFirstResult(10) |
|
| 102 | + ->setMaxResults(10); |
|
| 103 | 103 | |
| 104 | 104 | $this->assertSame($q2, $q); |
| 105 | 105 | } |
@@ -257,11 +257,11 @@ discard block |
||
| 257 | 257 | $this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache()); |
| 258 | 258 | |
| 259 | 259 | $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u") |
| 260 | - ->enableResultCache(); |
|
| 260 | + ->enableResultCache(); |
|
| 261 | 261 | |
| 262 | 262 | /** @var DriverConnectionMock $driverConnectionMock */ |
| 263 | 263 | $driverConnectionMock = $this->_em->getConnection() |
| 264 | - ->getWrappedConnection(); |
|
| 264 | + ->getWrappedConnection(); |
|
| 265 | 265 | |
| 266 | 266 | $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]])); |
| 267 | 267 | |
@@ -27,30 +27,30 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function testFailingCase() |
| 29 | 29 | { |
| 30 | - $parent = new DDC1383Entity(); |
|
| 31 | - $child = new DDC1383Entity(); |
|
| 30 | + $parent = new DDC1383Entity(); |
|
| 31 | + $child = new DDC1383Entity(); |
|
| 32 | 32 | |
| 33 | - $child->setReference($parent); |
|
| 33 | + $child->setReference($parent); |
|
| 34 | 34 | |
| 35 | - $this->_em->persist($parent); |
|
| 36 | - $this->_em->persist($child); |
|
| 35 | + $this->_em->persist($parent); |
|
| 36 | + $this->_em->persist($child); |
|
| 37 | 37 | |
| 38 | - $id = $child->getId(); |
|
| 38 | + $id = $child->getId(); |
|
| 39 | 39 | |
| 40 | - $this->_em->flush(); |
|
| 41 | - $this->_em->clear(); |
|
| 40 | + $this->_em->flush(); |
|
| 41 | + $this->_em->clear(); |
|
| 42 | 42 | |
| 43 | - // Try merging the parent entity |
|
| 44 | - $child = $this->_em->merge($child); |
|
| 45 | - $parent = $child->getReference(); |
|
| 43 | + // Try merging the parent entity |
|
| 44 | + $child = $this->_em->merge($child); |
|
| 45 | + $parent = $child->getReference(); |
|
| 46 | 46 | |
| 47 | - // Parent is not instance of the abstract class |
|
| 48 | - self::assertTrue($parent instanceof DDC1383AbstractEntity, |
|
| 49 | - "Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected'); |
|
| 47 | + // Parent is not instance of the abstract class |
|
| 48 | + self::assertTrue($parent instanceof DDC1383AbstractEntity, |
|
| 49 | + "Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected'); |
|
| 50 | 50 | |
| 51 | - // Parent is NOT instance of entity |
|
| 52 | - self::assertTrue($parent instanceof DDC1383Entity, |
|
| 53 | - "Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected'); |
|
| 51 | + // Parent is NOT instance of entity |
|
| 52 | + self::assertTrue($parent instanceof DDC1383Entity, |
|
| 53 | + "Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected'); |
|
| 54 | 54 | $this->assertHasDeprecationMessages(); |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -63,22 +63,22 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | abstract class DDC1383AbstractEntity |
| 65 | 65 | { |
| 66 | - /** |
|
| 67 | - * @Id |
|
| 68 | - * @Column(type="integer") |
|
| 69 | - * @GeneratedValue |
|
| 70 | - */ |
|
| 71 | - protected $id; |
|
| 72 | - |
|
| 73 | - public function getId() |
|
| 74 | - { |
|
| 75 | - return $this->id; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - public function setId($id) |
|
| 79 | - { |
|
| 80 | - $this->id = $id; |
|
| 81 | - } |
|
| 66 | + /** |
|
| 67 | + * @Id |
|
| 68 | + * @Column(type="integer") |
|
| 69 | + * @GeneratedValue |
|
| 70 | + */ |
|
| 71 | + protected $id; |
|
| 72 | + |
|
| 73 | + public function getId() |
|
| 74 | + { |
|
| 75 | + return $this->id; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + public function setId($id) |
|
| 79 | + { |
|
| 80 | + $this->id = $id; |
|
| 81 | + } |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -86,18 +86,18 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | class DDC1383Entity extends DDC1383AbstractEntity |
| 88 | 88 | { |
| 89 | - /** |
|
| 90 | - * @ManyToOne(targetEntity="DDC1383AbstractEntity") |
|
| 91 | - */ |
|
| 92 | - protected $reference; |
|
| 93 | - |
|
| 94 | - public function getReference() |
|
| 95 | - { |
|
| 96 | - return $this->reference; |
|
| 97 | - } |
|
| 98 | - |
|
| 99 | - public function setReference(DDC1383AbstractEntity $reference) |
|
| 100 | - { |
|
| 101 | - $this->reference = $reference; |
|
| 102 | - } |
|
| 89 | + /** |
|
| 90 | + * @ManyToOne(targetEntity="DDC1383AbstractEntity") |
|
| 91 | + */ |
|
| 92 | + protected $reference; |
|
| 93 | + |
|
| 94 | + public function getReference() |
|
| 95 | + { |
|
| 96 | + return $this->reference; |
|
| 97 | + } |
|
| 98 | + |
|
| 99 | + public function setReference(DDC1383AbstractEntity $reference) |
|
| 100 | + { |
|
| 101 | + $this->reference = $reference; |
|
| 102 | + } |
|
| 103 | 103 | } |