Plugin: XApi: Get changes from fixes for 1.11.x

See chamilo#3943

Author: AngelFQC

public/plugin/xapi/php-xapi/lrs-bundle/src/Model/StatementsFilterFactory.php

@@ -84,6 +84,7 @@ public function createFromParameterBag(ParameterBag $parameters)
             $filter->descending();
         }
 
+        $filter->cursor($parameters->getInt('cursor'));
         $filter->limit($parameters->getInt('limit'));
 
         return $filter;

public/plugin/xapi/php-xapi/lrs-bundle/src/Resources/config/routing.xml

@@ -13,7 +13,7 @@
     </route>
 
     <route id="xapi_lrs.statement.post" path="/statements" methods="POST">
-        <default key="_controller">xapi_lrs.controller.statement.post:postStatement</default>
+        <default key="_controller">xapi_lrs.controller.statement.post:postStatements</default>
         <default key="xapi_serializer">statement</default>
         <default key="xapi_lrs.route">
             <bool>true</bool>

public/plugin/xapi/php-xapi/repository-doctrine-orm/src/StatementRepository.php

@@ -38,15 +38,25 @@ public function findStatements(array $criteria)
             $criteria['context'] = $contexts;
         }
 
+        if (!empty($criteria['verb'])) {
+            $verbs = $this->_em->getRepository(Verb::class)->findBy(['id' => $criteria['verb']]);
+
+            $criteria['verb'] = $verbs;
+        }
+
         unset(
             $criteria['registration'],
             $criteria['related_activities'],
             $criteria['related_agents'],
             $criteria['ascending'],
-            $criteria['limit']
         );
 
-        return parent::findBy($criteria, ['created' => 'ASC']);
+        return parent::findBy(
+            $criteria,
+            ['created' => 'ASC'],
+            $criteria['limit'] ?? null,
+            $criteria['cursor'] ?? null
+        );
     }
 
     public function storeStatement(Statement $mappedStatement, $flush = true): void

src/CoreBundle/Entity/XApiObject.php

@@ -90,7 +90,7 @@ class XApiObject
     /**
      * @var Collection<int, self>
      */
-    #[ORM\OneToMany(mappedBy: 'group', targetEntity: self::class)]
+    #[ORM\OneToMany(mappedBy: 'group', targetEntity: self::class, cascade: ['persist', 'remove'])]
     #[ORM\JoinColumn(referencedColumnName: 'identifier')]
     private Collection $members;
 

src/CoreBundle/Entity/XApiVerb.php

@@ -20,8 +20,8 @@ class XApiVerb
     #[ORM\Column(length: 255)]
     private ?string $id = null;
 
-    #[ORM\Column]
-    private array $display = [];
+    #[ORM\Column(nullable: true)]
+    private ?array $display = null;
 
     public function getIdentifier(): ?int
     {
@@ -40,12 +40,12 @@ public function setId(string $id): static
         return $this;
     }
 
-    public function getDisplay(): array
+    public function getDisplay(): ?array
     {
         return $this->display;
     }
 
-    public function setDisplay(array $display): static
+    public function setDisplay(?array $display): static
     {
         $this->display = $display;
 

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

@@ -52,9 +52,9 @@ public function up(Schema $schema): void
         }
 
         if ($hasTblVerb) {
-            $this->addSql("ALTER TABLE xapi_verb CHANGE display display LONGTEXT NOT NULL COMMENT '(DC2Type:json)'");
+            $this->addSql("ALTER TABLE xapi_verb CHANGE display display LONGTEXT NULL COMMENT '(DC2Type:json)'");
         } else {
-            $this->addSql("CREATE TABLE xapi_verb (identifier INT AUTO_INCREMENT NOT NULL, id VARCHAR(255) NOT NULL, display LONGTEXT NOT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(identifier)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB ROW_FORMAT = DYNAMIC");
+            $this->addSql("CREATE TABLE xapi_verb (identifier INT AUTO_INCREMENT NOT NULL, id VARCHAR(255) NOT NULL, display LONGTEXT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(identifier)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB ROW_FORMAT = DYNAMIC");
         }
 
         if ($hasTblObject) {