chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor: Format code

Browse Source
pull/4706/head
Angel Fernando Quiroz Campos 2 years ago
parent 823df83942
commit cf1584e9e2
20 changed files with 138 additions and 134 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      src/CoreBundle/Component/Utils/ChamiloApi.php
  2. 2
      src/CoreBundle/DataPersister/MessageDataPersister.php
  3. 6
      src/CoreBundle/DataPersister/UserRelUserDataPersister.php
  4. 2
      src/CoreBundle/EventListener/LogoutListener.php
  5. 2
      src/CoreBundle/Repository/LegalRepository.php
  6. 18
      src/CoreBundle/Repository/Node/UserRepository.php
  7. 2
      src/CoreBundle/Repository/ResourceFactory.php
  8. 22
      src/CoreBundle/Repository/ResourceRepository.php
  9. 2
      src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
  10. 14
      src/CoreBundle/Settings/AdminSettingsSchema.php
  11. 106
      src/CoreBundle/Settings/SettingsManager.php
  12. 10
      src/CoreBundle/Settings/SurveySettingsSchema.php
  13. 14
      src/CoreBundle/Settings/TrackingSettingsSchema.php
  14. 3
      src/CoreBundle/Traits/Repository/ORM/MaterializedPathRepositoryTrait.php
  15. 26
      src/CoreBundle/Traits/Repository/ORM/NestedTreeRepositoryTrait.php
  16. 4
      src/CourseBundle/Component/CourseCopy/CourseBuilder.php
  17. 8
      src/CourseBundle/Component/CourseCopy/CourseRestorer.php
  18. 2
      src/CourseBundle/Component/CourseCopy/CourseSelectForm.php
  19. 24
      src/CourseBundle/Component/CourseCopy/Resources/Resource.php
  20. 2
      src/LtiBundle/Entity/ExternalTool.php

3
src/CoreBundle/Component/Utils/ChamiloApi.php
Unescape View File

