Minor - format code, add missing license notice

pull/2487/head
jmontoyaa 8 years ago
parent 7d16d0c0e1
commit b9ad8935a1
  1. 14
      src/Chamilo/CoreBundle/Entity/Admin.php
  2. 4
      src/Chamilo/CoreBundle/Entity/BranchTransaction.php
  3. 5
      src/Chamilo/CoreBundle/Entity/Chat.php
  4. 8
      src/Chamilo/CoreBundle/Entity/ClassItem.php
  5. 1
      src/Chamilo/CoreBundle/Entity/CourseRelUserCatalogue.php
  6. 1
      src/Chamilo/CoreBundle/Entity/CourseType.php
  7. 1
      src/Chamilo/CoreBundle/Entity/EventEmailTemplate.php
  8. 21
      src/Chamilo/CoreBundle/Entity/EventSent.php
  9. 2
      src/Chamilo/CoreBundle/Entity/ExtraFieldRelTag.php
  10. 1
      src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php
  11. 1
      src/Chamilo/CoreBundle/Entity/PersonalAgenda.php
  12. 1
      src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php
  13. 1
      src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeatNot.php
  14. 1
      src/Chamilo/CoreBundle/Entity/Promotion.php
  15. 1
      src/Chamilo/CoreBundle/Entity/SearchEngineRef.php
  16. 2
      src/Chamilo/CoreBundle/Entity/Sequence.php
  17. 2
      src/Chamilo/CoreBundle/Entity/SequenceCondition.php
  18. 3
      src/Chamilo/CoreBundle/Entity/SequenceFormula.php
  19. 2
      src/Chamilo/CoreBundle/Entity/SequenceMethod.php
  20. 2
      src/Chamilo/CoreBundle/Entity/SequenceResource.php
  21. 1
      src/Chamilo/CoreBundle/Entity/SequenceRule.php
  22. 2
      src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php
  23. 1
      src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php
  24. 2
      src/Chamilo/CoreBundle/Entity/SequenceValid.php
  25. 2
      src/Chamilo/CoreBundle/Entity/SequenceValue.php
  26. 1
      src/Chamilo/CoreBundle/Entity/SequenceVariable.php
  27. 1
      src/Chamilo/CoreBundle/Entity/SessionCategory.php
  28. 1
      src/Chamilo/CoreBundle/Entity/SessionRelCourse.php
  29. 1
      src/Chamilo/CoreBundle/Entity/SessionRelUser.php
  30. 1
      src/Chamilo/CoreBundle/Entity/SharedSurvey.php
  31. 1
      src/Chamilo/CoreBundle/Entity/SharedSurveyQuestion.php
  32. 1
      src/Chamilo/CoreBundle/Entity/SharedSurveyQuestionOption.php
  33. 1
      src/Chamilo/CoreBundle/Entity/SpecificField.php
  34. 7
      src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
  35. 2
      src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
  36. 3
      src/Chamilo/CoreBundle/Entity/Usergroup.php
  37. 1
      src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
  38. 2
      src/Chamilo/CoreBundle/EventListener/LegacyLoginListener.php

