Minor - use protected instead of private

7 years ago · dfa0f3d722
parent bfe18800f7
commit dfa0f3d722
13 changed files with 111 additions and 104 deletions
--- a/src/Chamilo/CoreBundle/Entity/AccessUrl.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrl.php
@ -13,10 +13,6 @@ use Doctrine\ORM\Mapping as ORM;
 */
 class AccessUrl
 {
-    /**
-     * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
-     */
-    protected $course;
    /**
     * @var int
     *
@ -24,49 +20,54 @@ class AccessUrl
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="AUTO")
     */
-    private $id;
+    protected $id;
+
+    /**
+     * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
+     */
+    protected $course;

    /**
     * @var string
     *
     * @ORM\Column(name="url", type="string", length=255, nullable=false, unique=false)
     */
-    private $url;
+    protected $url;

    /**
     * @var string
     *
     * @ORM\Column(name="description", type="text", unique=false)
     */
-    private $description;
+    protected $description;

    /**
     * @var int
     *
     * @ORM\Column(name="active", type="integer", nullable=false, unique=false)
     */
-    private $active;
+    protected $active;

    /**
     * @var int
     *
     * @ORM\Column(name="created_by", type="integer", nullable=false, unique=false)
     */
-    private $createdBy;
+    protected $createdBy;

    /**
     * @var \DateTime
     *
     * @ORM\Column(name="tms", type="datetime", nullable=true)
     */
-    private $tms;
+    protected $tms;

    /**
     * @var bool
     *
     * @ORM\Column(name="url_type", type="boolean", nullable=true)
     */
-    private $urlType;
+    protected $urlType;

    /**
     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SettingsCurrent", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
@ -76,8 +77,11 @@ class AccessUrl
    /**
     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SessionCategory", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
     */
-    private $sessionCategory;
+    protected $sessionCategory;

+    /**
+     * AccessUrl constructor.
+     */
    public function __construct()
    {
        $this->tms = new \DateTime();
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
@ -13,6 +13,16 @@ use Doctrine\ORM\Mapping as ORM;
 */
 class AccessUrlRelCourse
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+
    /**
     * @ORM\ManyToOne(targetEntity="Course", inversedBy="urls", cascade={"persist"})
     * @ORM\JoinColumn(name="c_id", referencedColumnName="id")
@ -24,14 +34,6 @@ class AccessUrlRelCourse
     * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
     */
    protected $url;
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;

    /**
     * @return string
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php
@ -20,28 +20,28 @@ class AccessUrlRelCourseCategory
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="AUTO")
     */
-    private $id;
+    protected $id;

    /**
     * @var int
     *
     * @ORM\Column(name="access_url_id", type="integer")
     */
-    private $accessUrlId;
+    protected $accessUrlId;

    /**
     * @var int
     *
     * @ORM\Column(name="course_category_id", type="integer")
     */
-    private $courseCategoryId;
+    protected $courseCategoryId;

    /**
     * Set accessUrlId.
     *
     * @param int $accessUrlId
     *
-     * @return AccessUrlRelSession
+     * @return $this
     */
    public function setAccessUrlId($accessUrlId)
    {
@ -71,7 +71,7 @@ class AccessUrlRelCourseCategory
    /**
     * @param int $courseCategoryId
     *
-     * @return AccessUrlRelCourseCategory
+     * @return $this
     */
    public function setCourseCategoryId($courseCategoryId)
    {
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php
@ -20,7 +20,7 @@ class AccessUrlRelSession
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $accessUrlId;
+    protected $accessUrlId;

    /**
     * @var int
@ -29,7 +29,7 @@ class AccessUrlRelSession
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $sessionId;
+    protected $sessionId;

    /**
     * Set accessUrlId.
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php
@ -20,24 +20,13 @@ use Doctrine\ORM\Mapping as ORM;
 */
 class AccessUrlRelUser
 {
-    /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
-     */
-    protected $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\AccessUrl")
-     * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
-     */
-    protected $portal;
    /**
     * @var int
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     * @ORM\Column(name="access_url_id", type="integer")
     */
-    private $accessUrlId;
+    protected $accessUrlId;

    /**
     * @var int
@ -45,7 +34,19 @@ class AccessUrlRelUser
     * @ORM\GeneratedValue(strategy="NONE")
     * @ORM\Column(name="user_id", type="integer")
     */
-    private $userId;
+    protected $userId;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
+     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
+     */
+    protected $user;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\AccessUrl")
+     * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
+     */
+    protected $portal;

    /**
     * Set accessUrlId.
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
@ -20,21 +20,21 @@ class AccessUrlRelUserGroup
     * @ORM\Id
     * @ORM\GeneratedValue()
     */
-    private $id;
+    protected $id;

    /**
     * @var int
     *
     * @ORM\Column(name="access_url_id", type="integer")
     */
-    private $accessUrlId;
+    protected $accessUrlId;

    /**
     * @var int
     *
     * @ORM\Column(name="usergroup_id", type="integer")
     */
-    private $userGroupId;
+    protected $userGroupId;

    /**
     * Set accessUrlId.
--- a/src/Chamilo/CoreBundle/Entity/Admin.php
+++ b/src/Chamilo/CoreBundle/Entity/Admin.php
@ -20,14 +20,14 @@ class Admin
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="IDENTITY")
     */
-    private $id;
+    protected $id;

    /**
     * @var int
     *
     * @ORM\Column(name="user_id", type="integer", nullable=false)
     */
-    private $userId;
+    protected $userId;

    /**
     * Set userId.
--- a/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php
@ -20,7 +20,7 @@ class AnnouncementRelGroup
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $groupId;
+    protected $groupId;

    /**
     * @var int
@ -29,7 +29,7 @@ class AnnouncementRelGroup
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $announcementId;
+    protected $announcementId;

    /**
     * Set groupId.
--- a/src/Chamilo/CoreBundle/Entity/Block.php
+++ b/src/Chamilo/CoreBundle/Entity/Block.php
@ -20,42 +20,42 @@ class Block
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="IDENTITY")
     */
-    private $id;
+    protected $id;

    /**
     * @var string
     *
     * @ORM\Column(name="name", type="string", length=255, nullable=true)
     */
-    private $name;
+    protected $name;

    /**
     * @var string
     *
     * @ORM\Column(name="description", type="text", nullable=true)
     */
-    private $description;
+    protected $description;

    /**
     * @var string
     *
     * @ORM\Column(name="path", type="string", length=255, nullable=false)
     */
-    private $path;
+    protected $path;

    /**
     * @var string
     *
     * @ORM\Column(name="controller", type="string", length=100, nullable=false)
     */
-    private $controller;
+    protected $controller;

    /**
     * @var bool
     *
     * @ORM\Column(name="active", type="boolean", nullable=false)
     */
-    private $active;
+    protected $active;

    /**
     * Set name.
--- a/src/Chamilo/CoreBundle/Entity/BranchSync.php
+++ b/src/Chamilo/CoreBundle/Entity/BranchSync.php
@ -22,181 +22,181 @@ class BranchSync
     * @ORM\Id
     * @ORM\GeneratedValue
     */
-    private $id;
+    protected $id;

    /**
     * @var int
     *
     * @ORM\Column(name="access_url_id", type="integer", nullable=false, unique=false)
     */
-    private $accessUrlId;
+    protected $accessUrlId;

    /**
     * @var string
     *
     * @ORM\Column(name="unique_id", type="string", length=50, nullable=false, unique=true)
     */
-    private $uniqueId;
+    protected $uniqueId;

    /**
     * @var string
     *
     * @ORM\Column(name="branch_name", type="string", length=250, nullable=false, unique=false)
     */
-    private $branchName;
+    protected $branchName;

    /**
     * @var string
     *
     * @ORM\Column(name="description", type="text", nullable=true)
     */
-    private $description;
+    protected $description;

    /**
     * @var string
     *
     * @ORM\Column(name="branch_ip", type="string", length=40, nullable=true, unique=false)
     */
-    private $branchIp;
+    protected $branchIp;

    /**
     * @var float
     *
     * @ORM\Column(name="latitude", type="decimal", nullable=true, unique=false)
     */
-    private $latitude;
+    protected $latitude;

    /**
     * @var float
     *
     * @ORM\Column(name="longitude", type="decimal", nullable=true, unique=false)
     */
-    private $longitude;
+    protected $longitude;

    /**
     * @var int
     *
     * @ORM\Column(name="dwn_speed", type="integer", nullable=true, unique=false)
     */
-    private $dwnSpeed;
+    protected $dwnSpeed;

    /**
     * @var int
     *
     * @ORM\Column(name="up_speed", type="integer", nullable=true, unique=false)
     */
-    private $upSpeed;
+    protected $upSpeed;

    /**
     * @var int
     *
     * @ORM\Column(name="delay", type="integer", nullable=true, unique=false)
     */
-    private $delay;
+    protected $delay;

    /**
     * @var string
     *
     * @ORM\Column(name="admin_mail", type="string", length=250, nullable=true, unique=false)
     */
-    private $adminMail;
+    protected $adminMail;

    /**
     * @var string
     *
     * @ORM\Column(name="admin_name", type="string", length=250, nullable=true, unique=false)
     */
-    private $adminName;
+    protected $adminName;

    /**
     * @var string
     *
     * @ORM\Column(name="admin_phone", type="string", length=250, nullable=true, unique=false)
     */
-    private $adminPhone;
+    protected $adminPhone;

    /**
     * @var int
     *
     * @ORM\Column(name="last_sync_trans_id", type="bigint", nullable=true, unique=false)
     */
-    private $lastSyncTransId;
+    protected $lastSyncTransId;

    /**
     * @var \DateTime
     *
     * @ORM\Column(name="last_sync_trans_date", type="datetime", nullable=true, unique=false)
     */
-    private $lastSyncTransDate;
+    protected $lastSyncTransDate;

    /**
     * @var string
     *
     * @ORM\Column(name="last_sync_type", type="string", length=20, nullable=true, unique=false)
     */
-    private $lastSyncType;
+    protected $lastSyncType;

    /**
     * @var string
     *
     * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false)
     */
-    private $sslPubKey;
+    protected $sslPubKey;

    /**
     * @var string
     *
     * @ORM\Column(name="branch_type", type="string", length=250, nullable=true, unique=false)
     */
-    private $branchType;
+    protected $branchType;

    /**
     * @var int
     * @Gedmo\TreeLeft
     * @ORM\Column(name="lft", type="integer", nullable=true, unique=false)
     */
-    private $lft;
+    protected $lft;

    /**
     * @var int
     * @Gedmo\TreeRight
     * @ORM\Column(name="rgt", type="integer", nullable=true, unique=false)
     */
-    private $rgt;
+    protected $rgt;

    /**
     * @var int
     * @Gedmo\TreeLevel
     * @ORM\Column(name="lvl", type="integer", nullable=true, unique=false)
     */
-    private $lvl;
+    protected $lvl;

    /**
     * @var int
     * @Gedmo\TreeRoot
     * @ORM\Column(name="root", type="integer", nullable=true, unique=false)
     */
-    private $root;
+    protected $root;

    /**
     * @var int
     *
     * @ORM\Column(name="parent_id", type="integer", nullable=true, unique=false)
     */
-    private $parentId;
+    protected $parentId;

    /**
     * @Gedmo\TreeParent
     * @ORM\ManyToOne(targetEntity="BranchSync", inversedBy="children")
     * @ORM\JoinColumn(name="parent_id", referencedColumnName="id", onDelete="SET NULL")
     */
-    private $parent;
+    protected $parent;

    /**
     * @ORM\OneToMany(targetEntity="BranchSync", mappedBy="parent")
     * @ORM\OrderBy({"lft" = "ASC"})
     */
-    private $children;
+    protected $children;

    /**
     * Constructor.
--- a/src/Chamilo/CoreBundle/Entity/ClassUser.php
+++ b/src/Chamilo/CoreBundle/Entity/ClassUser.php
@ -20,7 +20,7 @@ class ClassUser
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $classId;
+    protected $classId;

    /**
     * @var int
@ -29,7 +29,7 @@ class ClassUser
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="NONE")
     */
-    private $userId;
+    protected $userId;

    /**
     * Set classId.
--- a/src/Chamilo/CoreBundle/Entity/CourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseCategory.php
@ -29,56 +29,56 @@ class CourseCategory
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="IDENTITY")
     */
-    private $id;
+    protected $id;

    /**
     * @var string
     *
     * @ORM\Column(name="name", type="string", length=100, nullable=false)
     */
-    private $name;
+    protected $name;

    /**
     * @var string
     *
     * @ORM\Column(name="code", type="string", length=40, nullable=false)
     */
-    private $code;
+    protected $code;

    /**
     * @var string
     *
     * @ORM\Column(name="parent_id", type="string", length=40, nullable=true)
     */
-    private $parentId;
+    protected $parentId;

    /**
     * @var int
     *
     * @ORM\Column(name="tree_pos", type="integer", nullable=true)
     */
-    private $treePos;
+    protected $treePos;

    /**
     * @var int
     *
     * @ORM\Column(name="children_count", type="smallint", nullable=true)
     */
-    private $childrenCount;
+    protected $childrenCount;

    /**
     * @var string
     *
     * @ORM\Column(name="auth_course_child", type="string", length=40, nullable=true)
     */
-    private $authCourseChild;
+    protected $authCourseChild;

    /**
     * @var string
     *
     * @ORM\Column(name="auth_cat_child", type="string", length=40, nullable=true)
     */
-    private $authCatChild;
+    protected $authCatChild;

    /**
     * @return string
--- a/src/Chamilo/CoreBundle/Entity/CourseModule.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseModule.php
@ -13,56 +13,56 @@ use Doctrine\ORM\Mapping as ORM;
 */
 class CourseModule
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    protected $id;
+
    /**
     * @var string
     *
     * @ORM\Column(name="name", type="string", length=255, nullable=false)
     */
-    private $name;
+    protected $name;

    /**
     * @var string
     *
     * @ORM\Column(name="link", type="string", length=255, nullable=false)
     */
-    private $link;
+    protected $link;

    /**
     * @var string
     *
     * @ORM\Column(name="image", type="string", length=100, nullable=true)
     */
-    private $image;
+    protected $image;

    /**
     * @var int
     *
     * @ORM\Column(name="row", type="integer", nullable=false)
     */
-    private $row;
+    protected $row;

    /**
     * @var int
     *
     * @ORM\Column(name="column", type="integer", nullable=false)
     */
-    private $column;
+    protected $column;

    /**
     * @var string
     *
     * @ORM\Column(name="position", type="string", length=20, nullable=false)
     */
-    private $position;
-
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
+    protected $position;

    /**
     * Set name.