From: Jérémy Benoist Date: Wed, 5 Jul 2017 13:00:24 +0000 (+0200) Subject: Merge pull request #3256 from wallabag/fix-patch X-Git-Tag: 2.3.0~31^2~43 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b5d7eb148c4cd62ff187b08765f0c13c7d330fcf;hp=c18a2476b601bc6b9893462d9be680c2e13c89e8;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3256 from wallabag/fix-patch Fix PATCH method --- 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 private $createdAt; /** - * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="site_credentials") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="siteCredentials") */ private $user; 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 @@ -92,6 +92,13 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf */ protected $config; + /** + * @var ArrayCollection + * + * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\SiteCredential", mappedBy="user", cascade={"remove"}) + */ + protected $siteCredentials; + /** * @var ArrayCollection *