Skip to content

Commit

Permalink
Merge branch hotfix/v2.2.15
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed Apr 19, 2024
1 parent c8533c5 commit 6a7cef2
Show file tree
Hide file tree
Showing 287 changed files with 5,636 additions and 4,406 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: ['8.0', '8.1']
php-version: ['8.1', '8.2', '8.3']
steps:
- uses: shivammathur/setup-php@v2
with:
Expand Down
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

34 changes: 18 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"keywords": [
"cms",
"backoffice",
"roadiz",
"rezo zero"
],
"authors": [
Expand All @@ -15,8 +16,9 @@
}
],
"type": "symfony-bundle",
"prefer-stable": true,
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-zip": "*",
Expand All @@ -25,31 +27,31 @@
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.8.1",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "<2.17",
"doctrine/orm": "~2.17.0",
"gedmo/doctrine-extensions": "^3.10.0",
"inlinestyle/inlinestyle": "~1.2.7",
"james-heinrich/getid3": "^1.9",
"jms/serializer": "^3.9.0",
"jms/serializer-bundle": "^3.10.0",
"league/flysystem": "^3.0",
"league/flysystem-bundle": "^3.0",
"lexik/jwt-authentication-bundle": "^2.13",
"lexik/jwt-authentication-bundle": "^2.19",
"phpdocumentor/reflection-docblock": "^5.2",
"phpoffice/phpspreadsheet": "^1.15",
"ramsey/uuid": "^4.7",
"rezozero/crypto": "^1.0.0",
"rezozero/intervention-request-bundle": "~3.0.0",
"rezozero/liform-bundle": "^0.18.1",
"rezozero/liform-bundle": "^0.19",
"rezozero/tree-walker": "^1.3.0",
"roadiz/doc-generator": "2.1.*",
"roadiz/documents": "2.1.*",
"roadiz/dts-generator": "2.1.*",
"roadiz/entity-generator": "2.1.*",
"roadiz/jwt": "2.1.*",
"roadiz/markdown": "2.1.*",
"roadiz/models": "2.1.*",
"roadiz/doc-generator": "2.2.*",
"roadiz/documents": "2.2.*",
"roadiz/dts-generator": "2.2.*",
"roadiz/entity-generator": "2.2.*",
"roadiz/jwt": "2.2.*",
"roadiz/markdown": "2.2.*",
"roadiz/models": "2.2.*",
"roadiz/nodetype-contracts": "~1.1.2",
"roadiz/random": "2.1.*",
"roadiz/random": "2.2.*",
"rollerworks/password-common-list": "^0.2.0",
"rollerworks/password-strength-bundle": "^2.2",
"scienta/doctrine-json-functions": "^4.2",
Expand All @@ -62,7 +64,7 @@
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/flex": "^v1.19.4 || ^2.2.3",
"symfony/flex": "^2.2.3",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
Expand All @@ -87,7 +89,7 @@
"symfony/web-link": "5.4.*",
"symfony/workflow": "5.4.*",
"symfony/yaml": "5.4.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/extra-bundle": "^3.0",
"twig/intl-extra": "*",
"twig/string-extra": "*",
"twig/twig": "^3.1"
Expand Down Expand Up @@ -130,8 +132,8 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.1.x-dev",
"dev-develop": "2.2.x-dev"
"dev-main": "2.2.x-dev",
"dev-develop": "2.3.x-dev"
}
}
}
3 changes: 1 addition & 2 deletions config/api_resources/attribute.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
RZ\Roadiz\CoreBundle\Entity\Attribute:
collectionOperations: []
itemOperations: []
operations: []

11 changes: 5 additions & 6 deletions config/api_resources/attribute_value.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---
RZ\Roadiz\CoreBundle\Entity\AttributeValue:
collectionOperations:
get:
operations:
ApiPlatform\Metadata\GetCollection:
method: "GET"
normalization_context:
normalizationContext:
groups: ["urls", "attribute", "document_display", "attribute_node", "attribute_documents"]
enable_max_depth: true
itemOperations:
get:
ApiPlatform\Metadata\Get:
method: 'GET'
normalization_context:
normalizationContext:
groups: ["urls", "attribute", "document_display", "attribute_node", "attribute_documents"]
enable_max_depth: true

28 changes: 28 additions & 0 deletions config/api_resources/common_content.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
App\Api\Model\CommonContent:
operations:
getCommonContent:
class: ApiPlatform\Metadata\Get
method: 'GET'
uriTemplate: '/common_content'
read: false
controller: App\Controller\GetCommonContentController
pagination_enabled: false
normalizationContext:
enable_max_depth: true
pagination_enabled: false
groups:
- get
- common_content
- web_response
- walker
- walker_level
- children
- children_count
- nodes_sources_base
- nodes_sources_default
- urls
- blocks_urls
- tag_base
- translation_base
- document_display
- document_folders
121 changes: 13 additions & 108 deletions config/api_resources/custom_form.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
---
RZ\Roadiz\CoreBundle\Entity\CustomForm:
collectionOperations:
get:
operations:
ApiPlatform\Metadata\GetCollection:
method: "GET"
normalization_context:
normalizationContext:
enable_max_depth: true