@ -13,13 +13,6 @@ use Doctrine\ORM\Mapping as ORM;
*/ */
class Admin class Admin
{ {
/**
* @var integer
*
* @ORM\Column(name="user_id", type="integer", nullable=false)
*/
private $userId;
/** /**
* @var integer * @var integer
* *
@ -29,7 +22,12 @@ class Admin
*/ */
private $id; private $id;
/**
* @var integer
*
* @ORM\Column(name="user_id", type="integer", nullable=false)
*/
private $userId;
/** /**
* Set userId * Set userId

@ -411,8 +411,4 @@ class BranchTransaction
return $this; return $this;
} }
} }

@ -8,7 +8,10 @@ use Doctrine\ORM\Mapping as ORM;
/** /**
* Chat * 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 * @ORM\Entity
*/ */
class Chat class Chat

@ -6,7 +6,7 @@ namespace Chamilo\CourseBundle\Entity;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
/** /**
* Class * ClassItem
* *
* @ORM\Table(name="class_item") * @ORM\Table(name="class_item")
* @ORM\Entity * @ORM\Entity
@ -40,7 +40,7 @@ class ClassItem
* Set code * Set code
* *
* @param string $code * @param string $code
* @return Class * @return ClassItem
*/ */
public function setCode($code) public function setCode($code)
{ {
@ -63,7 +63,7 @@ class ClassItem
* Set name * Set name
* *
* @param string $name * @param string $name
* @return Class * @return ClassItem
*/ */
public function setName($name) public function setName($name)
{ {
@ -91,6 +91,4 @@ class ClassItem
{ {
return $this->id; return $this->id;
} }
} }

@ -167,5 +167,4 @@ class CourseRelUserCatalogue
{ {
return $this->visible; return $this->visible;
} }
} }

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;
@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
*/ */
class EventSent class EventSent
{ {
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/** /**
* @var integer * @var integer
* *
@ -33,17 +43,6 @@ class EventSent
*/ */
private $eventTypeName; private $eventTypeName;
/**
* @var integer
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
/** /**
* Set userFrom * Set userFrom
* *

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;
@ -122,5 +123,4 @@ class ExtraFieldRelTag
{ {
return $this->id; return $this->id;
} }
} }

@ -164,5 +164,4 @@ class GradebookScoreLog
return $this; return $this;
} }
} }

@ -300,5 +300,4 @@ class PersonalAgenda
return $this; return $this;
} }
} }

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -148,6 +148,4 @@ class Sequence
{ {
return $this->name; return $this->name;
} }
} }

@ -161,6 +161,4 @@ class SequenceCondition
return $this; return $this;
} }
} }

@ -34,7 +34,6 @@ class SequenceFormula
**/ **/
private $variable; private $variable;
/** /**
* Get id * Get id
* *
@ -82,6 +81,4 @@ class SequenceFormula
return $this; return $this;
} }
} }

@ -161,6 +161,4 @@ class SequenceMethod
return $this; return $this;
} }
} }

@ -132,6 +132,4 @@ class SequenceResource
return $this; return $this;
} }
} }

@ -57,5 +57,4 @@ class SequenceRule
return $this; return $this;
} }
} }

@ -81,6 +81,4 @@ class SequenceRuleCondition
return $this; return $this;
} }
} }

@ -112,5 +112,4 @@ class SequenceTypeEntity
return $this; return $this;
} }
} }

@ -34,7 +34,6 @@ class SequenceValid
**/ **/
private $condition; private $condition;
/** /**
* Get id * Get id
* *
@ -84,5 +83,4 @@ class SequenceValid
return $this; return $this;
} }
} }

@ -300,6 +300,4 @@ class SequenceValue
return $this; return $this;
} }
} }

@ -112,5 +112,4 @@ class SequenceVariable
return $this; return $this;
} }
} }

@ -185,4 +185,3 @@ class SessionCategory
return $this->accessUrlId; return $this->accessUrlId;
} }
} }

@ -146,5 +146,4 @@ class SessionRelCourse
{ {
$this->position = $position; $this->position = $position;
} }
} }

@ -292,5 +292,4 @@ class SessionRelUser
return $this; return $this;
} }
} }

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;

@ -8,7 +8,12 @@ use Doctrine\ORM\Mapping as ORM;
/** /**
* TrackEAttemptRecording * TrackEAttemptRecording
* *
* @ORM\Table(name="track_e_attempt_recording", indexes={@ORM\Index(name="exe_id", columns={"exe_id"}), @ORM\Index(name="question_id", columns={"question_id"}), @ORM\Index(name="session_id", columns={"session_id"})}) * @ORM\Table(name="track_e_attempt_recording",
* indexes={
* @ORM\Index(name="exe_id", columns={"exe_id"}),
* @ORM\Index(name="question_id", columns={"question_id"}),
* @ORM\Index(name="session_id", columns={"session_id"})
* })
* @ORM\Entity * @ORM\Entity
*/ */
class TrackEAttemptRecording class TrackEAttemptRecording

@ -29,8 +29,6 @@ class UserFriendRelationType
*/ */
private $id; private $id;
/** /**
* Set title * Set title
* *

@ -228,7 +228,4 @@ class Usergroup
return $this; return $this;
} }
} }

@ -131,5 +131,4 @@ class UsergroupRelUser
{ {
return $this->relationType; return $this->relationType;
} }
} }

@ -44,7 +44,6 @@ class LegacyLoginListener implements EventSubscriberInterface
$request = $event->getRequest(); $request = $event->getRequest();
if (!$request->hasPreviousSession()) { if (!$request->hasPreviousSession()) {
return; return;
} }
@ -72,7 +71,6 @@ class LegacyLoginListener implements EventSubscriberInterface
$languages = ['german' => 'de', 'english' => 'en', 'spanish' => 'es', 'french' => 'fr']; $languages = ['german' => 'de', 'english' => 'en', 'spanish' => 'es', 'french' => 'fr'];
$locale = isset($languages[$user->getLanguage()]) ? $languages[$user->getLanguage()] : ''; $locale = isset($languages[$user->getLanguage()]) ? $languages[$user->getLanguage()] : '';
if ($user && !empty($locale)) { if ($user && !empty($locale)) {
error_log('legacyloginlistener'); error_log('legacyloginlistener');
error_log($locale); error_log($locale);
$user->setLocale($locale); $user->setLocale($locale);

Loading…
Cancel
Save