Merge branch 'master' of github.com:chamilo/chamilo-lms

src/CoreBundle/Controller/CourseController.php

@@ -7,7 +7,6 @@ declare(strict_types=1);
 namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Entity\Course;
-use Chamilo\CoreBundle\Entity\CourseCategory;
 use Chamilo\CoreBundle\Entity\CourseRelUser;
 use Chamilo\CoreBundle\Entity\ExtraField;
 use Chamilo\CoreBundle\Entity\Session;
@@ -711,7 +710,6 @@ class CourseController extends ToolBaseController
         AccessUrlHelper $accessUrlHelper,
         CourseRepository $courseRepository
     ): JsonResponse {
-
         $searchTerm = $request->query->get('search', '');
         $accessUrl = $accessUrlHelper->getCurrent();
 

src/CoreBundle/Controller/SecurityController.php

@@ -49,8 +49,8 @@ class SecurityController extends AbstractController
         /** @var User $user */
         $user = $this->getUser();
 
-        if ($user->getActive() !== 1) {
-            if ($user->getActive() === 0) {
+        if (1 !== $user->getActive()) {
+            if (0 === $user->getActive()) {
                 $message = $translator->trans('Account not activated.');
             } else {
                 $message = $translator->trans('Invalid credentials. Please try again or contact support if you continue to experience issues.');

src/CoreBundle/Entity/ExtraField.php

@@ -127,7 +127,7 @@ class ExtraField
     protected DateTime $createdAt;
 
     #[Groups(['extra_field:read'])]
-    #[ORM\Column(name: "auto_remove", type: "boolean", options: ["default" => false])]
+    #[ORM\Column(name: 'auto_remove', type: 'boolean', options: ['default' => false])]
     protected bool $autoRemove = false;
 
     public function __construct()

src/CoreBundle/Entity/User.php

@@ -943,7 +943,7 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
      */
     public function getIsActive(): bool
     {
-        return $this->active === 1;
+        return 1 === $this->active;
     }
 
     public function isEnabled(): bool

src/CoreBundle/Repository/Node/CourseRepository.php

@@ -104,14 +104,16 @@ class CourseRepository extends ResourceRepository
                 'user' => $user,
                 'url' => $url,
                 'status' => $status,
-            ]);
+            ])
+        ;
 
         if (!empty($keyword)) {
             $qb->andWhere($qb->expr()->orX(
                 $qb->expr()->like('c.title', ':keyword'),
                 $qb->expr()->like('c.code', ':keyword')
             ))
-                ->setParameter('keyword', '%'.$keyword.'%');
+                ->setParameter('keyword', '%'.$keyword.'%')
+            ;
         }
 
         $query = $qb->getQuery();