itemOperations:
get:
ApiPlatform\Metadata\Get:
method: 'GET'
normalization_context:
normalizationContext:
enable_max_depth: true

api_custom_forms_item_post:
method: 'POST'
route_name: api_custom_forms_item_post
normalization_context:
class: ApiPlatform\Metadata\Post
routeName: api_custom_forms_item_post
normalizationContext:
enable_max_depth: true
openapi_context:
openapiContext:
summary: Post a user custom form
description: |
Post a user custom form
Expand Down Expand Up @@ -59,10 +59,11 @@ RZ\Roadiz\CoreBundle\Entity\CustomForm:

api_custom_forms_item_definition:
method: 'GET'
route_name: api_custom_forms_item_definition
normalization_context:
class: ApiPlatform\Metadata\Get
routeName: api_custom_forms_item_definition
normalizationContext:
enable_max_depth: true
openapi_context:
openapiContext:
summary: Get a custom form definition for frontend
description: |
Get a custom form definition for frontend
Expand Down Expand Up @@ -107,99 +108,3 @@ RZ\Roadiz\CoreBundle\Entity\CustomForm:
description: Required fields names
example:
- 'email'

api_contact_form_post:
method: 'POST'
route_name: api_contact_form_post
normalization_context:
enable_max_depth: true
openapi_context:
summary: Post a user contact form
description: |
Post a user contact form
requestBody:
content:
multipart/form-data:
schema:
type: object
properties:
email:
type: string
example: [email protected]
first_name:
type: string
example: John
last_name:
type: string
example: Doe
responses:
201: ~
400:
description: Posted contact form has errors
content:
application/json:
schema:
type: object
properties:
email:
type: object
example:
email: This value is not a valid email address.
202:
description: Posted contact form was accepted
content:
application/json:
schema:
type: object
properties: { }

api_contact_form_definition:
method: 'GET'
route_name: api_contact_form_definition
normalization_context:
enable_max_depth: true
openapi_context:
summary: Get a contact form definition for frontend
description: |
Get a contact form definition for frontend
responses:
200:
description: Contact form definition object
content:
application/json:
schema:
type: object
properties:
title:
type: string
description: Form inputs prefix
example: reiciendis_natus_ducimus_nostrum
type:
type: string
description: Form definition type
example: object
properties:
type: object
description: Form definition fields
example:
email:
type: string
title: Email
attr:
data-group: null
placeholder: null
widget: email
propertyOrder: 1
first_name:
type: string
title: Firstname
attr:
data-group: null
placeholder: null
widget: string
propertyOrder: 2
required:
type: array
description: Required fields names
example:
- 'email'
16 changes: 8 additions & 8 deletions config/api_resources/document.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
RZ\Roadiz\CoreBundle\Entity\Document:
collectionOperations:
get:
operations:
ApiPlatform\Metadata\GetCollection:
method: "GET"
normalization_context:
groups: ["urls", "document_display", "document_display_sources", "position"]
normalizationContext:
groups: ["urls", "document_display", "document_folders", "document_folders_all", "document_display_sources"]
enable_max_depth: true
itemOperations:
get:

ApiPlatform\Metadata\Get:
method: 'GET'
normalization_context:
groups: ["urls", "document", "document_display", "document_folders", "document_display_sources", "position"]
normalizationContext:
groups: ["urls", "document", "document_display", "document_folders", "document_folders_all", "document_display_sources"]
enable_max_depth: true

16 changes: 9 additions & 7 deletions config/api_resources/folder.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
RZ\Roadiz\CoreBundle\Entity\Folder:
iri: Folder
shortName: Folder
collectionOperations: {}
itemOperations:
get:
operations:
ApiPlatform\Metadata\GetCollection:
method: "GET"
normalization_context:
groups: [ "folder", "position" ]
normalizationContext:
groups: [ "folder" ]
enable_max_depth: true
ApiPlatform\Metadata\Get:
method: "GET"
normalizationContext:
groups: [ "folder" ]
enable_max_depth: true
12 changes: 5 additions & 7 deletions config/api_resources/node.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

---
RZ\Roadiz\CoreBundle\Entity\Node:
shortName: Node
collectionOperations: {}
itemOperations:
get:
operations:
ApiPlatform\Metadata\Get:
method: 'GET'
normalization_context:
normalizationContext:
groups: ["node", "document_display"]
enable_max_depth: true
groups: ["node", "tag_base", "translation_base", "document_display"]
Loading

0 comments on commit 6a7cef2

Please sign in to comment.