Fix CI for php-8.3 + s7 + ap4

.github/workflows/behat.yml

@@ -11,7 +11,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ ubuntu-latest ]
-                php-versions: [ '8.2', '8.3' ]
+                php-versions: [ '8.3' ]
         steps:
             -   name: Checkout
                 uses: actions/checkout@v7

.github/workflows/format_code.yml

@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2']
+                php-versions: ['8.3']
         steps:
             - name: Checkout
               uses: actions/checkout@v7

.github/workflows/php_analysis.yml

@@ -11,7 +11,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2']
+                php-versions: ['8.3']
         steps:
             - name: Checkout
               uses: actions/checkout@v7

.github/workflows/phpunit.yml

@@ -14,7 +14,7 @@ jobs:
             fail-fast: false
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2']
+                php-versions: ['8.3']
         steps:
             - name: Checkout
               uses: actions/checkout@v7

psalm.xml

@@ -8,7 +8,6 @@
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
         findUnusedBaselineEntry="false"
         findUnusedCode="false"
-    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src"/>

src/CoreBundle/Controller/Admin/RoomAvailabilityController.php

@@ -12,6 +12,7 @@
 use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
 use Chamilo\CourseBundle\Entity\CAttendanceCalendar;
 use DateTime;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -71,7 +72,7 @@ public function availability(
                     .' OR (cal.room IS NULL AND a.room IS NULL AND src.room IS NULL AND IDENTITY(c.room) = :roomId)'
                 )
                 ->setParameter('roomId', $room['id'])
-                ->setParameter('end', $end)
+                ->setParameter('end', $end, Types::DATETIME_MUTABLE)
                 ->getQuery()
                 ->getArrayResult()
             ;

src/CoreBundle/Controller/Admin/RoomOccupationController.php

@@ -12,6 +12,7 @@
 use Chamilo\CoreBundle\Helpers\RoomAccessUrlHelper;
 use Chamilo\CourseBundle\Entity\CAttendanceCalendar;
 use DateTime;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -73,9 +74,9 @@ public function occupation(
                 .' OR (cal.room IS NULL AND a.room IS NULL AND src.room = :room)'
                 .' OR (cal.room IS NULL AND a.room IS NULL AND src.room IS NULL AND c.room = :room)'
             )
-            ->setParameter('room', $room)
-            ->setParameter('start', $start)
-            ->setParameter('end', $end)
+            ->setParameter('room', (int) $room->getId())
+            ->setParameter('start', $start, Types::DATETIME_MUTABLE)
+            ->setParameter('end', $end, Types::DATETIME_MUTABLE)
             ->orderBy('cal.dateTime', 'ASC')
             ->getQuery()
             ->getArrayResult()

src/CoreBundle/Migrations/Schema/V200/Version20210205082253.php

