Merge remote-tracking branch 'origin/master' into 2.4

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Entity / SiteCredential.php

diff --git a/src/Wallabag/CoreBundle/Entity/SiteCredential.php b/src/Wallabag/CoreBundle/Entity/SiteCredential.php
index 380f820d5a75e56493c1cb1a4d09d9ceb4016b9f..dee48fd52982efd20f709f1cbce92edfe12f4de8 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/SiteCredential.php
+++ b/src/Wallabag/CoreBundle/Entity/SiteCredential.php
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
+use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
 use Wallabag\UserBundle\Entity\User;
 
 /**
@@ -15,6 +16,8 @@ use Wallabag\UserBundle\Entity\User;
  */
 class SiteCredential
 {
+    use EntityTimestampsTrait;
+
     /**
      * @var int
      *
@@ -57,7 +60,14 @@ class SiteCredential
     private $createdAt;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="site_credentials")
+     * @var \DateTime
+     *
+     * @ORM\Column(name="updated_at", type="datetime")
+     */
+    private $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="siteCredentials")
      */
     private $user;
 
@@ -176,20 +186,20 @@ class SiteCredential
     }
 
     /**
-     * @return User
+     * Get updatedAt.
+     *
+     * @return \DateTime
      */
-    public function getUser()
+    public function getUpdatedAt()
     {
-        return $this->user;
+        return $this->updatedAt;
     }
 
     /**
-     * @ORM\PrePersist
+     * @return User
      */
-    public function timestamps()
+    public function getUser()
     {
-        if (null === $this->createdAt) {
-            $this->createdAt = new \DateTime();
-        }
+        return $this->user;
     }
 }