X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FUserBundle%2FEntity%2FUser.php;h=20aca29837776bae9fc6ababf1b6000f069fd5d0;hb=f808b01692a835673f328d7221ba8c212caa9b61;hp=aba76ca74a262e3ddcc83b90d26519a0af151d2d;hpb=822c877949aff8ae57677671115f8f4fc69588d5;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index aba76ca7..20aca298 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -4,12 +4,12 @@ namespace Wallabag\UserBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use FOS\UserBundle\Model\User as BaseUser;
+use JMS\Serializer\Annotation\Accessor;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\XmlRoot;
-use JMS\Serializer\Annotation\Accessor;
 use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
 use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
-use FOS\UserBundle\Model\User as BaseUser;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Wallabag\ApiBundle\Entity\Client;
@@ -93,36 +93,36 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
     protected $config;
 
     /**
-     * @ORM\Column(type="integer", nullable=true)
+     * @var ArrayCollection
+     *
+     * @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
      */
-    private $authCode;
+    protected $clients;
 
     /**
-     * @var bool
+     * @see getFirstClient() below
      *
-     * @ORM\Column(type="boolean")
+     * @Groups({"user_api_with_client"})
+     * @Accessor(getter="getFirstClient")
      */
-    private $twoFactorAuthentication = false;
+    protected $default_client;
 
     /**
-     * @ORM\Column(type="json_array", nullable=true)
+     * @ORM\Column(type="integer", nullable=true)
      */
-    private $trusted;
+    private $authCode;
 
     /**
-     * @var ArrayCollection
+     * @var bool
      *
-     * @ORM\OneToMany(targetEntity="Wallabag\ApiBundle\Entity\Client", mappedBy="user", cascade={"remove"})
+     * @ORM\Column(type="boolean")
      */
-    protected $clients;
+    private $twoFactorAuthentication = false;
 
     /**
-     * @see getFirstClient() below
-     *
-     * @Groups({"user_api_with_client"})
-     * @Accessor(getter="getFirstClient")
+     * @ORM\Column(type="json_array", nullable=true)
      */
-    protected $default_client;
+    private $trusted;
 
     public function __construct()
     {
@@ -137,7 +137,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
      */
     public function timestamps()
     {
-        if (is_null($this->createdAt)) {
+        if (null === $this->createdAt) {
             $this->createdAt = new \DateTime();
         }