@@ -41,7 +41,7 @@ public function up(Schema $schema): void
     private function migrateUserImages(IllustrationRepository $illustrationRepo, bool $splitDirectories): void
     {
         $query = $this->entityManager->createQuery(
-            'SELECT u FROM Chamilo\\CoreBundle\\Entity\\User u
+            'SELECT u FROM Chamilo\CoreBundle\Entity\User u
              WHERE u.pictureUri IS NOT NULL AND u.pictureUri <> :empty'
         )->setParameter('empty', '');
 
@@ -155,7 +155,7 @@ private function migrateUsergroupResources(): void
     private function migrateUsergroupImages(IllustrationRepository $illustrationRepo, bool $splitDirectories): void
     {
         $query = $this->entityManager->createQuery(
-            'SELECT u FROM Chamilo\\CoreBundle\\Entity\\Usergroup u
+            'SELECT u FROM Chamilo\CoreBundle\Entity\Usergroup u
              WHERE u.picture IS NOT NULL AND u.picture <> :empty'
         )->setParameter('empty', '');
 

src/CoreBundle/Serializer/Denormalizer/Scim/UserDenormalizer.php

@@ -69,6 +69,9 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         return $user;
     }
 
+    /**
+     * @psalm-suppress MethodSignatureMismatch
+     */
     public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         if (isset($context[self::ALREADY_CALLED])) {

src/CoreBundle/Serializer/DocumentAiAssistedNormalizer.php

@@ -32,29 +32,29 @@ public function supportsNormalization($data, ?string $format = null, array $cont
         return $data instanceof CDocument;
     }
 
-    public function normalize($object, ?string $format = null, array $context = []): array|ArrayObject|bool|float|int|string|null
+    public function normalize($data, ?string $format = null, array $context = []): array|ArrayObject|bool|float|int|string|null
     {
         $context[self::ALREADY_CALLED] = true;
 
-        $data = $this->normalizer->normalize($object, $format, $context);
+        $result = $this->normalizer->normalize($data, $format, $context);
 
-        if (!\is_array($data) || !$object instanceof CDocument) {
-            return $data;
+        if (!\is_array($result) || !$data instanceof CDocument) {
+            return $result;
         }
 
-        $docId = (int) ($object->getIid() ?? 0);
+        $docId = (int) ($data->getIid() ?? 0);
         if ($docId <= 0) {
-            $data['ai_assisted'] = false;
-            $data['ai_assisted_raw'] = false;
+            $result['ai_assisted'] = false;
+            $result['ai_assisted_raw'] = false;
 
-            return $data;
+            return $result;
         }
 
         $raw = $this->aiDisclosureHelper->isAiAssistedExtraField('document', $docId);
-        $data['ai_assisted_raw'] = (bool) $raw;
-        $data['ai_assisted'] = $this->aiDisclosureHelper->isDisclosureEnabled() && $raw;
+        $result['ai_assisted_raw'] = (bool) $raw;
+        $result['ai_assisted'] = $this->aiDisclosureHelper->isDisclosureEnabled() && $raw;
 
-        return $data;
+        return $result;
     }
 
     public function getSupportedTypes(?string $format): array

src/CoreBundle/Serializer/GlossaryAiAssistedNormalizer.php

@@ -32,29 +32,29 @@ public function supportsNormalization($data, ?string $format = null, array $cont
         return $data instanceof CGlossary;
     }
 
-    public function normalize($object, ?string $format = null, array $context = []): array|ArrayObject|bool|float|int|string|null
+    public function normalize($data, ?string $format = null, array $context = []): array|ArrayObject|bool|float|int|string|null
     {
         $context[self::ALREADY_CALLED] = true;
 
-        $data = $this->normalizer->normalize($object, $format, $context);
+        $result = $this->normalizer->normalize($data, $format, $context);
 
-        if (!\is_array($data) || !$object instanceof CGlossary) {
-            return $data;
+        if (!\is_array($result) || !$data instanceof CGlossary) {
+            return $result;
         }
 
-        $iid = (int) ($object->getIid() ?? 0);
+        $iid = (int) ($data->getIid() ?? 0);
         if ($iid <= 0) {
-            $data['ai_assisted_raw'] = false;
-            $data['ai_assisted'] = false;
+            $result['ai_assisted_raw'] = false;
+            $result['ai_assisted'] = false;
 
-            return $data;
+            return $result;
         }
 
         $raw = $this->aiDisclosureHelper->isAiAssistedExtraField('glossary', $iid);
-        $data['ai_assisted_raw'] = (bool) $raw;
-        $data['ai_assisted'] = $this->aiDisclosureHelper->isDisclosureEnabled() && (bool) $raw;
+        $result['ai_assisted_raw'] = (bool) $raw;
+        $result['ai_assisted'] = $this->aiDisclosureHelper->isDisclosureEnabled() && (bool) $raw;
 
-        return $data;
+        return $result;
     }
 
     public function getSupportedTypes(?string $format): array

src/CoreBundle/Serializer/Normalizer/MessageNormalizer.php

@@ -18,18 +18,18 @@ class MessageNormalizer implements NormalizerInterface, NormalizerAwareInterface
 
     private const ALREADY_CALLED = 'MESSAGE_NORMALIZER_ALREADY_CALLED';
 
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($data, ?string $format = null, array $context = []): array
     {
         $context[self::ALREADY_CALLED] = true;
 
-        /** @var array<string, mixed> $data */
-        $data = $this->normalizer->normalize($object, $format, $context);
+        /** @var array<string, mixed> $result */
+        $result = $this->normalizer->normalize($data, $format, $context);
 
-        if (isset($data['content']) && \is_string($data['content'])) {
-            $data['content'] = Security::remove_XSS($data['content'], STUDENT);
+        if (isset($result['content']) && \is_string($result['content'])) {
+            $result['content'] = Security::remove_XSS($result['content'], STUDENT);
         }
 
-        return $data;
+        return $result;
     }
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool

src/CoreBundle/Serializer/Normalizer/Scim/UserNormalizer.php

@@ -27,10 +27,10 @@ public function __construct(
         private readonly ScimHelper $scimHelper,
     ) {}
 
-    public function normalize(mixed $object, ?string $format = null, array $context = []): array
+    public function normalize(mixed $data, ?string $format = null, array $context = []): array
     {
         /** @var User $user */
-        $user = $object;
+        $user = $data;
 
         $uuid = $user->getUuid();
 

src/CoreBundle/Serializer/Normalizer/SessionNormalizer.php

@@ -23,21 +23,21 @@ public function __construct(
 
     private const ALREADY_CALLED = 'SESSION_NORMALIZER_ALREADY_CALLED';
 
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($data, ?string $format = null, array $context = []): array
     {
         $context[self::ALREADY_CALLED] = true;
 
-        \assert($object instanceof Session);
+        \assert($data instanceof Session);
 
         try {
-            $object->getAccessVisibility();
+            $data->getAccessVisibility();
         } catch (LogicException) {
-            $object->setAccessVisibilityByUser(
+            $data->setAccessVisibilityByUser(
                 $this->userHelper->getCurrent()
             );
         }
 
-        return $this->normalizer->normalize($object, $format, $context);
+        return $this->normalizer->normalize($data, $format, $context);
     }
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool

src/CoreBundle/Serializer/Normalizer/SocialPostNormalizer.php

@@ -18,18 +18,18 @@ class SocialPostNormalizer implements NormalizerInterface, NormalizerAwareInterf
 
     private const ALREADY_CALLED = 'SOCIAL_POST_NORMALIZER_ALREADY_CALLED';
 
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($data, ?string $format = null, array $context = []): array
     {
         $context[self::ALREADY_CALLED] = true;
 
-        /** @var array<string, mixed> $data */
-        $data = $this->normalizer->normalize($object, $format, $context);
+        /** @var array<string, mixed> $result */
+        $result = $this->normalizer->normalize($data, $format, $context);
 
-        if (isset($data['content']) && \is_string($data['content'])) {
-            $data['content'] = Security::remove_XSS($data['content'], STUDENT);
+        if (isset($result['content']) && \is_string($result['content'])) {
+            $result['content'] = Security::remove_XSS($result['content'], STUDENT);
         }
 
-        return $data;
+        return $result;
     }
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool

src/CoreBundle/Serializer/Normalizer/UserNormalizer.php

@@ -22,15 +22,15 @@ public function __construct(
         private readonly NameConventionHelper $nameConventionHelper,
     ) {}
 
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($data, ?string $format = null, array $context = []): array
     {
         $context[self::ALREADY_CALLED] = true;
 
-        $data = $this->normalizer->normalize($object, $format, $context);
+        $result = $this->normalizer->normalize($data, $format, $context);
 
-        $data['fullName'] = $this->nameConventionHelper->getPersonName($object);
+        $result['fullName'] = $this->nameConventionHelper->getPersonName($data);
 
-        return $data;
+        return $result;
     }
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool