doctrine / orm

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

Indentation +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@
         $data = $this->uow->getOriginalEntityData($entity);
         $data = array_merge($data, $persister->getIdentifier($entity)); // why update has no identifier values ?
 
-	    if ($metadata->isVersioned()) {
-		    $data[$metadata->versionProperty->getName()] = $metadata->versionProperty->getValue($entity);
-	    }
+        if ($metadata->isVersioned()) {
+            $data[$metadata->versionProperty->getName()] = $metadata->versionProperty->getValue($entity);
+        }
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $name => $association) {
             if (! isset($data[$name]) || $association instanceof FieldMetadata) {

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC7067Test.php

Indentation +47 added lines, -47 removed lines

@@ -10,40 +10,40 @@ 
 class DDC7067Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
 
-	public function setUp()
-	{
-		$this->enableSecondLevelCache();
-		parent::setUp();
+    public function setUp()
+    {
+        $this->enableSecondLevelCache();
+        parent::setUp();
 
-		try {
-			$this->setUpEntitySchema([
-				DDC7067Entity::class,
-			]);
-		} catch (SchemaException $e) {
-		}
-	}
+        try {
+            $this->setUpEntitySchema([
+                DDC7067Entity::class,
+            ]);
+        } catch (SchemaException $e) {
+        }
+    }
 
 
-	/**
-	 * @group DDC-7067
-	 */
-	public function testSLCWithVersion()
-	{
-		$entity = new DDC7067Entity();
-		$entity->update = new \DateTime();
-		$this->em->persist($entity);
-		$this->em->flush();
-		$this->em->clear();
+    /**
+     * @group DDC-7067
+     */
+    public function testSLCWithVersion()
+    {
+        $entity = new DDC7067Entity();
+        $entity->update = new \DateTime();
+        $this->em->persist($entity);
+        $this->em->flush();
+        $this->em->clear();
 
-		/** @var EntityRepository $er */
-		$er = $this->em->getRepository(DDC7067Entity::class);
-		/** @var DDC7067Entity $notCached */
-		$notCached = $er->find($entity->id);
-		self::assertNotNull($notCached->version, "version for already cached entity by persister above must be not null. This will fail");
-		$notCached->update = new \DateTime();
-		$this->em->flush();
-		$this->em->clear();
-	}
+        /** @var EntityRepository $er */
+        $er = $this->em->getRepository(DDC7067Entity::class);
+        /** @var DDC7067Entity $notCached */
+        $notCached = $er->find($entity->id);
+        self::assertNotNull($notCached->version, "version for already cached entity by persister above must be not null. This will fail");
+        $notCached->update = new \DateTime();
+        $this->em->flush();
+        $this->em->clear();
+    }
 
 }
 
@@ -53,22 +53,22 @@ 
  */
 class DDC7067Entity
 {
-	/**
-	 * @ORM\Id
-	 * @ORM\GeneratedValue
-	 * @ORM\Column(type="integer")
-	 */
-	public $id;
-	/**
-	 * @var \DateTime
-	 * @ORM\Column(type="datetime")
-	 */
-	public $update;
-	/**
-	 * @var \DateTime
-	 * @ORM\Column(type="datetime")
-	 * @ORM\Version()
-	 */
-	public $version;
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    public $id;
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="datetime")
+     */
+    public $update;
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="datetime")
+     * @ORM\Version()
+     */
+    public $version;
 
 }
\ No newline at end of file