Settings: Change attributes entities and wiki course settings - refs #2682

src/CoreBundle/Entity/AgendaEventInvitation.php

@@ -30,7 +30,7 @@ class AgendaEventInvitation
     #[ORM\OneToMany(targetEntity: "AgendaEventInvitee", mappedBy: "invitation", cascade: ["persist", "remove"], orphanRemoval: true)]
     protected Collection $invitees;
 
-    #[ORM\ManyToOne(targetEntity: "Chamilo\CoreBundle\Entity\User", inversedBy: "resourceNodes")]
+    #[ORM\ManyToOne(targetEntity: User::class, inversedBy: "resourceNodes")]
     #[ORM\JoinColumn(name: "creator_id", referencedColumnName: "id", nullable: true, onDelete: "CASCADE")]
     protected User $creator;
 

src/CoreBundle/Entity/MessageFeedback.php

@@ -12,14 +12,16 @@ use Doctrine\ORM\Mapping\Index;
  *
  * @package Chamilo\CoreBundle\Entity
  *
- * @ORM\Table(
- *     name="message_feedback",
- *     indexes={
- *         @Index(name="idx_message_feedback_uid_mid", columns={"message_id", "user_id"})
- *     }
- * )
- * @ORM\Entity()
  */
+
+#[ORM\Table(
+    name: "message_feedback"
+)]
+#[ORM\Index(
+    name: "idx_message_feedback_uid_mid",
+    columns: ["message_id", "user_id"]
+)]
+#[ORM\Entity]
 class MessageFeedback
 {
     #[ORM\Column(name: "id", type: "bigint")]

src/CoreBundle/Entity/PortfolioAttachment.php

@@ -11,9 +11,10 @@ use Doctrine\ORM\Mapping as ORM;
  *
  * @package Chamilo\CoreBundle\Entity
  *
- * @ORM\Table(name="portfolio_attachment")
- * @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Entity\Repository\PortfolioAttachmentRepository")
  */
+
+#[ORM\Table(name: "portfolio_attachment")]
+#[ORM\Entity(repositoryClass: "Chamilo\CoreBundle\Entity\Repository\PortfolioAttachmentRepository")]
 class PortfolioAttachment
 {
     public const TYPE_ITEM = 1;

src/CoreBundle/Resources/config/settings.yml

@@ -185,8 +185,3 @@ services:
         class: Chamilo\CoreBundle\Settings\WebServiceSettingsSchema
         tags:
             - {name: sylius.settings_schema, alias: chamilo_core.settings.webservice, namespace: webservice}
-
-    chamilo_core.settings.wiki:
-        class: Chamilo\CoreBundle\Settings\WikiSettingsSchema
-        tags:
-            - { name: sylius.settings_schema, alias: chamilo_core.settings.wiki, namespace: wiki }

src/CoreBundle/Settings/WikiSettingsSchema.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/* For licensing terms, see /license.txt */
-
-namespace Chamilo\CoreBundle\Settings;
-
-use Chamilo\CoreBundle\Form\Type\YesNoType;
-use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class WikiSettingsSchema extends AbstractSettingsSchema
-{
-    public function buildSettings(AbstractSettingsBuilder $builder): void
-    {
-        $builder
-            ->setDefaults(
-                [
-                    'wiki_categories_enabled' => 'false',
-                    'wiki_html_strict_filtering' => 'false',
-
-                ]
-            )
-        ;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        $builder
-            ->add('wiki_categories_enabled', YesNoType::class)
-            ->add('wiki_html_strict_filtering', YesNoType::class)
-
-        ;
-    }
-}

src/CourseBundle/Settings/WikiCourseSettingsSchema.php

@@ -7,6 +7,7 @@ declare(strict_types=1);
 namespace Chamilo\CourseBundle\Settings;
 
 use Chamilo\CoreBundle\Form\Type\YesNoNumericType;
+use Chamilo\CoreBundle\Form\Type\YesNoType;
 use Chamilo\CoreBundle\Settings\AbstractSettingsSchema;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -18,6 +19,8 @@ class WikiCourseSettingsSchema extends AbstractSettingsSchema
         $builder
             ->setDefaults([
                 'enabled' => 1,
+                'wiki_categories_enabled' => 'false',
+                'wiki_html_strict_filtering' => 'false',
             ])
         ;
     }
@@ -26,6 +29,8 @@ class WikiCourseSettingsSchema extends AbstractSettingsSchema
     {
         $builder
             ->add('enabled', YesNoNumericType::class)
+            ->add('wiki_categories_enabled', YesNoType::class)
+            ->add('wiki_html_strict_filtering', YesNoType::class)
         ;
     }
 }