diff --git a/EMS/common-bundle/composer.json b/EMS/common-bundle/composer.json index bd1bbc522..2d9b88480 100644 --- a/EMS/common-bundle/composer.json +++ b/EMS/common-bundle/composer.json @@ -23,7 +23,6 @@ "ext-zip": "*", "aws/aws-sdk-php": "^3.294", "cebe/markdown": "^1.2", - "doctrine/annotations": "^1.14", "doctrine/doctrine-bundle": "^2.11", "doctrine/orm": "^2.17", "dompdf/dompdf": "^v2.0", diff --git a/EMS/core-bundle/composer.json b/EMS/core-bundle/composer.json index e4e6074d7..1a1121551 100644 --- a/EMS/core-bundle/composer.json +++ b/EMS/core-bundle/composer.json @@ -20,7 +20,6 @@ "ext-simplexml": "*", "ext-soap": "*", "caxy/php-htmldiff": "^0.1", - "doctrine/annotations": "^1.14", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-migrations-bundle": "^3.2", "dragonmantank/cron-expression": "^3.3", @@ -30,7 +29,6 @@ "maennchen/zipstream-php": "^3.0", "ocramius/doctrine-batch-utils": "^2.5", "ramsey/uuid-doctrine": "^1.8", - "sensio/framework-extra-bundle": "^6.2", "sensiolabs/ansi-to-html": "^1.2", "symfony/asset": "6.4.*", "symfony/cache": "6.4.*", diff --git a/EMS/core-bundle/src/Controller/ContentManagement/DataController.php b/EMS/core-bundle/src/Controller/ContentManagement/DataController.php index a33a67265..8c83117a3 100644 --- a/EMS/core-bundle/src/Controller/ContentManagement/DataController.php +++ b/EMS/core-bundle/src/Controller/ContentManagement/DataController.php @@ -610,7 +610,7 @@ public function ajaxUpdate(int $revisionId, Request $request, PublishService $pu $request->getSession()->getBag('flashes')->clear(); /**little trick to reorder collection*/ - $requestRevision = $request->request->get('revision'); + $requestRevision = $request->request->all('revision'); $this->reorderCollection($requestRevision); $request->request->set('revision', $requestRevision); /**end little trick to reorder collection*/ diff --git a/EMS/core-bundle/src/Controller/ElasticsearchController.php b/EMS/core-bundle/src/Controller/ElasticsearchController.php index 7ee5e071d..c84fa5f99 100644 --- a/EMS/core-bundle/src/Controller/ElasticsearchController.php +++ b/EMS/core-bundle/src/Controller/ElasticsearchController.php @@ -422,7 +422,7 @@ public function search(Request $request): Response $search->setEnvironments($this->environmentService->getEnvironmentNames()); if ('POST' == $request->getMethod()) { - $request->request->set('search_form', $request->query->get('search_form')); + $request->request->set('search_form', $request->query->all('search_form')); $form = $this->createForm(SearchFormType::class, $search); @@ -474,7 +474,7 @@ public function search(Request $request): Response } // Form treatment after the "Save" button has been pressed (= ask for a name to save the search preset) - if ($form->isSubmitted() && $form->isValid() && $request->query->get('search_form') && \array_key_exists('save', $request->query->all('search_form'))) { + if ($form->isSubmitted() && $form->isValid() && \array_key_exists('save', $request->query->all('search_form'))) { $form = $this->createFormBuilder($search) ->add('name', TextType::class) ->add('save_search', SubmitEmsType::class, [ @@ -489,7 +489,7 @@ public function search(Request $request): Response return $this->render("@$this->templateNamespace/elasticsearch/save-search.html.twig", [ 'form' => $form->createView(), ]); - } elseif ($form->isSubmitted() && $form->isValid() && $request->query->get('search_form') && \array_key_exists('delete', $request->query->all('search_form'))) { + } elseif ($form->isSubmitted() && $form->isValid() && \array_key_exists('delete', $request->query->all('search_form'))) { // Form treatment after the "Delete" button has been pressed (to delete a previous saved search preset) $this->logger->notice('log.elasticsearch.search_deleted', [ @@ -539,7 +539,7 @@ public function search(Request $request): Response $currentFilters->remove('search_form[_token]'); // Form treatment after the "Export results" button has been pressed (= ask for a "content type" <-> "template" mapping) - if (null !== $response && $form->isSubmitted() && $form->isValid() && $request->query->get('search_form') && \array_key_exists('exportResults', $request->query->all('search_form'))) { + if (null !== $response && $form->isSubmitted() && $form->isValid() && \array_key_exists('exportResults', $request->query->all('search_form'))) { $exportForms = []; $contentTypes = $this->getAllContentType($response); foreach ($contentTypes as $name) { diff --git a/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryParamConverter.php b/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryParamConverter.php deleted file mode 100644 index c1f0438f7..000000000 --- a/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryParamConverter.php +++ /dev/null @@ -1,24 +0,0 @@ -attributes->set($configuration->getName(), new MediaLibraryRequest($request)); - - return true; - } - - public function supports(ParamConverter $configuration): bool - { - return MediaLibraryRequest::class === $configuration->getClass(); - } -} diff --git a/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryRequestValueResolver.php b/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryRequestValueResolver.php new file mode 100644 index 000000000..85ab2ab98 --- /dev/null +++ b/EMS/core-bundle/src/Core/Component/MediaLibrary/Request/MediaLibraryRequestValueResolver.php @@ -0,0 +1,20 @@ + + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable + { + return MediaLibraryRequest::class === $argument->getType() ? [new MediaLibraryRequest($request)] : []; + } +} diff --git a/EMS/core-bundle/src/Core/Config/ConfigParamConverter.php b/EMS/core-bundle/src/Core/Config/ConfigParamConverter.php deleted file mode 100644 index 54467047a..000000000 --- a/EMS/core-bundle/src/Core/Config/ConfigParamConverter.php +++ /dev/null @@ -1,44 +0,0 @@ - $configFactories - */ - public function __construct( - private readonly ServiceLocator $configFactories - ) { - } - - public function apply(Request $request, ParamConverter $configuration): bool - { - $hash = $request->attributes->getAlnum('hash'); - if (!\is_string($hash)) { - return false; - } - - $config = $this->getFactory($configuration->getClass())->createFromHash($hash); - $request->attributes->set($configuration->getName(), $config); - - return true; - } - - public function supports(ParamConverter $configuration): bool - { - return \is_subclass_of($configuration->getClass(), ConfigInterface::class); - } - - private function getFactory(string $configClass): ConfigFactoryInterface - { - return $this->configFactories->get($configClass); - } -} diff --git a/EMS/core-bundle/src/Core/Config/ConfigValueResolver.php b/EMS/core-bundle/src/Core/Config/ConfigValueResolver.php new file mode 100644 index 000000000..008080413 --- /dev/null +++ b/EMS/core-bundle/src/Core/Config/ConfigValueResolver.php @@ -0,0 +1,36 @@ + $configFactories + */ + public function __construct( + private ServiceLocator $configFactories + ) { + } + + /** + * @return iterable + */ + public function resolve(Request $request, ArgumentMetadata $argument): iterable + { + $argumentType = $argument->getType(); + if (!$argumentType || !\is_subclass_of($argumentType, ConfigInterface::class)) { + return []; + } + + $hash = $request->attributes->getAlnum('hash'); + + return [$this->configFactories->get($argumentType)->createFromHash($hash)]; + } +} diff --git a/EMS/core-bundle/src/Entity/FieldType.php b/EMS/core-bundle/src/Entity/FieldType.php index 7f1438e1f..5a2eb0fac 100644 --- a/EMS/core-bundle/src/Entity/FieldType.php +++ b/EMS/core-bundle/src/Entity/FieldType.php @@ -445,37 +445,14 @@ public function giveContentType(): ContentType return $parent->contentType; } - // /** - // * Cette focntion clone casse le CollectionFieldType => impossible d'ajouter un record - // */ - // public function __clone() - // { - // $this->children = new \Doctrine\Common\Collections\ArrayCollection (); - // $this->deleted = $this->deleted; - // $this->orderKey = $this->orderKey; - // $this->created = null; - // $this->modified = null; - // $this->description = $this->description; - // $this->id = 0; - // $this->name = $this->name ; - // $this->options = $this->options; - // $this->type = $this->type; - // } - - /** - * get a child. - * - * @throws \Exception - * - * @deprecated Use FieldType->get($key) - */ - public function __get(string $key): ?FieldType + public function get(string $key): FieldType { if (!\str_starts_with($key, 'ems_')) { throw new \Exception('unprotected ems get with key '.$key); } else { $key = \substr($key, 4); } + /** @var FieldType $fieldType */ foreach ($this->getChildren() as $fieldType) { if (!$fieldType->getDeleted() && 0 == \strcmp($key, $fieldType->getName())) { @@ -483,40 +460,7 @@ public function __get(string $key): ?FieldType } } - return null; - } - - public function get(string $key): FieldType - { - if (null === $fieldType = $this->__get($key)) { - throw new \RuntimeException(\sprintf('Field type for key "%s" not found', $key)); - } - - return $fieldType; - } - - /** - * @throws \Exception - */ - public function __set(string $key, mixed $input): void - { - if (!\str_starts_with($key, 'ems_')) { - throw new \Exception('unprotected ems set with key '.$key); - } else { - $key = \substr($key, 4); - } - $found = false; - /** @var FieldType $child */ - foreach ($this->children as &$child) { - if (!$child->getDeleted() && 0 == \strcmp($key, $child->getName())) { - $found = true; - $child = $input; - break; - } - } - if (!$found) { - $this->children->add($input); - } + throw new \RuntimeException(\sprintf('Field type for key "%s" not found', $key)); } public function setParent(FieldType $parent = null): self diff --git a/EMS/core-bundle/src/Form/FieldType/FieldTypeType.php b/EMS/core-bundle/src/Form/FieldType/FieldTypeType.php index 5964bb662..34ad73315 100644 --- a/EMS/core-bundle/src/Form/FieldType/FieldTypeType.php +++ b/EMS/core-bundle/src/Form/FieldType/FieldTypeType.php @@ -112,9 +112,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void if (!$field->getDeleted() && ($options['editSubfields'] || SubfieldType::class === $field->getType())) { $childFound = true; $builder->add('ems_'.$field->getName(), FieldTypeType::class, [ - 'data' => $field, - 'container' => true, - 'editSubfields' => $options['editSubfields'], + 'data' => $field, + 'container' => true, + 'mapped' => false, + 'editSubfields' => $options['editSubfields'], ]); } } diff --git a/EMS/core-bundle/src/Form/View/CalendarViewType.php b/EMS/core-bundle/src/Form/View/CalendarViewType.php index 1ac9aee90..182b65460 100644 --- a/EMS/core-bundle/src/Form/View/CalendarViewType.php +++ b/EMS/core-bundle/src/Form/View/CalendarViewType.php @@ -77,7 +77,7 @@ public function getParameters(View $view, FormFactoryInterface $formFactory, Req return [ 'view' => $view, - 'field' => $view->getContentType()->getFieldType()->__get('ems_'.$view->getOptions()['dateRangeField']), + 'field' => $view->getContentType()->getFieldType()->get('ems_'.$view->getOptions()['dateRangeField']), 'contentType' => $view->getContentType(), 'environment' => $view->getContentType()->getEnvironment(), 'form' => $form->createView(), diff --git a/EMS/core-bundle/src/Form/View/CriteriaViewType.php b/EMS/core-bundle/src/Form/View/CriteriaViewType.php index 15226ddae..4d083ba9e 100644 --- a/EMS/core-bundle/src/Form/View/CriteriaViewType.php +++ b/EMS/core-bundle/src/Form/View/CriteriaViewType.php @@ -85,7 +85,7 @@ public function getParameters(View $view, FormFactoryInterface $formFactory, Req $categoryField = false; if ($view->getContentType()->getCategoryField()) { - $categoryField = $view->getContentType()->getFieldType()->__get('ems_'.$view->getContentType()->getCategoryField()); + $categoryField = $view->getContentType()->getFieldType()->get('ems_'.$view->getContentType()->getCategoryField()); } return [ @@ -94,7 +94,7 @@ public function getParameters(View $view, FormFactoryInterface $formFactory, Req 'view' => $view, 'contentType' => $view->getContentType(), 'environment' => $view->getContentType()->getEnvironment(), - 'criterionList' => $view->getContentType()->getFieldType()->__get('ems_'.$view->getOptions()['criteriaField']), + 'criterionList' => $view->getContentType()->getFieldType()->get('ems_'.$view->getOptions()['criteriaField']), 'form' => $form->createView(), ]; } diff --git a/EMS/core-bundle/src/Form/View/GalleryViewType.php b/EMS/core-bundle/src/Form/View/GalleryViewType.php index 40c23ba19..c58ddc534 100644 --- a/EMS/core-bundle/src/Form/View/GalleryViewType.php +++ b/EMS/core-bundle/src/Form/View/GalleryViewType.php @@ -96,8 +96,8 @@ public function getParameters(View $view, FormFactoryInterface $formFactory, Req return [ 'view' => $view, - 'field' => $view->getContentType()->getFieldType()->__get('ems_'.$view->getOptions()['imageField']), - 'imageAssetConfigIdentifier' => $view->getContentType()->getFieldType()->__get('ems_'.$view->getOptions()['imageAssetConfigIdentifier']), + 'field' => $view->getContentType()->getFieldType()->get('ems_'.$view->getOptions()['imageField']), + 'imageAssetConfigIdentifier' => $view->getContentType()->getFieldType()->get('ems_'.$view->getOptions()['imageAssetConfigIdentifier']), 'contentType' => $view->getContentType(), 'environment' => $view->getContentType()->getEnvironment(), 'form' => $form->createView(), diff --git a/EMS/core-bundle/src/Resources/config/core.xml b/EMS/core-bundle/src/Resources/config/core.xml index a376991bc..fbf47a99a 100644 --- a/EMS/core-bundle/src/Resources/config/core.xml +++ b/EMS/core-bundle/src/Resources/config/core.xml @@ -11,9 +11,9 @@ - + - + controller.argument_value_resolver @@ -35,8 +35,8 @@ - - + + controller.argument_value_resolver diff --git a/composer.json b/composer.json index f644e15f9..0198d6f6d 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,6 @@ "caxy/php-htmldiff": "^0.1", "cebe/markdown": "^1.2", "composer/ca-bundle": "^1.4", - "doctrine/annotations": "^1.14", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.17", @@ -52,7 +51,6 @@ "psr/simple-cache": "^2.0", "ramsey/uuid-doctrine": "^1.8", "ruflin/elastica": "^7.3", - "sensio/framework-extra-bundle": "^6.2", "sensiolabs/ansi-to-html": "^1.2", "symfony-cmf/routing": "^3.0", "symfony/asset": "6.4.*", diff --git a/composer.lock b/composer.lock index 0a799dc15..9fb4a3a88 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a7fe2deb6d8ab413e23c8357e928aa53", + "content-hash": "8390436dad5c96036061799e097c5ab4", "packages": [ { "name": "aws/aws-crt-php", @@ -515,82 +515,6 @@ }, "time": "2023-08-25T16:18:39+00:00" }, - { - "name": "doctrine/annotations", - "version": "1.14.3", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^1 || ^2", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" - }, - "time": "2023-02-01T09:20:38+00:00" - }, { "name": "doctrine/cache", "version": "2.2.0", @@ -5769,84 +5693,6 @@ }, "time": "2021-12-11T13:40:54+00:00" }, - { - "name": "sensio/framework-extra-bundle", - "version": "v6.2.10", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.0|^2.0", - "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0" - }, - "conflict": { - "doctrine/doctrine-cache-bundle": "<1.3.1", - "doctrine/persistence": "<1.3" - }, - "require-dev": { - "doctrine/dbal": "^2.10|^3.0", - "doctrine/doctrine-bundle": "^1.11|^2.0", - "doctrine/orm": "^2.5", - "symfony/browser-kit": "^4.4|^5.0|^6.0", - "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", - "symfony/dom-crawler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/monolog-bridge": "^4.0|^5.0|^6.0", - "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", - "symfony/security-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", - "twig/twig": "^1.34|^2.4|^3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "6.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/" - }, - "exclude-from-classmap": [ - "/tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle provides a way to configure your controllers with annotations", - "keywords": [ - "annotations", - "controllers" - ], - "support": { - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" - }, - "abandoned": "Symfony", - "time": "2023-02-24T14:57:12+00:00" - }, { "name": "sensiolabs/ansi-to-html", "version": "v1.2.1", diff --git a/elasticms-admin/composer.json b/elasticms-admin/composer.json index bb9a028e3..43e0179b5 100644 --- a/elasticms-admin/composer.json +++ b/elasticms-admin/composer.json @@ -19,7 +19,6 @@ "ext-json": "*", "ext-openssl": "*", "ext-tidy": "*", - "doctrine/annotations": "^1.14", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.17", diff --git a/elasticms-admin/config/bundles.php b/elasticms-admin/config/bundles.php index 3cde9333c..7b37722b1 100644 --- a/elasticms-admin/config/bundles.php +++ b/elasticms-admin/config/bundles.php @@ -16,6 +16,5 @@ EMS\ClientHelperBundle\EMSClientHelperBundle::class => ['all' => true], EMS\FormBundle\EMSFormBundle::class => ['all' => true], EMS\SubmissionBundle\EMSSubmissionBundle::class => ['all' => true], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], ]; diff --git a/elasticms-admin/config/packages/doctrine.yaml b/elasticms-admin/config/packages/doctrine.yaml index 23ef30f9d..b4c279761 100644 --- a/elasticms-admin/config/packages/doctrine.yaml +++ b/elasticms-admin/config/packages/doctrine.yaml @@ -20,6 +20,7 @@ doctrine: auto_mapping: true enable_lazy_ghost_objects: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware + validate_xml_mapping: true when@prod: &doctrine_prod doctrine: diff --git a/elasticms-admin/config/packages/sensio_framework_extra.yaml b/elasticms-admin/config/packages/sensio_framework_extra.yaml deleted file mode 100644 index 1821ccc07..000000000 --- a/elasticms-admin/config/packages/sensio_framework_extra.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sensio_framework_extra: - router: - annotations: false diff --git a/elasticms-admin/symfony.lock b/elasticms-admin/symfony.lock index fa3b29067..3c080b2ee 100644 --- a/elasticms-admin/symfony.lock +++ b/elasticms-admin/symfony.lock @@ -26,15 +26,6 @@ "composer/xdebug-handler": { "version": "1.4.5" }, - "doctrine/annotations": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "cb4152ebcadbe620ea2261da1a1c5a9b8cea7672" - } - }, "doctrine/cache": { "version": "1.8.x-dev" }, @@ -328,18 +319,6 @@ "sebastian/version": { "version": "2.0.1" }, - "sensio/framework-extra-bundle": { - "version": "6.2", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "./config/packages/sensio_framework_extra.yaml" - ] - }, "sensiolabs/ansi-to-html": { "version": "1.1-dev" }, diff --git a/elasticms-cli/config/packages/doctrine.yaml b/elasticms-cli/config/packages/doctrine.yaml index 3fda3be10..9a654b883 100644 --- a/elasticms-cli/config/packages/doctrine.yaml +++ b/elasticms-cli/config/packages/doctrine.yaml @@ -11,6 +11,7 @@ doctrine: auto_mapping: true enable_lazy_ghost_objects: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware + validate_xml_mapping: true mappings: App: is_bundle: false diff --git a/elasticms-cli/symfony.lock b/elasticms-cli/symfony.lock index 620c07f00..aa48f703e 100644 --- a/elasticms-cli/symfony.lock +++ b/elasticms-cli/symfony.lock @@ -20,18 +20,6 @@ "composer/xdebug-handler": { "version": "3.0.1" }, - "doctrine/annotations": { - "version": "1.13", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "a2759dd6123694c8d901d0ec80006e044c2e6457" - }, - "files": [ - "./config/routes/annotations.yaml" - ] - }, "doctrine/cache": { "version": "2.1.1" }, diff --git a/elasticms-web/composer.json b/elasticms-web/composer.json index db126fea8..7cded5058 100644 --- a/elasticms-web/composer.json +++ b/elasticms-web/composer.json @@ -16,7 +16,6 @@ "ext-ctype": "*", "ext-iconv": "*", "ext-json": "*", - "doctrine/annotations": "^1.14", "doctrine/doctrine-bundle": "^2.11", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.17", @@ -24,7 +23,6 @@ "elasticms/form-bundle": "6.0.*", "elasticms/submission-bundle": "6.0.*", "endroid/qr-code-bundle": "^4.3", - "sensio/framework-extra-bundle": "^6.2", "symfony/console": "6.4.*", "symfony/dotenv": "6.4.*", "symfony/expression-language": "6.4.*", diff --git a/elasticms-web/config/bundles.php b/elasticms-web/config/bundles.php index 55f686fd9..533bb7be9 100644 --- a/elasticms-web/config/bundles.php +++ b/elasticms-web/config/bundles.php @@ -8,7 +8,6 @@ EMS\CommonBundle\EMSCommonBundle::class => ['all' => true], EMS\FormBundle\EMSFormBundle::class => ['all' => true], EMS\SubmissionBundle\EMSSubmissionBundle::class => ['all' => true], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], diff --git a/elasticms-web/config/packages/doctrine.yaml b/elasticms-web/config/packages/doctrine.yaml index 23ef30f9d..b4c279761 100644 --- a/elasticms-web/config/packages/doctrine.yaml +++ b/elasticms-web/config/packages/doctrine.yaml @@ -20,6 +20,7 @@ doctrine: auto_mapping: true enable_lazy_ghost_objects: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware + validate_xml_mapping: true when@prod: &doctrine_prod doctrine: diff --git a/elasticms-web/config/packages/sensio_framework_extra.yaml b/elasticms-web/config/packages/sensio_framework_extra.yaml deleted file mode 100644 index 1821ccc07..000000000 --- a/elasticms-web/config/packages/sensio_framework_extra.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sensio_framework_extra: - router: - annotations: false diff --git a/elasticms-web/symfony.lock b/elasticms-web/symfony.lock index dbdbb1142..b66d61a04 100644 --- a/elasticms-web/symfony.lock +++ b/elasticms-web/symfony.lock @@ -32,15 +32,6 @@ "dasprid/enum": { "version": "1.0.3" }, - "doctrine/annotations": { - "version": "1.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "1.0", - "ref": "cb4152ebcadbe620ea2261da1a1c5a9b8cea7672" - } - }, "doctrine/cache": { "version": "v1.7.1" }, @@ -355,18 +346,6 @@ "sebastian/version": { "version": "3.0.2" }, - "sensio/framework-extra-bundle": { - "version": "5.6", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "./config/packages/sensio_framework_extra.yaml" - ] - }, "symfony-cmf/routing": { "version": "2.1.0" }, diff --git a/symfony.lock b/symfony.lock index 58a977071..c8e300480 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,13 +1,4 @@ { - "doctrine/annotations": { - "version": "1.14", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "1.10", - "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" - } - }, "doctrine/doctrine-bundle": { "version": "2.11", "recipe": { @@ -112,18 +103,6 @@ "ref": "471aed0fbf5620b8d7f92b7a5ebbbf6c0945c27a" } }, - "sensio/framework-extra-bundle": { - "version": "6.2", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "config/packages/sensio_framework_extra.yaml" - ] - }, "sensiolabs/ansi-to-html": { "version": "1.2", "recipe": {