Minor: Format code

pull/5677/head
Angel Fernando Quiroz Campos 1 year ago
parent 2f2d8fcb5a
commit 1d8b755e58
No known key found for this signature in database
GPG Key ID: B284841AE3E562CD
  1. 4
      src/CoreBundle/Component/Editor/Toolbar.php
  2. 15
      src/CoreBundle/Controller/Admin/AdminController.php
  3. 4
      src/CoreBundle/Entity/MessageFeedback.php
  4. 2
      src/CoreBundle/Entity/ResourceNode.php
  5. 4
      src/CoreBundle/Entity/User.php
  6. 2
      src/CoreBundle/Migrations/Schema/V200/Version20230204150030.php
  7. 4
      src/CoreBundle/Migrations/Schema/V200/Version20240122221400.php
  8. 2
      src/CoreBundle/Repository/Node/UserRepository.php
  9. 7
      src/CoreBundle/Tool/AbstractTool.php
  10. 2
      src/CoreBundle/Twig/Extension/ChamiloExtension.php

@ -32,14 +32,14 @@ class Toolbar
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;
if (!empty($toolbar)) { if (!empty($toolbar)) {
$class = __NAMESPACE__.'\\'.$prefix.'\\Toolbar\\'.$toolbar; $class = __NAMESPACE__.'\\'.$prefix.'\Toolbar\\'.$toolbar;
if (class_exists($class)) { if (class_exists($class)) {
$this->setConfig($config); $this->setConfig($config);
$toolbarObj = new $class($urlGenerator, $toolbar, $config); $toolbarObj = new $class($urlGenerator, $toolbar, $config);
$config = $toolbarObj->getConfig(); $config = $toolbarObj->getConfig();
if ('true' === api_get_setting('editor.full_ckeditor_toolbar_set')) { if ('true' === api_get_setting('editor.full_ckeditor_toolbar_set')) {
$basicClass = __NAMESPACE__.'\\'.$prefix.'\\Toolbar\\Basic'; $basicClass = __NAMESPACE__.'\\'.$prefix.'\Toolbar\Basic';
$basicObj = new $basicClass($urlGenerator, $toolbar, $config); $basicObj = new $basicClass($urlGenerator, $toolbar, $config);
$basicConfig = $basicObj->getConfig(); $basicConfig = $basicObj->getConfig();
if ('true' === api_get_setting('more_buttons_maximized_mode')) { if ('true' === api_get_setting('more_buttons_maximized_mode')) {

@ -61,7 +61,8 @@ class AdminController extends BaseController
->leftJoin('rn.resourceLinks', 'rl') ->leftJoin('rn.resourceLinks', 'rl')
->leftJoin('rl.course', 'c') ->leftJoin('rl.course', 'c')
->leftJoin('rl.user', 'u') ->leftJoin('rl.user', 'u')
->addSelect('rn', 'rl', 'c', 'u'); ->addSelect('rn', 'rl', 'c', 'u')
;
if ($search) { if ($search) {
$queryBuilder->where('rf.title LIKE :search') $queryBuilder->where('rf.title LIKE :search')
@ -69,12 +70,14 @@ class AdminController extends BaseController
->orWhere('c.title LIKE :search') ->orWhere('c.title LIKE :search')
->orWhere('u.username LIKE :search') ->orWhere('u.username LIKE :search')
->orWhere('rn.uuid LIKE :search') ->orWhere('rn.uuid LIKE :search')
->setParameter('search', '%' . $search . '%'); ->setParameter('search', '%'.$search.'%')
;
} }
$queryBuilder->orderBy('rf.id', 'DESC') $queryBuilder->orderBy('rf.id', 'DESC')
->setFirstResult($offset) ->setFirstResult($offset)
->setMaxResults(self::ITEMS_PER_PAGE); ->setMaxResults(self::ITEMS_PER_PAGE)
;
$files = $queryBuilder->getQuery()->getResult(); $files = $queryBuilder->getQuery()->getResult();
@ -84,7 +87,8 @@ class AdminController extends BaseController
->leftJoin('rn.resourceLinks', 'rl') ->leftJoin('rn.resourceLinks', 'rl')
->leftJoin('rl.course', 'c') ->leftJoin('rl.course', 'c')
->leftJoin('rl.user', 'u') ->leftJoin('rl.user', 'u')
->select('COUNT(rf.id)'); ->select('COUNT(rf.id)')
;
if ($search) { if ($search) {
$totalItemsQuery->where('rf.title LIKE :search') $totalItemsQuery->where('rf.title LIKE :search')
@ -92,7 +96,8 @@ class AdminController extends BaseController
->orWhere('c.title LIKE :search') ->orWhere('c.title LIKE :search')
->orWhere('u.username LIKE :search') ->orWhere('u.username LIKE :search')
->orWhere('rn.uuid LIKE :search') ->orWhere('rn.uuid LIKE :search')
->setParameter('search', '%' . $search . '%'); ->setParameter('search', '%'.$search.'%')
;
} }
$totalItems = $totalItemsQuery->getQuery()->getSingleScalarResult(); $totalItems = $totalItemsQuery->getQuery()->getSingleScalarResult();

@ -23,11 +23,11 @@ class MessageFeedback
#[ORM\GeneratedValue()] #[ORM\GeneratedValue()]
private int $id; private int $id;
#[ORM\ManyToOne(targetEntity: 'Chamilo\\CoreBundle\\Entity\\Message', inversedBy: 'likes')] #[ORM\ManyToOne(targetEntity: Message::class, inversedBy: 'likes')]
#[ORM\JoinColumn(name: 'message_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')] #[ORM\JoinColumn(name: 'message_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
private Message $message; private Message $message;
#[ORM\ManyToOne(targetEntity: 'Chamilo\\CoreBundle\\Entity\\User')] #[ORM\ManyToOne(targetEntity: User::class)]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
private User $user; private User $user;

@ -358,7 +358,7 @@ class ResourceNode implements Stringable
$pathForDisplay = substr_replace($pathForDisplay, '', -3); $pathForDisplay = substr_replace($pathForDisplay, '', -3);
} }
*/ */
$pathForDisplay = preg_replace('/-\\d+\\'.self::PATH_SEPARATOR.'/', '/', $path); $pathForDisplay = preg_replace('/-\d+\\'.self::PATH_SEPARATOR.'/', '/', $path);
if (null !== $pathForDisplay && '' !== $pathForDisplay) { if (null !== $pathForDisplay && '' !== $pathForDisplay) {
$pathForDisplay = substr_replace($pathForDisplay, '', -1); $pathForDisplay = substr_replace($pathForDisplay, '', -1);
} }

@ -735,7 +735,7 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
$this->biography = ''; $this->biography = '';
$this->website = ''; $this->website = '';
$this->locale = 'en'; $this->locale = 'en';
$this->timezone = 'Europe\\Paris'; $this->timezone = 'Europe\Paris';
$this->authSource = 'platform'; $this->authSource = 'platform';
$this->status = CourseRelUser::STUDENT; $this->status = CourseRelUser::STUDENT;
$this->salt = sha1(uniqid('', true)); $this->salt = sha1(uniqid('', true));
@ -806,7 +806,7 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
return [ return [
new Assert\Length(['min' => 5]), new Assert\Length(['min' => 5]),
// Alpha numeric + "_" or "-" // Alpha numeric + "_" or "-"
new Assert\Regex(['pattern' => '/^[a-z\\-_0-9]+$/i', 'htmlPattern' => '/^[a-z\\-_0-9]+$/i']), new Assert\Regex(['pattern' => '/^[a-z\-_0-9]+$/i', 'htmlPattern' => '/^[a-z\-_0-9]+$/i']),
// Min 3 letters - not needed // Min 3 letters - not needed
/*new Assert\Regex(array( /*new Assert\Regex(array(
'pattern' => '/[a-z]{3}/i', 'pattern' => '/[a-z]{3}/i',

@ -29,7 +29,7 @@ class Version20230204150030 extends AbstractMigrationChamilo
$batchSize = self::BATCH_SIZE; $batchSize = self::BATCH_SIZE;
$counter = 1; $counter = 1;
$dql = 'SELECT v FROM Chamilo\\CoreBundle\\Entity\\ExtraFieldValues v'; $dql = 'SELECT v FROM Chamilo\CoreBundle\Entity\ExtraFieldValues v';
$dql .= ' JOIN v.field f'; $dql .= ' JOIN v.field f';
$dql .= ' WHERE f.variable = :variable AND f.itemType = :itemType'; $dql .= ' WHERE f.variable = :variable AND f.itemType = :itemType';
$q = $this->entityManager->createQuery($dql); $q = $this->entityManager->createQuery($dql);

@ -135,8 +135,8 @@ final class Version20240122221400 extends AbstractMigrationChamilo
$englishTranslation .= '"'; $englishTranslation .= '"';
} }
$search = ['\\{', '\\}', '\\(', '\\)', '\\;']; $search = ['\{', '\}', '\(', '\)', '\;'];
$replace = ['\\\\{', '\\\\}', '\\\\(', '\\\\)', '\\\\;']; $replace = ['\\\{', '\\\}', '\\\(', '\\\)', '\\\;'];
$englishTranslation = str_replace($search, $replace, $englishTranslation); $englishTranslation = str_replace($search, $replace, $englishTranslation);
if (preg_match('/\\\$/', $translatedTerm)) { if (preg_match('/\\\$/', $translatedTerm)) {
$translatedTerm .= '"'; $translatedTerm .= '"';

@ -295,7 +295,7 @@ class UserRepository extends ResourceRepository implements PasswordUpgraderInter
]; ];
foreach ($relations as $relation) { foreach ($relations as $relation) {
$entityClass = 'Chamilo\\'.$relation['bundle'].'\\Entity\\'.$relation['entity']; $entityClass = 'Chamilo\\'.$relation['bundle'].'\Entity\\'.$relation['entity'];
$repository = $em->getRepository($entityClass); $repository = $em->getRepository($entityClass);
$records = $repository->findBy([$relation['field'] => $userToDelete]); $records = $repository->findBy([$relation['field'] => $userToDelete]);

@ -83,20 +83,27 @@ abstract class AbstractTool
public function getTitleToShow(): string public function getTitleToShow(): string
{ {
$title = $this->getTitle(); $title = $this->getTitle();
// Exception for singular terms that need a plural (with an 's') // Exception for singular terms that need a plural (with an 's')
switch ($title) { switch ($title) {
case 'course_setting': case 'course_setting':
return 'Course settings'; return 'Course settings';
case 'member': case 'member':
return 'Users'; return 'Users';
case 'announcement': case 'announcement':
return 'Announcements'; return 'Announcements';
case 'attendance': case 'attendance':
return 'Attendances'; return 'Attendances';
case 'link': case 'link':
return 'Links'; return 'Links';
case 'survey': case 'survey':
return 'Surveys'; return 'Surveys';
default: default:
return ucfirst(str_replace('_', ' ', $title)); return ucfirst(str_replace('_', ' ', $title));
} }

@ -172,7 +172,7 @@ class ChamiloExtension extends AbstractExtension
if ($minRequirements['specials'] > 0) { if ($minRequirements['specials'] > 0) {
$options['rules'][] = [ $options['rules'][] = [
'minChar' => $minRequirements['specials'], 'minChar' => $minRequirements['specials'],
'pattern' => '[!"#$%&\'()*+,\-./\\\:;<=>?@[\\]^_`{|}~]', 'pattern' => '[!"#$%&\'()*+,\-./\\\:;<=>?@[\]^_`{|}~]',
'helpText' => sprintf( 'helpText' => sprintf(
get_lang('Minimum %s special characters'), get_lang('Minimum %s special characters'),
$minRequirements['specials'] $minRequirements['specials']

Loading…
Cancel
Save