Skip to content

Commit

Permalink
Merge branch hotfix/v2.3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
roadiz-ci committed Jul 12, 2024
1 parent 12e4cdf commit 3e8d4dd
Show file tree
Hide file tree
Showing 414 changed files with 5,420 additions and 5,992 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# default env file
6 changes: 6 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
2 changes: 2 additions & 0 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ jobs:
run: vendor/bin/phpcs -p ./src
- name: Run PHPStan
run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon
- name: Run PHP Unit
run: vendor/bin/phpunit -v
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright © 2023 Ambroise Maupate
Copyright © 2024 Ambroise Maupate

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
3 changes: 0 additions & 3 deletions Makefile

This file was deleted.

100 changes: 52 additions & 48 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,72 +23,71 @@
"ext-iconv": "*",
"ext-zip": "*",
"ext-json": "*",
"api-platform/core": "~2.7.0",
"api-platform/core": "~3.2.14",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.8.1",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "~2.17.0",
"doctrine/orm": "~2.19.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",
"jms/serializer-bundle": "^4.2.0",
"league/flysystem": "^3.0",
"league/flysystem-bundle": "^3.0",
"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.19",
"rezozero/tree-walker": "^1.3.0",
"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.*",
"rezozero/tree-walker": "^1.5.0",
"roadiz/doc-generator": "2.3.*",
"roadiz/documents": "2.3.*",
"roadiz/dts-generator": "2.3.*",
"roadiz/entity-generator": "2.3.*",
"roadiz/jwt": "2.3.*",
"roadiz/markdown": "2.3.*",
"roadiz/models": "2.3.*",
"roadiz/nodetype-contracts": "~1.1.2",
"roadiz/random": "2.2.*",
"roadiz/random": "2.3.*",
"rollerworks/password-common-list": "^0.2.0",
"rollerworks/password-strength-bundle": "^2.2",
"scienta/doctrine-json-functions": "^4.2",
"sensio/framework-extra-bundle": "^6.1",
"solarium/solarium": "^6.0.4",
"symfony-cmf/routing": "^2.3.3",
"symfony-cmf/routing-bundle": "^2.5",
"symfony/asset": "5.4.*",
"symfony/cache": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony-cmf/routing-bundle": "^3.0.2",
"symfony/asset": "6.4.*",
"symfony/cache": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/flex": "^2.2.3",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/messenger": "5.4.*",
"symfony/mime": "5.4.*",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/lock": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/messenger": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/monolog-bundle": "^3.1",
"symfony/notifier": "5.4.*",
"symfony/process": "5.4.*",
"symfony/property-access": "5.4.*",
"symfony/property-info": "5.4.*",
"symfony/proxy-manager-bridge": "5.4.*",
"symfony/rate-limiter": "5.4.*",
"symfony/runtime": "5.4.*",
"symfony/security-core": "5.4.*",
"symfony/serializer": "5.4.*",
"symfony/string": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/web-link": "5.4.*",
"symfony/workflow": "5.4.*",
"symfony/yaml": "5.4.*",
"symfony/notifier": "6.4.*",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/proxy-manager-bridge": "6.4.*",
"symfony/rate-limiter": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-core": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/workflow": "6.4.*",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^3.0",
"twig/intl-extra": "*",
"twig/string-extra": "*",
Expand All @@ -103,9 +102,9 @@
"phpstan/phpstan-doctrine": "^1.3",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.5",
"symfony/browser-kit": "5.4.*",
"symfony/phpunit-bridge": "5.4.*",
"symfony/stopwatch": "5.4.*"
"symfony/browser-kit": "6.4.*",
"symfony/phpunit-bridge": "^7.0",
"symfony/stopwatch": "6.4.*"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -124,6 +123,11 @@
"RZ\\Roadiz\\CoreBundle\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"RZ\\Roadiz\\CoreBundle\\Tests\\": "tests/"
}
},
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
Expand All @@ -132,8 +136,8 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.2.x-dev",
"dev-develop": "2.3.x-dev"
"dev-main": "2.3.x-dev",
"dev-develop": "2.4.x-dev"
}
}
}
8 changes: 4 additions & 4 deletions config/api_resources/attribute.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
RZ\Roadiz\CoreBundle\Entity\Attribute:
operations: []

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

#resources:
# RZ\Roadiz\CoreBundle\Entity\AttributeValue:
# operations:
# ApiPlatform\Metadata\GetCollection:
# method: "GET"
# normalizationContext:
# groups: ["urls", "attribute", "document_display", "attribute_node", "attribute_documents"]
# enable_max_depth: true
# ApiPlatform\Metadata\Get:
# method: 'GET'
# normalizationContext:
# groups: ["urls", "attribute", "document_display", "attribute_node", "attribute_documents"]
# enable_max_depth: true
#
57 changes: 29 additions & 28 deletions config/api_resources/common_content.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
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
#resources:
# 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
Loading

0 comments on commit 3e8d4dd

Please sign in to comment.