From e4b46f77ef2984b33f4dff0efea0585c7ab0cfbf Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 26 Jun 2016 13:36:53 +0200
Subject: work

---
 src/Wallabag/UserBundle/Entity/User.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle')

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index d98ae76a..eb7774cd 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -25,7 +25,7 @@ use Wallabag\CoreBundle\Entity\Entry;
  * @UniqueEntity("email")
  * @UniqueEntity("username")
  */
-class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface
+class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface, \Serializable
 {
     /**
      * @var int
@@ -240,4 +240,14 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
 
         return false;
     }
+
+    public function serialize()
+    {
+       return serialize($this->id);
+   }
+
+   public function unserialize($serialized)
+   {
+       $this->id = unserialize($serialized);
+   }
 }
-- 
cgit v1.2.3


From abb5291cd5dc98211273e5d3b516a6a0ed8b980f Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 1 Jul 2016 10:58:15 +0200
Subject: CS

---
 src/Wallabag/UserBundle/Entity/User.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Wallabag/UserBundle')

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index eb7774cd..ae12e5d5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -243,11 +243,11 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
 
     public function serialize()
     {
-       return serialize($this->id);
-   }
+        return serialize($this->id);
+    }
 
-   public function unserialize($serialized)
-   {
-       $this->id = unserialize($serialized);
-   }
+    public function unserialize($serialized)
+    {
+        $this->id = unserialize($serialized);
+    }
 }
-- 
cgit v1.2.3


From bb0c78f4a636fcc8f60dd3b42ad733e7f31e0bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 8 Sep 2016 14:07:36 +0200
Subject: Added check if there is only one user Added translations and
 documentation

---
 src/Wallabag/UserBundle/Repository/UserRepository.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/Wallabag/UserBundle')

diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php
index 009c4881..178761e6 100644
--- a/src/Wallabag/UserBundle/Repository/UserRepository.php
+++ b/src/Wallabag/UserBundle/Repository/UserRepository.php
@@ -38,4 +38,18 @@ class UserRepository extends EntityRepository
             ->getQuery()
             ->getSingleResult();
     }
+
+    /**
+     * Count how many users are enabled.
+     *
+     * @return int
+     */
+    public function getSumEnabledUsers()
+    {
+        return $this->createQueryBuilder('u')
+            ->select('count(u)')
+            ->andWhere('u.expired = 0')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
 }
-- 
cgit v1.2.3


From 3f604467564e86623513107161587f7e34d4f369 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 8 Oct 2016 20:26:06 +0200
Subject: Fix PostgreSQL query
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PostgreSQL doesn’t like when we compare interger and boolean :)
---
 src/Wallabag/UserBundle/Repository/UserRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle')

diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php
index 178761e6..445edb3c 100644
--- a/src/Wallabag/UserBundle/Repository/UserRepository.php
+++ b/src/Wallabag/UserBundle/Repository/UserRepository.php
@@ -48,7 +48,7 @@ class UserRepository extends EntityRepository
     {
         return $this->createQueryBuilder('u')
             ->select('count(u)')
-            ->andWhere('u.expired = 0')
+            ->andWhere('u.expired = false')
             ->getQuery()
             ->getSingleScalarResult();
     }
-- 
cgit v1.2.3


From 9810f30821105f6340b64e8bdca9f91b9da8a6ba Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 8 Oct 2016 21:16:40 +0200
Subject: Remove unnecessary user serialization

---
 src/Wallabag/UserBundle/Entity/User.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/Wallabag/UserBundle')

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index ae12e5d5..d98ae76a 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -25,7 +25,7 @@ use Wallabag\CoreBundle\Entity\Entry;
  * @UniqueEntity("email")
  * @UniqueEntity("username")
  */
-class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface, \Serializable
+class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface
 {
     /**
      * @var int
@@ -240,14 +240,4 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
 
         return false;
     }
-
-    public function serialize()
-    {
-        return serialize($this->id);
-    }
-
-    public function unserialize($serialized)
-    {
-        $this->id = unserialize($serialized);
-    }
 }
-- 
cgit v1.2.3