@ -13,9 +13,10 @@ use DateTime;
use DateTimeZone;
use Display;
use Exception;
use const PHP_SAPI;
use Template;
use const PHP_SAPI;
class ChamiloApi
{
public const COURSE_MANAGER = 1;

2
src/CoreBundle/DataPersister/MessageDataPersister.php
Unescape View File

@ -37,7 +37,7 @@ class MessageDataPersister implements ContextAwareDataPersisterInterface, Resuma
if ($data instanceof Message && (
($context['collection_operation_name'] ?? null) === 'post' ||
($context['graphql_operation_name'] ?? null) === 'create'
//($context['item_operation_name'] ?? null) === 'put' // on update
//($context['item_operation_name'] ?? null) === 'put' // on update
)
) {
/*if (Message::MESSAGE_TYPE_INBOX === $result->getMsgType()) {

6
src/CoreBundle/DataPersister/UserRelUserDataPersister.php
Unescape View File

@ -30,9 +30,9 @@ class UserRelUserDataPersister implements ContextAwareDataPersisterInterface
{
$result = $this->decorated->persist($data, $context);
if ($data instanceof UserRelUser && (
//($context['collection_operation_name'] ?? null) === 'post' ||
//($context['graphql_operation_name'] ?? null) === 'create'
($context['item_operation_name'] ?? null) === 'put' // on update
//($context['collection_operation_name'] ?? null) === 'post' ||
//($context['graphql_operation_name'] ?? null) === 'create'
($context['item_operation_name'] ?? null) === 'put' // on update
)
) {
if (UserRelUser::USER_RELATION_TYPE_FRIEND === $data->getRelationType()) {

2
src/CoreBundle/EventListener/LogoutListener.php
Unescape View File

@ -61,7 +61,7 @@ class LogoutListener
$user = $token->getUser();
if ($user instanceof User) {
$userId = $user->getId();
$table = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$sql = "SELECT login_id, login_date
FROM {$table}

2
src/CoreBundle/Repository/LegalRepository.php
Unescape View File

@ -147,7 +147,7 @@ class LegalRepository extends ServiceEntityRepository
->orderBy('l.version', Criteria::DESC)
->getQuery()
->getOneOrNullResult()
;
;
if (!empty($result)) {
$version = explode(':', $result);

18
src/CoreBundle/Repository/Node/UserRepository.php
Unescape View File

@ -494,15 +494,15 @@ class UserRepository extends ResourceRepository implements PasswordUpgraderInter
// All users
if ('true' === $allowSendMessageToAllUsers || api_is_platform_admin()) {
$this->addNotCurrentUserQueryBuilder($currentUserId, $qb);
/*$dql = "SELECT DISTINCT U
FROM ChamiloCoreBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != {$currentUserId} AND
R.url = {$accessUrlId}";*/
/*$dql = "SELECT DISTINCT U
FROM ChamiloCoreBundle:User U
LEFT JOIN ChamiloCoreBundle:AccessUrlRelUser R
WITH U = R.user
WHERE
U.active = 1 AND
U.status != 6 AND
U.id != {$currentUserId} AND
R.url = {$accessUrlId}";*/
} else {
$this->addOnlyMyFriendsQueryBuilder($currentUserId, $qb);
/*$dql = 'SELECT DISTINCT U

2
src/CoreBundle/Repository/ResourceFactory.php
Unescape View File

@ -17,7 +17,7 @@ class ResourceFactory
protected EntityManagerInterface $entityManager;
public function __construct(ToolChain $toolChain, EntityManagerInterface $entityManager, )
public function __construct(ToolChain $toolChain, EntityManagerInterface $entityManager)
{
$this->entityManager = $entityManager;
$this->toolChain = $toolChain;

22
src/CoreBundle/Repository/ResourceRepository.php
Unescape View File

@ -576,17 +576,17 @@ abstract class ResourceRepository extends ServiceEntityRepository
}
//if ($resourceNode->hasResourceFile()) {
//$resourceNode->getResourceFile()->getFile()->
//$resourceNode->getResourceFile()->setName($title);
//$resourceFile->setName($title);
/*$fileName = $this->getResourceNodeRepository()->getFilename($resourceFile);
error_log('$fileName');
error_log($fileName);
error_log($title);
$this->getResourceNodeRepository()->getFileSystem()->rename($fileName, $title);
$resourceFile->setName($title);
$resourceFile->setOriginalName($title);*/
//$resourceNode->getResourceFile()->getFile()->
//$resourceNode->getResourceFile()->setName($title);
//$resourceFile->setName($title);
/*$fileName = $this->getResourceNodeRepository()->getFilename($resourceFile);
error_log('$fileName');
error_log($fileName);
error_log($title);
$this->getResourceNodeRepository()->getFileSystem()->rename($fileName, $title);
$resourceFile->setName($title);
$resourceFile->setOriginalName($title);*/
//}
}

2
src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
Unescape View File

@ -26,7 +26,7 @@ class CourseVoter extends Voter
public function __construct(
EntityManagerInterface $entityManager,
// CourseRepository $courseManager,
// CourseRepository $courseManager,
Security $security
) {
$this->entityManager = $entityManager;

14
src/CoreBundle/Settings/AdminSettingsSchema.php
Unescape View File

@ -31,13 +31,13 @@ class AdminSettingsSchema extends AbstractSettingsSchema
]
)
;
// ->setAllowedTypes(
// array(
// //'administrator_email' => array('string'),
// //'administrator_name' => array('string'),
// //'administrator_surname' => array('string'),
// )
// );
// ->setAllowedTypes(
// array(
// //'administrator_email' => array('string'),
// //'administrator_name' => array('string'),
// //'administrator_surname' => array('string'),
// )
// );
}
public function buildForm(FormBuilderInterface $builder): void

106
src/CoreBundle/Settings/SettingsManager.php
Unescape View File

