Merged branch '4.6'

ibexa · May 29, 2024 · 7d4eea8 · 7d4eea8
2 parents ff2002f + e31483d
commit 7d4eea8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/bundle/Resources/config/routing.yml b/src/bundle/Resources/config/routing.yml
@@ -595,7 +595,7 @@ ibexa.rest.load_content_type_field_definition:
     requirements:
         contentTypeId: \d+
         fieldDefinitionId: \d+
-        
+
 ibexa.rest.load_content_type_field_definition_by_identifier:
     path: /content/types/{contentTypeId}/fieldDefinition/{fieldDefinitionIdentifier}
     controller: Ibexa\Rest\Server\Controller\ContentType::loadContentTypeFieldDefinitionByIdentifier

diff --git a/src/lib/Server/Controller/SessionController.php b/src/lib/Server/Controller/SessionController.php
@@ -104,6 +104,8 @@ public function createSessionAction(Request $request)
     /**
      * Refresh given session.
      *
+     * @deprecated 4.6.7 The "SessionController::refreshSessionAction()" method is deprecated, will be removed in 5.0. Use SessionController::checkSessionAction() instead.
+     *
      * @param string $sessionId
      *
      * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException
@@ -112,6 +114,12 @@ public function createSessionAction(Request $request)
      */
     public function refreshSessionAction($sessionId, Request $request)
     {
+        trigger_deprecation(
+            'ibexa/rest',
+            '4.6.7',
+            sprintf('The %s() method is deprecated, will be removed in 5.0.', __METHOD__)
+        );
+
         $session = $request->getSession();
 
         if ($session === null || !$session->isStarted() || $session->getId() != $sessionId || !$this->hasStoredCsrfToken()) {