Browse Source

Minor - format code, remove precision, scale for ints

Julio Montoya 6 years ago
parent
commit
1df7ec8402

+ 6 - 6
src/Chamilo/CoreBundle/Entity/CourseRelUser.php

@@ -24,7 +24,7 @@ class CourseRelUser
     /**
      * @var int
      *
-     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="id", type="integer", nullable=false, unique=false)
      * @ORM\Id
      * @ORM\GeneratedValue
      */
@@ -48,14 +48,14 @@ class CourseRelUser
      * @todo use status instead of this
      *
      * @deprecated
-     * @ORM\Column(name="relation_type", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="relation_type", type="integer", nullable=false, unique=false)
      */
     protected $relationType;
 
     /**
      * @var bool
      *
-     * @ORM\Column(name="status", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="status", type="integer", nullable=false, unique=false)
      */
     protected $status;
 
@@ -69,21 +69,21 @@ class CourseRelUser
     /**
      * @var int
      *
-     * @ORM\Column(name="sort", type="integer", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="sort", type="integer", nullable=true, unique=false)
      */
     protected $sort;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="user_course_cat", type="integer", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="user_course_cat", type="integer", nullable=true, unique=false)
      */
     protected $userCourseCat;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="legal_agreement", type="integer", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="legal_agreement", type="integer", nullable=true, unique=false)
      */
     protected $legalAgreement;
 

+ 2 - 2
src/Chamilo/CoreBundle/Entity/SessionRelCourse.php

@@ -36,7 +36,7 @@ class SessionRelCourse
     protected $session;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Course", inversedBy="sessions", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Course", inversedBy="sessions", cascade={"persist"})
      * @ORM\JoinColumn(name="c_id", referencedColumnName="id", nullable=false)
      */
     protected $course;
@@ -46,7 +46,7 @@ class SessionRelCourse
      *
      * @ORM\Column(name="position", type="integer", nullable=false)
      */
-    private $position;
+    protected $position;
 
     /**
      * Constructor.

+ 4 - 4
src/Chamilo/CoreBundle/Entity/SessionRelCourseRelUser.php

@@ -31,7 +31,7 @@ class SessionRelCourseRelUser
     /**
      * @var int
      *
-     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="id", type="integer", nullable=false, unique=false)
      * @ORM\Id
      * @ORM\GeneratedValue
      */
@@ -61,21 +61,21 @@ class SessionRelCourseRelUser
     /**
      * @var int
      *
-     * @ORM\Column(name="visibility", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="visibility", type="integer", nullable=false, unique=false)
      */
     protected $visibility;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="status", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="status", type="integer", nullable=false, unique=false)
      */
     protected $status;
 
     /**
      * @var int
      *
-     * @ORM\Column(name="legal_agreement", type="integer", precision=0, scale=0, nullable=true, unique=false)
+     * @ORM\Column(name="legal_agreement", type="integer", nullable=true, unique=false)
      */
     protected $legalAgreement;
 

+ 35 - 5
src/Chamilo/UserBundle/Repository/UserRepository.php

@@ -455,12 +455,12 @@ class UserRepository extends EntityRepository
 
         // Dummy content
         $user->setDateOfBirth(null);
-        $user->setBiography($noDataLabel);
+        //$user->setBiography($noDataLabel);
         $user->setFacebookData($noDataLabel);
         $user->setFacebookName($noDataLabel);
         $user->setFacebookUid($noDataLabel);
-        $user->setImageName($noDataLabel);
-        $user->setTwoStepVerificationCode($noDataLabel);
+        //$user->setImageName($noDataLabel);
+        //$user->setTwoStepVerificationCode($noDataLabel);
         $user->setGender($noDataLabel);
         $user->setGplusData($noDataLabel);
         $user->setGplusName($noDataLabel);
@@ -472,6 +472,9 @@ class UserRepository extends EntityRepository
         $user->setTwitterUid($noDataLabel);
         $user->setWebsite($noDataLabel);
         $user->setToken($noDataLabel);
+
+        //$courses = $user->getCourses();
+
         $user->setCourses([]);
         $user->setClasses([]);
         $user->setDropBoxSentFiles([]);
@@ -486,7 +489,9 @@ class UserRepository extends EntityRepository
         $lastLogin = $user->getLastLogin();
         if (empty($lastLogin)) {
             $login = $this->getLastLogin($user);
-            $lastLogin = $login->getLoginDate();
+            if ($login) {
+                $lastLogin = $login->getLoginDate();
+            }
         }
         $user->setLastLogin($lastLogin);
 
@@ -496,6 +501,29 @@ class UserRepository extends EntityRepository
             return get_class($object);
         });
 
+        $ignore = [
+            'twoStepVerificationCode',
+            'biography',
+            'dateOfBirth',
+            'gender',
+            'facebookData',
+            'facebookName',
+            'facebookUid',
+            'gplusData',
+            'gplusName',
+            'gplusUid',
+            'locale',
+            'timezone',
+            'twitterData',
+            'twitterName',
+            'twitterUid',
+            'gplusUid',
+            'token',
+            'website',
+        ];
+
+        $dateNormalizer->setIgnoredAttributes($ignore);
+
         $callback = function ($dateTime) {
             return $dateTime instanceof \DateTime
                 ? $dateTime->format(\DateTime::ISO8601)
@@ -516,10 +544,12 @@ class UserRepository extends EntityRepository
      * This might be different from user.last_login in the case of legacy users
      * as user.last_login was only implemented in 1.10 version with a default
      * value of NULL (not the last record from track_e_login).
+     *
      * @param User $user
      *
-     * @return null|TrackELogin
      * @throws \Exception
+     *
+     * @return null|TrackELogin
      */
     public function getLastLogin(User $user)
     {