aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-07-03 17:15:45 +0200
committerGitHub <noreply@github.com>2017-07-03 17:15:45 +0200
commit896f981ff522fe7d594e386a7112b23e593d6240 (patch)
treee8d47b72bd7f863bccab16f8884d1018915c11bd
parent71e1cbc8eb5928d393b0772055d6b711e90a09b3 (diff)
parente50d7d31c0746ffbfe69065258981e1b4dcd203b (diff)
downloadwallabag-896f981ff522fe7d594e386a7112b23e593d6240.tar.gz
wallabag-896f981ff522fe7d594e386a7112b23e593d6240.tar.zst
wallabag-896f981ff522fe7d594e386a7112b23e593d6240.zip
Merge pull request #3257 from wallabag/fix-mapping-entities
Fixed mapping entities
-rw-r--r--src/Wallabag/CoreBundle/Entity/SiteCredential.php2
-rw-r--r--src/Wallabag/UserBundle/Entity/User.php7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Entity/SiteCredential.php b/src/Wallabag/CoreBundle/Entity/SiteCredential.php
index 380f820d..4d6557c5 100644
--- a/src/Wallabag/CoreBundle/Entity/SiteCredential.php
+++ b/src/Wallabag/CoreBundle/Entity/SiteCredential.php
@@ -57,7 +57,7 @@ class SiteCredential
57 private $createdAt; 57 private $createdAt;
58 58
59 /** 59 /**
60 * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="site_credentials") 60 * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="siteCredentials")
61 */ 61 */
62 private $user; 62 private $user;
63 63
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 20aca298..53c327f9 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -95,6 +95,13 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
95 /** 95 /**
96 * @var ArrayCollection 96 * @var ArrayCollection
97 * 97 *
98 * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\SiteCredential", mappedBy="user", cascade={"remove"})
99 */
100 protected $siteCredentials;
101
102 /**
103 * @var ArrayCollection
104 *
98 * @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"}) 105 * @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
99 */ 106 */
100 protected $clients; 107 protected $clients;