From b9ad8935a1b39f2e49251168966a2bc4bfae4a06 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Wed, 11 Oct 2017 13:32:44 +0200 Subject: [PATCH] Minor - format code, add missing license notice --- src/Chamilo/CoreBundle/Entity/Admin.php | 14 ++++++------- .../CoreBundle/Entity/BranchTransaction.php | 4 ---- src/Chamilo/CoreBundle/Entity/Chat.php | 5 ++++- src/Chamilo/CoreBundle/Entity/ClassItem.php | 8 +++---- .../Entity/CourseRelUserCatalogue.php | 1 - src/Chamilo/CoreBundle/Entity/CourseType.php | 1 + .../CoreBundle/Entity/EventEmailTemplate.php | 1 + src/Chamilo/CoreBundle/Entity/EventSent.php | 21 +++++++++---------- .../CoreBundle/Entity/ExtraFieldRelTag.php | 2 +- .../CoreBundle/Entity/GradebookScoreLog.php | 1 - .../CoreBundle/Entity/PersonalAgenda.php | 1 - .../Entity/PersonalAgendaRepeat.php | 1 + .../Entity/PersonalAgendaRepeatNot.php | 1 + src/Chamilo/CoreBundle/Entity/Promotion.php | 1 + .../CoreBundle/Entity/SearchEngineRef.php | 1 + src/Chamilo/CoreBundle/Entity/Sequence.php | 2 -- .../CoreBundle/Entity/SequenceCondition.php | 2 -- .../CoreBundle/Entity/SequenceFormula.php | 3 --- .../CoreBundle/Entity/SequenceMethod.php | 2 -- .../CoreBundle/Entity/SequenceResource.php | 2 -- .../CoreBundle/Entity/SequenceRule.php | 1 - .../Entity/SequenceRuleCondition.php | 2 -- .../CoreBundle/Entity/SequenceTypeEntity.php | 1 - .../CoreBundle/Entity/SequenceValid.php | 2 -- .../CoreBundle/Entity/SequenceValue.php | 2 -- .../CoreBundle/Entity/SequenceVariable.php | 1 - .../CoreBundle/Entity/SessionCategory.php | 1 - .../CoreBundle/Entity/SessionRelCourse.php | 1 - .../CoreBundle/Entity/SessionRelUser.php | 1 - .../CoreBundle/Entity/SharedSurvey.php | 1 + .../Entity/SharedSurveyQuestion.php | 1 + .../Entity/SharedSurveyQuestionOption.php | 1 + .../CoreBundle/Entity/SpecificField.php | 1 + .../Entity/TrackEAttemptRecording.php | 7 ++++++- .../Entity/UserFriendRelationType.php | 2 -- src/Chamilo/CoreBundle/Entity/Usergroup.php | 3 --- .../CoreBundle/Entity/UsergroupRelUser.php | 1 - .../EventListener/LegacyLoginListener.php | 2 -- 38 files changed, 40 insertions(+), 65 deletions(-) diff --git a/src/Chamilo/CoreBundle/Entity/Admin.php b/src/Chamilo/CoreBundle/Entity/Admin.php index be984043a4..0a2f74f522 100644 --- a/src/Chamilo/CoreBundle/Entity/Admin.php +++ b/src/Chamilo/CoreBundle/Entity/Admin.php @@ -13,13 +13,6 @@ use Doctrine\ORM\Mapping as ORM; */ class Admin { - /** - * @var integer - * - * @ORM\Column(name="user_id", type="integer", nullable=false) - */ - private $userId; - /** * @var integer * @@ -29,7 +22,12 @@ class Admin */ private $id; - + /** + * @var integer + * + * @ORM\Column(name="user_id", type="integer", nullable=false) + */ + private $userId; /** * Set userId diff --git a/src/Chamilo/CoreBundle/Entity/BranchTransaction.php b/src/Chamilo/CoreBundle/Entity/BranchTransaction.php index d76cc4272f..093c2b6b46 100644 --- a/src/Chamilo/CoreBundle/Entity/BranchTransaction.php +++ b/src/Chamilo/CoreBundle/Entity/BranchTransaction.php @@ -411,8 +411,4 @@ class BranchTransaction return $this; } - - - - } diff --git a/src/Chamilo/CoreBundle/Entity/Chat.php b/src/Chamilo/CoreBundle/Entity/Chat.php index 94d5fc8f55..dbff238a5b 100644 --- a/src/Chamilo/CoreBundle/Entity/Chat.php +++ b/src/Chamilo/CoreBundle/Entity/Chat.php @@ -8,7 +8,10 @@ use Doctrine\ORM\Mapping as ORM; /** * Chat * - * @ORM\Table(name="chat", indexes={@ORM\Index(name="idx_chat_to_user", columns={"to_user"}), @ORM\Index(name="idx_chat_from_user", columns={"from_user"})}) + * @ORM\Table(name="chat", indexes={ + * @ORM\Index(name="idx_chat_to_user", columns={"to_user"}), + * @ORM\Index(name="idx_chat_from_user", columns={"from_user"}) + * }) * @ORM\Entity */ class Chat diff --git a/src/Chamilo/CoreBundle/Entity/ClassItem.php b/src/Chamilo/CoreBundle/Entity/ClassItem.php index 838edec9eb..605138ecb9 100644 --- a/src/Chamilo/CoreBundle/Entity/ClassItem.php +++ b/src/Chamilo/CoreBundle/Entity/ClassItem.php @@ -6,7 +6,7 @@ namespace Chamilo\CourseBundle\Entity; use Doctrine\ORM\Mapping as ORM; /** - * Class + * ClassItem * * @ORM\Table(name="class_item") * @ORM\Entity @@ -40,7 +40,7 @@ class ClassItem * Set code * * @param string $code - * @return Class + * @return ClassItem */ public function setCode($code) { @@ -63,7 +63,7 @@ class ClassItem * Set name * * @param string $name - * @return Class + * @return ClassItem */ public function setName($name) { @@ -91,6 +91,4 @@ class ClassItem { return $this->id; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/CourseRelUserCatalogue.php b/src/Chamilo/CoreBundle/Entity/CourseRelUserCatalogue.php index 4212ae2a2f..934a7698a6 100644 --- a/src/Chamilo/CoreBundle/Entity/CourseRelUserCatalogue.php +++ b/src/Chamilo/CoreBundle/Entity/CourseRelUserCatalogue.php @@ -167,5 +167,4 @@ class CourseRelUserCatalogue { return $this->visible; } - } diff --git a/src/Chamilo/CoreBundle/Entity/CourseType.php b/src/Chamilo/CoreBundle/Entity/CourseType.php index 09e3a88f13..c6d7a2620b 100644 --- a/src/Chamilo/CoreBundle/Entity/CourseType.php +++ b/src/Chamilo/CoreBundle/Entity/CourseType.php @@ -1,4 +1,5 @@ id; } - } diff --git a/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php b/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php index c529c25b23..8be3238103 100644 --- a/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php +++ b/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php @@ -164,5 +164,4 @@ class GradebookScoreLog return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php b/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php index 078f7867d2..b4a776d682 100644 --- a/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php +++ b/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php @@ -300,5 +300,4 @@ class PersonalAgenda return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php index 39cbb0c0e4..8725f19884 100644 --- a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php +++ b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php @@ -1,4 +1,5 @@ name; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceCondition.php b/src/Chamilo/CoreBundle/Entity/SequenceCondition.php index 0ea3698dfb..f926d058de 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceCondition.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceCondition.php @@ -161,6 +161,4 @@ class SequenceCondition return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceFormula.php b/src/Chamilo/CoreBundle/Entity/SequenceFormula.php index 867a6fce65..d3d308015e 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceFormula.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceFormula.php @@ -34,7 +34,6 @@ class SequenceFormula **/ private $variable; - /** * Get id * @@ -82,6 +81,4 @@ class SequenceFormula return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceMethod.php b/src/Chamilo/CoreBundle/Entity/SequenceMethod.php index 7937abeec2..b41e8451b9 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceMethod.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceMethod.php @@ -161,6 +161,4 @@ class SequenceMethod return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceResource.php b/src/Chamilo/CoreBundle/Entity/SequenceResource.php index 863107f692..717ad3e135 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceResource.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceResource.php @@ -132,6 +132,4 @@ class SequenceResource return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRule.php b/src/Chamilo/CoreBundle/Entity/SequenceRule.php index d4f06a4729..4aee4ed1b3 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceRule.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceRule.php @@ -57,5 +57,4 @@ class SequenceRule return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php b/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php index 01bc0e5d34..34af8945c7 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php @@ -81,6 +81,4 @@ class SequenceRuleCondition return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php b/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php index 17e97e948b..9fc49d2f3e 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php @@ -112,5 +112,4 @@ class SequenceTypeEntity return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceValid.php b/src/Chamilo/CoreBundle/Entity/SequenceValid.php index 2061f974b7..1cb2923eda 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceValid.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceValid.php @@ -34,7 +34,6 @@ class SequenceValid **/ private $condition; - /** * Get id * @@ -84,5 +83,4 @@ class SequenceValid return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceValue.php b/src/Chamilo/CoreBundle/Entity/SequenceValue.php index ee748352e8..0accb4b80a 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceValue.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceValue.php @@ -300,6 +300,4 @@ class SequenceValue return $this; } - - } diff --git a/src/Chamilo/CoreBundle/Entity/SequenceVariable.php b/src/Chamilo/CoreBundle/Entity/SequenceVariable.php index 343ae5c1d0..4e60ccd529 100644 --- a/src/Chamilo/CoreBundle/Entity/SequenceVariable.php +++ b/src/Chamilo/CoreBundle/Entity/SequenceVariable.php @@ -112,5 +112,4 @@ class SequenceVariable return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SessionCategory.php b/src/Chamilo/CoreBundle/Entity/SessionCategory.php index edb8996c6c..2b007fb183 100644 --- a/src/Chamilo/CoreBundle/Entity/SessionCategory.php +++ b/src/Chamilo/CoreBundle/Entity/SessionCategory.php @@ -185,4 +185,3 @@ class SessionCategory return $this->accessUrlId; } } - diff --git a/src/Chamilo/CoreBundle/Entity/SessionRelCourse.php b/src/Chamilo/CoreBundle/Entity/SessionRelCourse.php index 7ab05e2e49..108efe92dd 100644 --- a/src/Chamilo/CoreBundle/Entity/SessionRelCourse.php +++ b/src/Chamilo/CoreBundle/Entity/SessionRelCourse.php @@ -146,5 +146,4 @@ class SessionRelCourse { $this->position = $position; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SessionRelUser.php b/src/Chamilo/CoreBundle/Entity/SessionRelUser.php index 643254f4bc..5ae5fca962 100644 --- a/src/Chamilo/CoreBundle/Entity/SessionRelUser.php +++ b/src/Chamilo/CoreBundle/Entity/SessionRelUser.php @@ -292,5 +292,4 @@ class SessionRelUser return $this; } - } diff --git a/src/Chamilo/CoreBundle/Entity/SharedSurvey.php b/src/Chamilo/CoreBundle/Entity/SharedSurvey.php index b214834b44..f1af8cf5bd 100644 --- a/src/Chamilo/CoreBundle/Entity/SharedSurvey.php +++ b/src/Chamilo/CoreBundle/Entity/SharedSurvey.php @@ -1,4 +1,5 @@ relationType; } - } diff --git a/src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php b/src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php index 887ec20aa9..05d80f6beb 100644 --- a/src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php +++ b/src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php @@ -44,7 +44,6 @@ class LegacyLoginListener implements EventSubscriberInterface $request = $event->getRequest(); if (!$request->hasPreviousSession()) { - return; } @@ -72,7 +71,6 @@ class LegacyLoginListener implements EventSubscriberInterface $languages = ['german' => 'de', 'english' => 'en', 'spanish' => 'es', 'french' => 'fr']; $locale = isset($languages[$user->getLanguage()]) ? $languages[$user->getLanguage()] : ''; if ($user && !empty($locale)) { - error_log('legacyloginlistener'); error_log($locale); $user->setLocale($locale);