Merge remote-tracking branch 'origin/main'

Catrobat · Aug 30, 2024 · 3766a1b · 3766a1b
2 parents 734930b + 13a0e80
commit 3766a1b
Show file tree

Hide file tree

Showing 3 changed files with 496 additions and 502 deletions.
diff --git a/catroweb.yaml b/catroweb.yaml
@@ -1319,7 +1319,6 @@ paths:
 
   '/studio/{id}':
     parameters:
-      - $ref: '#/components/parameters/Uuid'
       - $ref: '#/components/parameters/Locale'
     put:
       security:
@@ -1328,7 +1327,7 @@ paths:
         - Studio
       summary: Update a Studio
       parameters:
-        - $ref: '#/components/parameters/StudioID'
+        - $ref: '#/components/parameters/Uuid'
       requestBody:
         required: true
         content:
@@ -1501,17 +1500,6 @@ components:
         example: "xxxxx.yyyyy.zzzzz"
       required: true
 
-    ##
-    # Studio specific
-    #
-    StudioID:
-      name: id
-      in: path
-      schema:
-        $ref: '#/components/schemas/StudioID'
-      required: true
-
-
     ##
     # Notifications specific
     #
@@ -2081,7 +2069,7 @@ components:
           description: "The flavor of this project"
         private:
           type: boolean
-          description: "Indicates whether a program should be private"
+          description: "Indicates whether a project should be private"
           default: false
           example: false
       required:
@@ -2403,26 +2391,26 @@ components:
           type: string
           example: "Catroweb"
           description: "Username of the user who caused the notification"
-        program:
-          description: "Id of the program for which the notification is about"
+        project:
+          description: "Id of the project for which the notification is about"
           allOf:
             - $ref: '#/components/schemas/Uuid'
-        program_name:
+        project_name:
           type: string
           example: "Awesome Game"
-          description: "Name of the program for which the notification is about"
+          description: "Name of the project for which the notification is about"
         avatar:
           type: string
           example: 'https://share.catrob.at/pocketcode/images/default/avatar_default.png'
           description: "Avatar of the user who caused the notification"
-        remixed_program:
-          description: "Id of the remixed program"
+        remixed_project:
+          description: "Id of the remixed project"
           allOf:
             - $ref: '#/components/schemas/Uuid'
-        remixed_program_name:
+        remixed_project_name:
           type: string
           example: "Awesome Remixed Game"
-          description: "Name of the remixed program"
+          description: "Name of the remixed project"
         message:
           type: string
           example:
@@ -2435,11 +2423,6 @@ components:
     ######################################################
     # Studio Schema
     ###
-    StudioID:
-      type: string
-      description: ID of the studio
-      example: 1234abcd-12ab-12ab-12ab-123456abcdef
-
     CreateStudioRequest:
       type: object
       properties:

diff --git a/composer.json b/composer.json
@@ -20,16 +20,16 @@
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "symfony/validator": "^6.4|^7.0",
+        "symfony/validator": "^7.0",
         "jms/serializer-bundle": "^5.4",
-        "symfony/framework-bundle": "^6.4|^7.0"
+        "symfony/framework-bundle": "^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^11.0",
         "friendsofphp/php-cs-fixer": "*",
         "phpstan/phpstan": "*",
-        "symfony/browser-kit": "^6.4|^7.0",
-        "symfony/yaml": "^6.4|^7.0",
+        "symfony/browser-kit": "^7.0",
+        "symfony/yaml": "^7.0",
         "hoa/regex": "~1.0",
         "rector/rector": "^1.2"
     },