@ -397,59 +397,59 @@ class SettingsManager implements SettingsManagerInterface
$this->manager->flush();
// $schemaAlias = $settings->getSchemaAlias();
// $schemaAliasChamilo = str_replace('chamilo_core.settings.', '', $schemaAlias);
//
// $schema = $this->schemaRegistry->get($schemaAlias);
//
// $settingsBuilder = new SettingsBuilder();
// $schema->buildSettings($settingsBuilder);
//
// $parameters = $settingsBuilder->resolve($settings->getParameters());
//
// foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
// if (array_key_exists($parameter, $parameters)) {
// $parameters[$parameter] = $transformer->transform($parameters[$parameter]);
// }
// }
//
// /** @var \Sylius\Bundle\SettingsBundle\Event\SettingsEvent $event */
// $event = $this->eventDispatcher->dispatch(
// SettingsEvent::PRE_SAVE,
// new SettingsEvent($settings)
// );
//
// /** @var SettingsCurrent $url */
// $url = $event->getSettings()->getAccessUrl();
//
// foreach ($parameters as $name => $value) {
// if (isset($persistedParametersMap[$name])) {
// if ($value instanceof Course) {
// $value = $value->getId();
// }
// $persistedParametersMap[$name]->setValue($value);
// } else {
// $setting = new Settings();
// $setting->setSchemaAlias($schemaAlias);
//
// $setting
// ->setNamespace($schemaAliasChamilo)
// ->setName($name)
// ->setValue($value)
// ->setUrl($url)
// ->setAccessUrlLocked(0)
// ->setAccessUrlChangeable(1)
// ;
//
// /** @var ConstraintViolationListInterface $errors */
// /*$errors = $this->->validate($parameter);
// if (0 < $errors->count()) {
// throw new ValidatorException($errors->get(0)->getMessage());
// }*/
// $this->manager->persist($setting);
// $this->manager->flush();
// }
// }
// $schemaAlias = $settings->getSchemaAlias();
// $schemaAliasChamilo = str_replace('chamilo_core.settings.', '', $schemaAlias);
//
// $schema = $this->schemaRegistry->get($schemaAlias);
//
// $settingsBuilder = new SettingsBuilder();
// $schema->buildSettings($settingsBuilder);
//
// $parameters = $settingsBuilder->resolve($settings->getParameters());
//
// foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
// if (array_key_exists($parameter, $parameters)) {
// $parameters[$parameter] = $transformer->transform($parameters[$parameter]);
// }
// }
//
// /** @var \Sylius\Bundle\SettingsBundle\Event\SettingsEvent $event */
// $event = $this->eventDispatcher->dispatch(
// SettingsEvent::PRE_SAVE,
// new SettingsEvent($settings)
// );
//
// /** @var SettingsCurrent $url */
// $url = $event->getSettings()->getAccessUrl();
//
// foreach ($parameters as $name => $value) {
// if (isset($persistedParametersMap[$name])) {
// if ($value instanceof Course) {
// $value = $value->getId();
// }
// $persistedParametersMap[$name]->setValue($value);
// } else {
// $setting = new Settings();
// $setting->setSchemaAlias($schemaAlias);
//
// $setting
// ->setNamespace($schemaAliasChamilo)
// ->setName($name)
// ->setValue($value)
// ->setUrl($url)
// ->setAccessUrlLocked(0)
// ->setAccessUrlChangeable(1)
// ;
//
// /** @var ConstraintViolationListInterface $errors */
// /*$errors = $this->->validate($parameter);
// if (0 < $errors->count()) {
// throw new ValidatorException($errors->get(0)->getMessage());
// }*/
// $this->manager->persist($setting);
// $this->manager->flush();
// }
// }
/*$parameters = $settingsBuilder->resolve($settings->getParameters());
$settings->setParameters($parameters);

10
src/CoreBundle/Settings/SurveySettingsSchema.php
Unescape View File

@ -36,11 +36,11 @@ class SurveySettingsSchema extends AbstractSettingsSchema
]
)
;
// ->setAllowedTypes(
// array(
// //'survey_email_sender_noreply' => array('string'),
// )
// );
// ->setAllowedTypes(
// array(
// //'survey_email_sender_noreply' => array('string'),
// )
// );
}
public function buildForm(FormBuilderInterface $builder): void

14
src/CoreBundle/Settings/TrackingSettingsSchema.php
Unescape View File

@ -27,13 +27,13 @@ class TrackingSettingsSchema extends AbstractSettingsSchema
]
)
;
// ->setAllowedTypes(
// array(
// // commenting this line allows setting to be null
// //'header_extra_content' => array('string'),
// //'footer_extra_content' => array('string'),
// )
// );
// ->setAllowedTypes(
// array(
// // commenting this line allows setting to be null
// //'header_extra_content' => array('string'),
// //'footer_extra_content' => array('string'),
// )
// );
}
public function buildForm(FormBuilderInterface $builder): void

3
src/CoreBundle/Traits/Repository/ORM/MaterializedPathRepositoryTrait.php
Unescape View File

@ -193,7 +193,8 @@ trait MaterializedPathRepositoryTrait
}
} elseif ($direct) {
$expr = $qb->expr()->not(
$qb->expr()->like($alias.'.'.$path,
$qb->expr()->like(
$alias.'.'.$path,
$qb->expr()->literal(
($config['path_starts_with_separator'] ? $separator : '')
.'%'.$separator.'%'

26
src/CoreBundle/Traits/Repository/ORM/NestedTreeRepositoryTrait.php
Unescape View File

@ -74,16 +74,16 @@ trait NestedTreeRepositoryTrait
$siblingInPosition = null;
if ($child !== null) {
switch ($position) {
case Nested::PREV_SIBLING:
case Nested::NEXT_SIBLING:
$sibling = new EntityWrapper($child, $em);
$newParent = $sibling->getPropertyValue($config['parent']);
if (null === $newParent && isset($config['root'])) {
throw new UnexpectedValueException("Cannot persist sibling for a root node, tree operation is not possible");
}
$siblingInPosition = $child;
$child = $newParent;
break;
case Nested::PREV_SIBLING:
case Nested::NEXT_SIBLING:
$sibling = new EntityWrapper($child, $em);
$newParent = $sibling->getPropertyValue($config['parent']);
if (null === $newParent && isset($config['root'])) {
throw new UnexpectedValueException("Cannot persist sibling for a root node, tree operation is not possible");
}
$siblingInPosition = $child;
$child = $newParent;
break;
}
$wrapped->setPropertyValue($config['parent'], $child);
}
@ -472,7 +472,8 @@ trait NestedTreeRepositoryTrait
$qb = $this->getQueryBuilder();
$qb->select('node')
->from($config['useObjectClass'], 'node')
->where($includeSelf ?
->where(
$includeSelf ?
$qb->expr()->gte('node.'.$config['left'], $left) :
$qb->expr()->gt('node.'.$config['left'], $left)
)
@ -547,7 +548,8 @@ trait NestedTreeRepositoryTrait
$qb = $this->getQueryBuilder();
$qb->select('node')
->from($config['useObjectClass'], 'node')
->where($includeSelf ?
->where(
$includeSelf ?
$qb->expr()->lte('node.'.$config['left'], $left) :
$qb->expr()->lt('node.'.$config['left'], $left)
)

4
src/CourseBundle/Component/CourseCopy/CourseBuilder.php
Unescape View File

@ -123,7 +123,7 @@ class CourseBuilder
$this->course->code = $_course['code'];
$this->course->type = $type;
// $this->course->path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/';
// $this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path'];
// $this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path'];
$this->course->encoding = api_get_system_encoding();
$this->course->info = $_course;
}
@ -1877,7 +1877,7 @@ class CourseBuilder
) {
$courseInfo = api_get_course_info_by_id($courseId);
$courseCode = $courseInfo['code'];
$cats = Category:: load(
$cats = Category::load(
null,
null,
$courseCode,

8
src/CourseBundle/Component/CourseCopy/CourseRestorer.php
Unescape View File

@ -376,7 +376,7 @@ class CourseRestorer
null,
false,
null,
$session_id,
$session_id,
0,
false
);
@ -3497,7 +3497,7 @@ class CourseRestorer
$resources = $this->course->resources;
$destinationCourseCode = $this->destination_course_info['code'];
// Delete destination gradebook
$cats = Category:: load(
$cats = Category::load(
null,
null,
$destinationCourseCode,
@ -3554,8 +3554,8 @@ class CourseRestorer
$type = RESOURCE_QUIZ;
break;
/*case LINK_DROPBOX:
break;*/
/*case LINK_DROPBOX:
break;*/
case LINK_STUDENTPUBLICATION:
$type = RESOURCE_WORK;

2
src/CourseBundle/Component/CourseCopy/CourseSelectForm.php
Unescape View File

@ -598,7 +598,7 @@ class CourseSelectForm
break;
case RESOURCE_FORUMTOPIC:
case RESOURCE_FORUMPOST:
//Add post from topic
//Add post from topic
if (RESOURCE_FORUMTOPIC == $type) {
$posts_to_save = [];
$posts = $course->resources[RESOURCE_FORUMPOST];

24
src/CourseBundle/Component/CourseCopy/Resources/Resource.php
Unescape View File

@ -162,20 +162,20 @@ class Resource
return TOOL_QUIZ;
case RESOURCE_TEST_CATEGORY:
return TOOL_TEST_CATEGORY;
//case RESOURCE_QUIZQUESTION: //no corresponding global constant
// return TOOL_QUIZ_QUESTION;
//case RESOURCE_TOOL_INTRO:
// return TOOL_INTRO;
//case RESOURCE_LINKCATEGORY:
// return TOOL_LINK_CATEGORY;
//case RESOURCE_SCORM:
// return TOOL_SCORM_DOCUMENT;
//case RESOURCE_QUIZQUESTION: //no corresponding global constant
// return TOOL_QUIZ_QUESTION;
//case RESOURCE_TOOL_INTRO:
// return TOOL_INTRO;
//case RESOURCE_LINKCATEGORY:
// return TOOL_LINK_CATEGORY;
//case RESOURCE_SCORM:
// return TOOL_SCORM_DOCUMENT;
case RESOURCE_SURVEY:
return TOOL_SURVEY;
//case RESOURCE_SURVEYQUESTION:
// return TOOL_SURVEY_QUESTION;
//case RESOURCE_SURVEYINVITATION:
// return TOOL_SURVEY_INVITATION;
//case RESOURCE_SURVEYQUESTION:
// return TOOL_SURVEY_QUESTION;
//case RESOURCE_SURVEYINVITATION:
// return TOOL_SURVEY_INVITATION;
case RESOURCE_GLOSSARY:
return TOOL_GLOSSARY;
case RESOURCE_WIKI:

2
src/LtiBundle/Entity/ExternalTool.php
Unescape View File

@ -537,7 +537,7 @@ class ExternalTool extends AbstractResource implements ResourceInterface, Resour
public function getChildrenInCourses(array $coursesId): Collection
{
return $this->children->filter(
fn(self $child) => \in_array($child->getCourse()->getId(), $coursesId, true)
fn (self $child) => \in_array($child->getCourse()->getId(), $coursesId, true)
);
}

Write Preview
Loading…
Cancel
Save