Commit 068be70f by Damien Moulard

Symfony 7.4, Doctrine ORM 3, API Platform 4, Lexik Translation 8

- Symfony 7.4, Doctrine ORM 3.7 (DBAL 3), API Platform 4.4 (security
  advisories fixed), Lexik Translation 8.1, ramsey/uuid-doctrine 2,
  Knp Paginator 6, Vich 2, GrumPHP 2, Flex 2; proxy-manager-bridge removed.
- Doctrine subscribers -> listeners: Symfony 7 silently ignores the
  doctrine.event_subscriber tag (UserFieldsDoctrineListener, FluxListener,
  UnitOfWorkListener were no longer called). ListenersTest added.
- ORM 3 stricter mapping: JoinTable removed from inverse sides (they were
  ignored), wrong inversedBy removed (AchatMonnaieAConfirmer, SolidoumeParameter),
  fully qualified target entities; the mapping is now valid.
- JSON columns kept in LONGTEXT (App\Doctrine\Type\JsonTextType, as the
  removed Sonata json type) instead of native JSON columns.
- Migration: Sonata Media 4.20 / Lexik 8 column changes.
- Impersonation: IS_IMPERSONATOR instead of ROLE_PREVIOUS_ADMIN (no longer
  granted since Symfony 6: the exit link was hidden), SwitchUserSubscriber
  token rebuilt without the removed SwitchUserRole.
- Security class, SecurityRequestAttributes, repositories getEntityManager(),
  setParameter() instead of array setParameters().
- API Platform 4: use_symfony_listeners, docs formats, OpenAPI parameters;
  responses unchanged except the Content-Type charset.
- JSON adherent export: the cotisation profile as in the CSV export (the
  Doctrine proxy was exported).
- Baseline: PHP errors are now 500 responses (handle_all_throwables).
parent 09f891bd
...@@ -73,4 +73,6 @@ reconversions/* ...@@ -73,4 +73,6 @@ reconversions/*
#dir containing ccas transactions csv #dir containing ccas transactions csv
ccastransactions/* ccastransactions/*
!ccastransactions/.versionme !ccastransactions/.versionme
\ No newline at end of file # Generated by Symfony 7.4 (configuration array shapes for the IDE)
/config/reference.php
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"andrew-svirin/ebics-client-php": "^2.1", "andrew-svirin/ebics-client-php": "^2.1",
"api-platform/core": "^3.4", "api-platform/core": "^4.1",
"beberlei/doctrineextensions": "^1.3", "beberlei/doctrineextensions": "^1.3",
"composer/package-versions-deprecated": "1.*", "composer/package-versions-deprecated": "1.*",
"cron/cron-bundle": "^3.2", "cron/cron-bundle": "^3.2",
...@@ -30,16 +30,16 @@ ...@@ -30,16 +30,16 @@
"doctrine/doctrine-fixtures-bundle": "^3.4", "doctrine/doctrine-fixtures-bundle": "^3.4",
"doctrine/doctrine-migrations-bundle": "^3.0", "doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/migrations": "^3.1", "doctrine/migrations": "^3.1",
"doctrine/orm": "^2.7", "doctrine/orm": "^3.3",
"ekyna/payum-payzen": "@dev", "ekyna/payum-payzen": "@dev",
"geocoder-php/cache-provider": "^4.3", "geocoder-php/cache-provider": "^4.3",
"geocoder-php/google-maps-provider": "^4.6", "geocoder-php/google-maps-provider": "^4.6",
"geocoder-php/nominatim-provider": "^5.4", "geocoder-php/nominatim-provider": "^5.4",
"gregwar/captcha-bundle": "^2.2", "gregwar/captcha-bundle": "^2.2",
"hautelook/alice-bundle": "^2.9", "hautelook/alice-bundle": "^2.9",
"knplabs/knp-paginator-bundle": "^5.8", "knplabs/knp-paginator-bundle": "^6.6",
"knpuniversity/oauth2-client-bundle": "^2.8", "knpuniversity/oauth2-client-bundle": "^2.8",
"lexik/translation-bundle": "^6.0", "lexik/translation-bundle": "^8.1",
"liip/imagine-bundle": "^2.8", "liip/imagine-bundle": "^2.8",
"nelmio/cors-bundle": "^2.1", "nelmio/cors-bundle": "^2.1",
"nyholm/psr7": "^1.8", "nyholm/psr7": "^1.8",
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
"php-http/message": "^1.7", "php-http/message": "^1.7",
"phpdocumentor/reflection-docblock": "^5.2", "phpdocumentor/reflection-docblock": "^5.2",
"phpseclib/phpseclib": "~3.0", "phpseclib/phpseclib": "~3.0",
"ramsey/uuid-doctrine": "^1.8", "ramsey/uuid-doctrine": "^2.1",
"shivas/versioning-bundle": "^3.2 || ^4.0", "shivas/versioning-bundle": "^3.2 || ^4.0",
"sonata-project/admin-bundle": "^4.43", "sonata-project/admin-bundle": "^4.43",
"sonata-project/block-bundle": "^5.5", "sonata-project/block-bundle": "^5.5",
...@@ -64,32 +64,31 @@ ...@@ -64,32 +64,31 @@
"sonata-project/twig-extensions": "^2.6", "sonata-project/twig-extensions": "^2.6",
"stof/doctrine-extensions-bundle": "^1.7", "stof/doctrine-extensions-bundle": "^1.7",
"symfony/apache-pack": "^1.0", "symfony/apache-pack": "^1.0",
"symfony/asset": "6.4.*", "symfony/asset": "7.4.*",
"symfony/cache": "6.4.*", "symfony/cache": "7.4.*",
"symfony/console": "6.4.*", "symfony/console": "7.4.*",
"symfony/dotenv": "6.4.*", "symfony/dotenv": "7.4.*",
"symfony/expression-language": "6.4.*", "symfony/expression-language": "7.4.*",
"symfony/flex": "^1.2", "symfony/flex": "^2.4",
"symfony/form": "6.4.*", "symfony/form": "7.4.*",
"symfony/framework-bundle": "6.4.*", "symfony/framework-bundle": "7.4.*",
"symfony/http-client": "6.4.*", "symfony/http-client": "7.4.*",
"symfony/mailer": "6.4.*", "symfony/mailer": "7.4.*",
"symfony/monolog-bundle": "3.*", "symfony/monolog-bundle": "3.*",
"symfony/process": "6.4.*", "symfony/process": "7.4.*",
"symfony/property-access": "6.4.*", "symfony/property-access": "7.4.*",
"symfony/property-info": "6.4.*", "symfony/property-info": "7.4.*",
"symfony/proxy-manager-bridge": "6.4.*", "symfony/security-bundle": "7.4.*",
"symfony/security-bundle": "6.4.*", "symfony/serializer": "7.4.*",
"symfony/serializer": "6.4.*", "symfony/translation": "7.4.*",
"symfony/translation": "6.4.*", "symfony/twig-bundle": "7.4.*",
"symfony/twig-bundle": "6.4.*", "symfony/validator": "7.4.*",
"symfony/validator": "6.4.*", "symfony/web-link": "7.4.*",
"symfony/web-link": "6.4.*", "symfony/webpack-encore-bundle": "^2.2",
"symfony/webpack-encore-bundle": "^1.14", "symfony/yaml": "7.4.*",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^2.12|^3.0", "twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0", "twig/twig": "^2.12|^3.0",
"vich/uploader-bundle": "1.*", "vich/uploader-bundle": "^2.5",
"willdurand/geocoder-bundle": "^5.0" "willdurand/geocoder-bundle": "^5.0"
}, },
"require-dev": { "require-dev": {
...@@ -99,17 +98,17 @@ ...@@ -99,17 +98,17 @@
"maglnet/composer-require-checker": "^3.0 || ^4.0", "maglnet/composer-require-checker": "^3.0 || ^4.0",
"masterminds/html5": "^2.12", "masterminds/html5": "^2.12",
"phpmd/phpmd": "^2.9", "phpmd/phpmd": "^2.9",
"phpro/grumphp": "^1.5", "phpro/grumphp": "^2.10",
"phpunit/phpunit": "^9.6", "phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3.7", "squizlabs/php_codesniffer": "^3.7",
"symfony/browser-kit": "6.4.*", "symfony/browser-kit": "7.4.*",
"symfony/css-selector": "6.4.*", "symfony/css-selector": "7.4.*",
"symfony/debug-bundle": "6.4.*", "symfony/debug-bundle": "7.4.*",
"symfony/maker-bundle": "^1.0", "symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^6.4", "symfony/phpunit-bridge": "^7.4",
"symfony/stopwatch": "6.4.*", "symfony/stopwatch": "7.4.*",
"symfony/var-dumper": "6.4.*", "symfony/var-dumper": "7.4.*",
"symfony/web-profiler-bundle": "6.4.*" "symfony/web-profiler-bundle": "7.4.*"
}, },
"config": { "config": {
"preferred-install": { "preferred-install": {
...@@ -162,7 +161,7 @@ ...@@ -162,7 +161,7 @@
"extra": { "extra": {
"symfony": { "symfony": {
"allow-contrib": true, "allow-contrib": true,
"require": "6.4.*" "require": "7.4.*"
} }
}, },
"repositories": [ "repositories": [
......
This source diff could not be displayed because it is too large. You can view the blob instead.
api_platform: api_platform:
title: 'API Kohinos' title: 'API Kohinos'
# API Platform 4: keep the Symfony event listeners of API Platform 3 (the custom controller of /api/public/poi/all
# returns data which is serialized by these listeners)
use_symfony_listeners: true
# /api/docs.json: OpenAPI documentation, as with API Platform 3
docs_formats:
jsonopenapi: ['application/vnd.openapi+json']
json: ['application/json']
html: ['text/html']
defaults: defaults:
# API Platform 3 omits the null fields by default: keep them, as before # API Platform 3 omits the null fields by default: keep them, as before
normalization_context: normalization_context:
......
...@@ -15,13 +15,15 @@ doctrine: ...@@ -15,13 +15,15 @@ doctrine:
collate: utf8_general_ci collate: utf8_general_ci
url: '%env(resolve:DATABASE_URL)%' url: '%env(resolve:DATABASE_URL)%'
types: types:
# LONGTEXT storage, as with the former Sonata json type (see App\Doctrine\Type\JsonTextType)
json: App\Doctrine\Type\JsonTextType
uuid: Ramsey\Uuid\Doctrine\UuidType uuid: Ramsey\Uuid\Doctrine\UuidType
uuid_binary: Ramsey\Uuid\Doctrine\UuidBinaryType uuid_binary: Ramsey\Uuid\Doctrine\UuidBinaryType
uuid_binary_ordered_time: Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType uuid_binary_ordered_time: Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType
encrypted_text: App\Doctrine\Type\EncryptedTextType encrypted_text: App\Doctrine\Type\EncryptedTextType
personal_data: App\Doctrine\Type\LegacyPersonalDataType personal_data: App\Doctrine\Type\LegacyPersonalDataType
# Removed from DBAL 3: only for the old migrations, which create payment.details with this type comment # Removed from DBAL 3: only for the old migrations, which create payment.details with this type comment
json_array: Doctrine\DBAL\Types\JsonType json_array: App\Doctrine\Type\JsonTextType
mapping_types: mapping_types:
uuid_binary: binary uuid_binary: binary
uuid_binary_ordered_time: binary uuid_binary_ordered_time: binary
......
security: security:
enable_authenticator_manager: true
# https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers # https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
providers: providers:
app_user_provider: app_user_provider:
......
...@@ -101,10 +101,6 @@ services: ...@@ -101,10 +101,6 @@ services:
# tags: # tags:
# - { name: doctrine.event_subscriber, connection: default } # - { name: doctrine.event_subscriber, connection: default }
# cache doctrine for bazinga geocoder
mlc_cache_adapter:
class: Doctrine\Common\Cache\ApcCache
# add more service definitions when explicit configuration is needed # add more service definitions when explicit configuration is needed
# please note that last definitions always *replace* previous ones # please note that last definitions always *replace* previous ones
apikey_authenticator: apikey_authenticator:
...@@ -192,7 +188,7 @@ services: ...@@ -192,7 +188,7 @@ services:
app.listener.unitofwork: app.listener.unitofwork:
class: App\Listener\UnitOfWorkListener class: App\Listener\UnitOfWorkListener
tags: tags:
- { name: doctrine.event_subscriber, connection: default } - { name: doctrine.event_listener, event: onFlush, connection: default }
app.twig.form.extension: app.twig.form.extension:
class: App\Twig\FormExtension class: App\Twig\FormExtension
...@@ -226,7 +222,8 @@ services: ...@@ -226,7 +222,8 @@ services:
App\EventListener\UserFieldsDoctrineListener: App\EventListener\UserFieldsDoctrineListener:
tags: tags:
- { name: doctrine.event_subscriber, connection: default } - { name: doctrine.event_listener, event: prePersist, connection: default }
- { name: doctrine.event_listener, event: preUpdate, connection: default }
App\Admin\Security\EditableRolesBuilder: App\Admin\Security\EditableRolesBuilder:
arguments: arguments:
...@@ -309,7 +306,7 @@ services: ...@@ -309,7 +306,7 @@ services:
app.flux.listener: app.flux.listener:
class: App\Listener\FluxListener class: App\Listener\FluxListener
tags: tags:
- { name: doctrine.event_subscriber, connection: default } - { name: doctrine.event_listener, event: onFlush, connection: default }
app.hidden_entity_type_extension: app.hidden_entity_type_extension:
class: App\Form\HiddenEntityExtension class: App\Form\HiddenEntityExtension
......
...@@ -12,8 +12,8 @@ use Sonata\DoctrineORMAdminBundle\Filter\BooleanFilter; ...@@ -12,8 +12,8 @@ use Sonata\DoctrineORMAdminBundle\Filter\BooleanFilter;
use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter; use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter;
use Sonata\Form\Type\BooleanType; use Sonata\Form\Type\BooleanType;
use Sonata\Form\Type\DateTimeRangePickerType; use Sonata\Form\Type\DateTimeRangePickerType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des flux 'Demande d'achat de monnaie'. * Administration des flux 'Demande d'achat de monnaie'.
......
...@@ -35,6 +35,7 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface; ...@@ -35,6 +35,7 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter; use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter;
use Sonata\Form\Type\DateTimeRangePickerType; use Sonata\Form\Type\DateTimeRangePickerType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
...@@ -48,7 +49,6 @@ use Symfony\Component\Form\FormError; ...@@ -48,7 +49,6 @@ use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Validator\Constraints\GreaterThanOrEqual; use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
/** /**
......
...@@ -19,9 +19,9 @@ use Sonata\AdminBundle\Form\FormMapper; ...@@ -19,9 +19,9 @@ use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Sonata\MediaBundle\Form\Type\MediaType; use Sonata\MediaBundle\Form\Type\MediaType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des comptoirs. * Administration des comptoirs.
......
...@@ -15,13 +15,13 @@ use Sonata\AdminBundle\Datagrid\ListMapper; ...@@ -15,13 +15,13 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Form\FormMapper; use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Form\Extension\Core\Type\MoneyType;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Validator\Constraints\Regex; use Symfony\Component\Validator\Constraints\Regex;
/** /**
......
...@@ -13,10 +13,10 @@ use Sonata\AdminBundle\Datagrid\ListMapper; ...@@ -13,10 +13,10 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Form\FormMapper; use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\MoneyType; use Symfony\Component\Form\Extension\Core\Type\MoneyType;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Validator\Constraints\Regex; use Symfony\Component\Validator\Constraints\Regex;
/** /**
......
...@@ -7,9 +7,9 @@ use Sonata\AdminBundle\Admin\AbstractAdmin; ...@@ -7,9 +7,9 @@ use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Form\FormMapper; use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des tags/états des prestataires (rappel, suspendus, ...). * Administration des tags/états des prestataires (rappel, suspendus, ...).
......
...@@ -13,8 +13,8 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface; ...@@ -13,8 +13,8 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter; use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter;
use Sonata\Form\Type\DateTimeRangePickerType; use Sonata\Form\Type\DateTimeRangePickerType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SChoiceType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des Flux. * Administration des Flux.
......
...@@ -13,11 +13,11 @@ use Sonata\AdminBundle\Form\FormMapper; ...@@ -13,11 +13,11 @@ use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\MediaBundle\Form\Type\MediaType; use Sonata\MediaBundle\Form\Type\MediaType;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des groupe de prestataires (amap, marche). * Administration des groupe de prestataires (amap, marche).
......
...@@ -11,8 +11,8 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface; ...@@ -11,8 +11,8 @@ use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter; use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter; use Sonata\DoctrineORMAdminBundle\Filter\DateTimeRangeFilter;
use Sonata\Form\Type\DateTimeRangePickerType; use Sonata\Form\Type\DateTimeRangePickerType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des opérations. * Administration des opérations.
......
...@@ -9,11 +9,11 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper; ...@@ -9,11 +9,11 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Form\FormMapper; use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des pages. * Administration des pages.
......
...@@ -42,6 +42,7 @@ use Sonata\MediaBundle\Form\Type\MediaType; ...@@ -42,6 +42,7 @@ use Sonata\MediaBundle\Form\Type\MediaType;
use Sonata\MediaBundle\Provider\MediaProviderInterface; use Sonata\MediaBundle\Provider\MediaProviderInterface;
use Sonata\MediaBundle\Provider\Pool; use Sonata\MediaBundle\Provider\Pool;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
...@@ -53,7 +54,6 @@ use Symfony\Component\Form\FormError; ...@@ -53,7 +54,6 @@ use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des prestataires. * Administration des prestataires.
......
...@@ -7,7 +7,7 @@ use App\Entity\User; ...@@ -7,7 +7,7 @@ use App\Entity\User;
use Sonata\AdminBundle\Datagrid\DatagridMapper; use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Datagrid\ProxyQueryInterface; use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
use Symfony\Component\Security\Core\Security; use Symfony\Bundle\SecurityBundle\Security;
/** /**
* Administration des reconversions (transfert d'un prestataire au siège). * Administration des reconversions (transfert d'un prestataire au siège).
......
...@@ -12,10 +12,10 @@ use Sonata\AdminBundle\Form\FormMapper; ...@@ -12,10 +12,10 @@ use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\MediaBundle\Form\Type\MediaType; use Sonata\MediaBundle\Form\Type\MediaType;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des rubriques. * Administration des rubriques.
......
...@@ -9,9 +9,9 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper; ...@@ -9,9 +9,9 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper; use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Form\FormMapper; use Sonata\AdminBundle\Form\FormMapper;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des tiers financeurs. * Administration des tiers financeurs.
......
...@@ -9,9 +9,9 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper; ...@@ -9,9 +9,9 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ProxyQueryInterface; use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
use Sonata\AdminBundle\Route\RouteCollectionInterface; use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Filter\StringFilter; use Sonata\DoctrineORMAdminBundle\Filter\StringFilter;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Security\Core\Security;
/** /**
* Administration des transferts. * Administration des transferts.
......
...@@ -7,12 +7,12 @@ use App\Entity\GlobalParameter; ...@@ -7,12 +7,12 @@ use App\Entity\GlobalParameter;
use App\Utils\CustomEntityManager; use App\Utils\CustomEntityManager;
use App\Utils\TAVCotisationUtils; use App\Utils\TAVCotisationUtils;
use Sonata\AdminBundle\Controller\CRUDController; use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
class AdherentAdminController extends CRUDController class AdherentAdminController extends CRUDController
......
...@@ -18,6 +18,7 @@ use App\Utils\CustomEntityManager; ...@@ -18,6 +18,7 @@ use App\Utils\CustomEntityManager;
use App\Utils\HelloassoUtils; use App\Utils\HelloassoUtils;
use App\Utils\OperationUtils; use App\Utils\OperationUtils;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security as SecurityS;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
...@@ -26,7 +27,6 @@ use Symfony\Component\HttpFoundation\RequestStack; ...@@ -26,7 +27,6 @@ use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security as SecurityS;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
class AdminController extends AbstractController class AdminController extends AbstractController
......
...@@ -25,6 +25,7 @@ use Sonata\Exporter\Writer\JsonWriter; ...@@ -25,6 +25,7 @@ use Sonata\Exporter\Writer\JsonWriter;
use Sonata\Exporter\Writer\XlsWriter; use Sonata\Exporter\Writer\XlsWriter;
use Sonata\Exporter\Writer\XmlWriter; use Sonata\Exporter\Writer\XmlWriter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\Form\Form; use Symfony\Component\Form\Form;
...@@ -34,7 +35,6 @@ use Symfony\Component\HttpFoundation\Response; ...@@ -34,7 +35,6 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Component\Validator\Validator\ValidatorInterface;
......
...@@ -9,13 +9,13 @@ use League\OAuth2\Client\Provider\Exception\IdentityProviderException; ...@@ -9,13 +9,13 @@ use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
use League\OAuth2\Client\Provider\GenericProvider; use League\OAuth2\Client\Provider\GenericProvider;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Cache\Adapter\FilesystemAdapter; use Symfony\Component\Cache\Adapter\FilesystemAdapter;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Contracts\Cache\ItemInterface; use Symfony\Contracts\Cache\ItemInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\HttpClientInterface;
......
...@@ -14,12 +14,12 @@ use App\Utils\OperationUtils; ...@@ -14,12 +14,12 @@ use App\Utils\OperationUtils;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mime\Email; use Symfony\Component\Mime\Email;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
......
...@@ -34,10 +34,10 @@ use Behat\Transliterator\Transliterator; ...@@ -34,10 +34,10 @@ use Behat\Transliterator\Transliterator;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Sonata\AdminBundle\Controller\CRUDController; use Sonata\AdminBundle\Controller\CRUDController;
use Sonata\MediaBundle\Provider\Pool as MediaPool; use Sonata\MediaBundle\Provider\Pool as MediaPool;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
class ImportController extends CRUDController class ImportController extends CRUDController
......
...@@ -32,6 +32,7 @@ use Geocoder\Query\GeocodeQuery; ...@@ -32,6 +32,7 @@ use Geocoder\Query\GeocodeQuery;
use Geocoder\StatefulGeocoder; use Geocoder\StatefulGeocoder;
use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bridge\Doctrine\Attribute\MapEntity;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security as Secur;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpClient\Psr18Client; use Symfony\Component\HttpClient\Psr18Client;
...@@ -47,10 +48,10 @@ use Symfony\Component\Routing\RouterInterface; ...@@ -47,10 +48,10 @@ use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken; use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Core\Security as Secur;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Component\Security\Http\Authentication\UserAuthenticatorInterface; use Symfony\Component\Security\Http\Authentication\UserAuthenticatorInterface;
use Symfony\Component\Security\Http\SecurityRequestAttributes;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
class IndexController extends AbstractController class IndexController extends AbstractController
...@@ -109,7 +110,7 @@ class IndexController extends AbstractController ...@@ -109,7 +110,7 @@ class IndexController extends AbstractController
} }
/* Pour la modale de login => SecurityController loginAction */ /* Pour la modale de login => SecurityController loginAction */
$session = $request->getSession(); $session = $request->getSession();
$lastUsernameKey = Secur::LAST_USERNAME; $lastUsernameKey = SecurityRequestAttributes::LAST_USERNAME;
// last username entered by the user // last username entered by the user
$lastUsername = (null === $session) ? '' : $session->get($lastUsernameKey); $lastUsername = (null === $session) ? '' : $session->get($lastUsernameKey);
$csrfToken = $this->tokenManager $csrfToken = $this->tokenManager
...@@ -785,12 +786,12 @@ class IndexController extends AbstractController ...@@ -785,12 +786,12 @@ class IndexController extends AbstractController
$currentToken = $this->tokenStorage->getToken(); $currentToken = $this->tokenStorage->getToken();
if ($currentToken instanceof SwitchUserToken) { if ($currentToken instanceof SwitchUserToken) {
// Super admin impersonating the user: keep the impersonation (ROLE_PREVIOUS_ADMIN, exit link) // Super admin impersonating the user: keep the impersonation (IS_IMPERSONATOR, exit link)
$user = $this->getUser(); $user = $this->getUser();
$token = new SwitchUserToken( $token = new SwitchUserToken(
$user, $user,
'main', 'main',
array_merge($user->getRoles(), ['ROLE_PREVIOUS_ADMIN']), $user->getRoles(),
$currentToken->getOriginalToken(), $currentToken->getOriginalToken(),
$currentToken->getOriginatedFromUri() $currentToken->getOriginatedFromUri()
); );
......
...@@ -8,10 +8,10 @@ use App\Utils\OperationUtils; ...@@ -8,10 +8,10 @@ use App\Utils\OperationUtils;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Knp\Component\Pager\PaginatorInterface; use Knp\Component\Pager\PaginatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security as Secur;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security as Secur;
class OperationsController extends AbstractController class OperationsController extends AbstractController
{ {
......
...@@ -11,11 +11,11 @@ use App\Form\Type\ProducerSelfEvalPrestaQuizType; ...@@ -11,11 +11,11 @@ use App\Form\Type\ProducerSelfEvalPrestaQuizType;
use App\Form\Type\SelfEvalPrestaQuizType; use App\Form\Type\SelfEvalPrestaQuizType;
use App\Utils\CustomEntityManager; use App\Utils\CustomEntityManager;
use Sonata\AdminBundle\Controller\CRUDController; use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Core\Security;
class PrestataireAdminController extends CRUDController class PrestataireAdminController extends CRUDController
{ {
......
...@@ -11,11 +11,11 @@ use App\Form\Type\DistributorSelfEvalPrestaQuizType; ...@@ -11,11 +11,11 @@ use App\Form\Type\DistributorSelfEvalPrestaQuizType;
use App\Form\Type\ProducerSelfEvalPrestaQuizType; use App\Form\Type\ProducerSelfEvalPrestaQuizType;
use App\Form\Type\SelfEvalPrestaQuizType; use App\Form\Type\SelfEvalPrestaQuizType;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
class PrestatairesController extends FrontController class PrestatairesController extends FrontController
......
...@@ -13,12 +13,12 @@ use App\Form\Type\SolidoumeFormType; ...@@ -13,12 +13,12 @@ use App\Form\Type\SolidoumeFormType;
use App\Utils\OperationUtils; use App\Utils\OperationUtils;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Email; use Symfony\Component\Mime\Email;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Twig\Environment; use Twig\Environment;
class SolidoumeController extends AbstractController class SolidoumeController extends AbstractController
......
...@@ -10,9 +10,9 @@ use App\Form\Type\SolidoumeParameterFormType; ...@@ -10,9 +10,9 @@ use App\Form\Type\SolidoumeParameterFormType;
use App\Utils\CustomEntityManager; use App\Utils\CustomEntityManager;
use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Uuid;
use Sonata\AdminBundle\Controller\CRUDController; use Sonata\AdminBundle\Controller\CRUDController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Security;
class SolidoumeParameterController extends CRUDController class SolidoumeParameterController extends CRUDController
{ {
......
...@@ -26,6 +26,7 @@ use App\Utils\CotisationUtils; ...@@ -26,6 +26,7 @@ use App\Utils\CotisationUtils;
use App\Utils\OperationUtils; use App\Utils\OperationUtils;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\ExpressionLanguage\Expression; use Symfony\Component\ExpressionLanguage\Expression;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
...@@ -34,7 +35,6 @@ use Symfony\Component\HttpFoundation\Response; ...@@ -34,7 +35,6 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Email; use Symfony\Component\Mime\Email;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Twig\Environment; use Twig\Environment;
......
<?php
namespace App\Doctrine\Type;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\JsonType;
/**
* Doctrine's json type, stored in a LONGTEXT column as the former Sonata\Doctrine\Types\JsonType did
* (removed from sonata-project/doctrine-extensions 2). Doctrine's type would use the native MySQL JSON column type,
* which would require migrating the existing columns.
*/
class JsonTextType extends JsonType
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return $platform->getClobTypeDeclarationSQL($column);
}
}
...@@ -17,7 +17,7 @@ class AchatMonnaie extends Flux ...@@ -17,7 +17,7 @@ class AchatMonnaie extends Flux
public const TYPE_ACHAT_ADHERENT = 'achat_monnaie_adherent'; public const TYPE_ACHAT_ADHERENT = 'achat_monnaie_adherent';
public const TYPE_ACHAT_PRESTATAIRE = 'achat_monnaie_prestataire'; public const TYPE_ACHAT_PRESTATAIRE = 'achat_monnaie_prestataire';
#[ORM\ManyToOne(targetEntity: \Siege::class)] #[ORM\ManyToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
......
...@@ -37,7 +37,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface ...@@ -37,7 +37,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface
#[Groups(['read'])] #[Groups(['read'])]
protected $id; protected $id;
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'flux')] #[ORM\ManyToOne(targetEntity: User::class)]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
protected $operateur; protected $operateur;
...@@ -105,7 +105,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface ...@@ -105,7 +105,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface
#[ORM\Column(name: 'hash', type: 'text', options: ['default' => 'tmp'])] #[ORM\Column(name: 'hash', type: 'text', options: ['default' => 'tmp'])]
protected $hash = 'tmp'; protected $hash = 'tmp';
#[ORM\ManyToOne(targetEntity: \Siege::class)] #[ORM\ManyToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
...@@ -119,7 +119,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface ...@@ -119,7 +119,7 @@ abstract class AchatMonnaieAConfirmer implements FluxInterface
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
protected $reconverti = false; protected $reconverti = false;
#[ORM\OneToOne(targetEntity: \AchatMonnaie::class)] #[ORM\OneToOne(targetEntity: AchatMonnaie::class)]
#[ORM\JoinColumn(name: 'achatmonnaie_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'achatmonnaie_id', referencedColumnName: 'id', nullable: true)]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
protected $flux; protected $flux;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class AchatMonnaieAConfirmerAdherent extends AchatMonnaieAConfirmer class AchatMonnaieAConfirmerAdherent extends AchatMonnaieAConfirmer
{ {
#[ORM\ManyToOne(targetEntity: \Adherent::class)] #[ORM\ManyToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class AchatMonnaieAConfirmerPrestataire extends AchatMonnaieAConfirmer class AchatMonnaieAConfirmerPrestataire extends AchatMonnaieAConfirmer
{ {
#[ORM\ManyToOne(targetEntity: \Prestataire::class)] #[ORM\ManyToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
......
...@@ -14,14 +14,14 @@ class AchatMonnaieAdherent extends AchatMonnaie ...@@ -14,14 +14,14 @@ class AchatMonnaieAdherent extends AchatMonnaie
public const REFERENCE_ACHAT_MONNAIE_ADHERENT_EN_CB = 'Achat monnaie en CB Adhérent'; public const REFERENCE_ACHAT_MONNAIE_ADHERENT_EN_CB = 'Achat monnaie en CB Adhérent';
public const REFERENCE_ACHAT_MONNAIE_ADHERENT_EN_CB_RECURRENT = 'Achat monnaie en CB (récurrent) Adhérent'; public const REFERENCE_ACHAT_MONNAIE_ADHERENT_EN_CB_RECURRENT = 'Achat monnaie en CB (récurrent) Adhérent';
#[ORM\ManyToOne(targetEntity: \Adherent::class)] #[ORM\ManyToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
/** /**
* @var DonAdherent * @var DonAdherent
*/ */
#[ORM\OneToOne(targetEntity: \DonAdherent::class, cascade: ['persist'])] #[ORM\OneToOne(targetEntity: DonAdherent::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)]
protected $don; protected $don;
......
...@@ -11,14 +11,14 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,14 +11,14 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class AchatMonnaiePrestataire extends AchatMonnaie class AchatMonnaiePrestataire extends AchatMonnaie
{ {
#[ORM\ManyToOne(targetEntity: \Prestataire::class)] #[ORM\ManyToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
/** /**
* @var DonPrestataire * @var DonPrestataire
*/ */
#[ORM\OneToOne(targetEntity: \DonPrestataire::class, cascade: ['persist'])] #[ORM\OneToOne(targetEntity: DonPrestataire::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)]
protected $don; protected $don;
......
...@@ -61,19 +61,19 @@ class Adherent extends AccountableObject implements AccountableInterface ...@@ -61,19 +61,19 @@ class Adherent extends AccountableObject implements AccountableInterface
/** /**
* @var User * @var User
*/ */
#[ORM\OneToOne(targetEntity: \User::class, cascade: ['all'], mappedBy: 'adherent', fetch: 'LAZY')] #[ORM\OneToOne(targetEntity: User::class, cascade: ['all'], mappedBy: 'adherent', fetch: 'LAZY')]
protected $user; protected $user;
/** /**
* @var Groupe * @var Groupe
*/ */
#[ORM\ManyToOne(targetEntity: \Groupe::class, inversedBy: 'adherents')] #[ORM\ManyToOne(targetEntity: Groupe::class, inversedBy: 'adherents')]
private $groupe; private $groupe;
/** /**
* @var ArrayCollection|AccountAdherent[] * @var ArrayCollection|AccountAdherent[]
*/ */
#[ORM\OneToMany(targetEntity: \AccountAdherent::class, mappedBy: 'adherent', cascade: ['remove'])] #[ORM\OneToMany(targetEntity: AccountAdherent::class, mappedBy: 'adherent', cascade: ['remove'])]
private $accounts; private $accounts;
#[ORM\Column(type: 'string', length: 255, nullable: true)] #[ORM\Column(type: 'string', length: 255, nullable: true)]
...@@ -82,7 +82,7 @@ class Adherent extends AccountableObject implements AccountableInterface ...@@ -82,7 +82,7 @@ class Adherent extends AccountableObject implements AccountableInterface
/** /**
* @var ProfilDeCotisation * @var ProfilDeCotisation
*/ */
#[ORM\ManyToOne(targetEntity: \ProfilDeCotisation::class, cascade: ['persist'], inversedBy: 'beneficiaires')] #[ORM\ManyToOne(targetEntity: ProfilDeCotisation::class, cascade: ['persist'], inversedBy: 'beneficiaires')]
#[ORM\JoinColumn(name: 'profildecotisation_id', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')] #[ORM\JoinColumn(name: 'profildecotisation_id', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
private $profilDeCotisation; private $profilDeCotisation;
...@@ -135,7 +135,7 @@ class Adherent extends AccountableObject implements AccountableInterface ...@@ -135,7 +135,7 @@ class Adherent extends AccountableObject implements AccountableInterface
#[ORM\Column(type: 'string', length: 36, nullable: true, unique: true)] #[ORM\Column(type: 'string', length: 36, nullable: true, unique: true)]
private $anonymousToken; private $anonymousToken;
#[ORM\OneToOne(targetEntity: \ExternalAdherentData::class, cascade: ['persist', 'remove'], mappedBy: 'adherent', orphanRemoval: true)] #[ORM\OneToOne(targetEntity: ExternalAdherentData::class, cascade: ['persist', 'remove'], mappedBy: 'adherent', orphanRemoval: true)]
private ?ExternalAdherentData $externalData = null; private ?ExternalAdherentData $externalData = null;
#[ORM\OneToMany(targetEntity: ExternalAdherentDatedData::class, mappedBy: 'adherent', orphanRemoval: true, cascade: ['persist'])] #[ORM\OneToMany(targetEntity: ExternalAdherentDatedData::class, mappedBy: 'adherent', orphanRemoval: true, cascade: ['persist'])]
......
...@@ -21,7 +21,7 @@ class Change extends Flux ...@@ -21,7 +21,7 @@ class Change extends Flux
public const TYPE_CHANGE_ADHERENT_COMPTOIR = 'adherent_comptoir'; public const TYPE_CHANGE_ADHERENT_COMPTOIR = 'adherent_comptoir';
public const TYPE_CHANGE_PRESTATAIRE_COMPTOIR = 'prestataire_comptoir'; public const TYPE_CHANGE_PRESTATAIRE_COMPTOIR = 'prestataire_comptoir';
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class ChangeAdherentComptoir extends Change class ChangeAdherentComptoir extends Change
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class ChangePrestataireComptoir extends Change class ChangePrestataireComptoir extends Change
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
......
...@@ -65,20 +65,20 @@ class Comptoir extends AccountableObject implements AccountableInterface ...@@ -65,20 +65,20 @@ class Comptoir extends AccountableObject implements AccountableInterface
/** /**
* @var Groupe * @var Groupe
*/ */
#[ORM\ManyToOne(targetEntity: \Groupe::class, inversedBy: 'comptoirs')] #[ORM\ManyToOne(targetEntity: Groupe::class, inversedBy: 'comptoirs')]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => 'ASC'])]
private $groupe; private $groupe;
/** /**
* @var ArrayCollection|User[] * @var ArrayCollection|User[]
*/ */
#[ORM\ManyToMany(targetEntity: \User::class, inversedBy: 'comptoirsgeres', fetch: 'EXTRA_LAZY')] #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'comptoirsgeres', fetch: 'EXTRA_LAZY')]
private $gestionnaires; private $gestionnaires;
/** /**
* @var ArrayCollection|ContactComptoir[] * @var ArrayCollection|ContactComptoir[]
*/ */
#[ORM\OneToMany(targetEntity: \ContactComptoir::class, cascade: ['persist'], mappedBy: 'comptoir')] #[ORM\OneToMany(targetEntity: ContactComptoir::class, cascade: ['persist'], mappedBy: 'comptoir')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
#[MaxDepth(1)] #[MaxDepth(1)]
private $contacts; private $contacts;
...@@ -86,7 +86,7 @@ class Comptoir extends AccountableObject implements AccountableInterface ...@@ -86,7 +86,7 @@ class Comptoir extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|AccountComptoir[] * @var ArrayCollection|AccountComptoir[]
*/ */
#[ORM\OneToMany(targetEntity: \AccountComptoir::class, mappedBy: 'comptoir')] #[ORM\OneToMany(targetEntity: AccountComptoir::class, mappedBy: 'comptoir')]
private $accounts; private $accounts;
public function __construct() public function __construct()
......
...@@ -48,7 +48,7 @@ class ContactComptoir ...@@ -48,7 +48,7 @@ class ContactComptoir
/** /**
* @var Comptoir * @var Comptoir
*/ */
#[ORM\ManyToOne(targetEntity: \Comptoir::class, cascade: ['persist'], inversedBy: 'contacts')] #[ORM\ManyToOne(targetEntity: Comptoir::class, cascade: ['persist'], inversedBy: 'contacts')]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id', nullable: false)]
#[Groups(['cread', 'cwrite'])] #[Groups(['cread', 'cwrite'])]
#[MaxDepth(1)] #[MaxDepth(1)]
......
...@@ -46,7 +46,7 @@ class ContactPrestataire ...@@ -46,7 +46,7 @@ class ContactPrestataire
/** /**
* @var Prestataire * @var Prestataire
*/ */
#[ORM\ManyToOne(targetEntity: \Prestataire::class, cascade: ['persist'], inversedBy: 'contacts')] #[ORM\ManyToOne(targetEntity: Prestataire::class, cascade: ['persist'], inversedBy: 'contacts')]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)]
private $prestataire; private $prestataire;
......
...@@ -16,11 +16,11 @@ class Cotisation extends Flux ...@@ -16,11 +16,11 @@ class Cotisation extends Flux
public const TYPE_COTISATION_ADHERENT = 'cotisation_adherent'; public const TYPE_COTISATION_ADHERENT = 'cotisation_adherent';
public const TYPE_COTISATION_PRESTATAIRE = 'cotisation_prestataire'; public const TYPE_COTISATION_PRESTATAIRE = 'cotisation_prestataire';
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
#[ORM\OneToOne(targetEntity: \CotisationInfos::class, inversedBy: 'cotisation', cascade: ['persist'])] #[ORM\OneToOne(targetEntity: CotisationInfos::class, inversedBy: 'cotisation', cascade: ['persist'])]
#[ORM\JoinColumn(name: 'cotisationinfos_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'cotisationinfos_id', referencedColumnName: 'id', nullable: true)]
protected $cotisationInfos; protected $cotisationInfos;
......
...@@ -26,14 +26,14 @@ use Symfony\Component\Serializer\Annotation\Groups; ...@@ -26,14 +26,14 @@ use Symfony\Component\Serializer\Annotation\Groups;
#[ORM\Entity(repositoryClass: CotisationRepository::class)] #[ORM\Entity(repositoryClass: CotisationRepository::class)]
class CotisationAdherent extends Cotisation class CotisationAdherent extends Cotisation
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
/** /**
* @var DonAdherent * @var DonAdherent
*/ */
#[ORM\OneToOne(targetEntity: \DonAdherent::class, cascade: ['persist'])] #[ORM\OneToOne(targetEntity: DonAdherent::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)]
protected $don; protected $don;
......
...@@ -36,7 +36,7 @@ class CotisationInfos ...@@ -36,7 +36,7 @@ class CotisationInfos
#[Groups(['read'])] #[Groups(['read'])]
protected $id; protected $id;
#[ORM\OneToOne(targetEntity: \Cotisation::class, cascade: ['all'], mappedBy: 'cotisationInfos')] #[ORM\OneToOne(targetEntity: Cotisation::class, cascade: ['all'], mappedBy: 'cotisationInfos')]
protected $cotisation; protected $cotisation;
/** /**
......
...@@ -26,14 +26,14 @@ use Symfony\Component\Serializer\Annotation\Groups; ...@@ -26,14 +26,14 @@ use Symfony\Component\Serializer\Annotation\Groups;
#[ORM\Entity] #[ORM\Entity]
class CotisationPrestataire extends Cotisation class CotisationPrestataire extends Cotisation
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
/** /**
* @var DonPrestataire * @var DonPrestataire
*/ */
#[ORM\OneToOne(targetEntity: \DonPrestataire::class, cascade: ['persist'])] #[ORM\OneToOne(targetEntity: DonPrestataire::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'don_id', referencedColumnName: 'id', nullable: true)]
protected $don; protected $don;
......
...@@ -20,11 +20,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -20,11 +20,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class CotisationTavPrelevement extends CotisationTavApplication class CotisationTavPrelevement extends CotisationTavApplication
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -18,11 +18,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -18,11 +18,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class CotisationTavReversement extends CotisationTavApplication class CotisationTavReversement extends CotisationTavApplication
{ {
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -55,7 +55,7 @@ class Document ...@@ -55,7 +55,7 @@ class Document
/** /**
* @var User * @var User
*/ */
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'documents', cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'documents', cascade: ['persist'])]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
private $user; private $user;
......
...@@ -16,7 +16,7 @@ class Don extends Flux ...@@ -16,7 +16,7 @@ class Don extends Flux
public const TYPE_DON_ADHERENT = 'don_adherent'; public const TYPE_DON_ADHERENT = 'don_adherent';
public const TYPE_DON_PRESTATAIRE = 'don_prestataire'; public const TYPE_DON_PRESTATAIRE = 'don_prestataire';
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id', nullable: true)]
protected $destinataire; protected $destinataire;
......
...@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class DonAdherent extends Don class DonAdherent extends Don
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
......
...@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class DonPrestataire extends Don class DonPrestataire extends Don
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)]
protected $expediteur; protected $expediteur;
......
...@@ -12,7 +12,7 @@ class EmailToken ...@@ -12,7 +12,7 @@ class EmailToken
#[ORM\GeneratedValue(strategy: 'AUTO')] #[ORM\GeneratedValue(strategy: 'AUTO')]
protected $id; protected $id;
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'emailTokens')] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'emailTokens')]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', onDelete: 'CASCADE')] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', onDelete: 'CASCADE')]
private $user; private $user;
......
...@@ -11,7 +11,7 @@ trait GeolocEntityTrait ...@@ -11,7 +11,7 @@ trait GeolocEntityTrait
/** /**
* @var Geoloc * @var Geoloc
*/ */
#[ORM\OneToOne(targetEntity: \Geoloc::class, cascade: ['persist'], orphanRemoval: true)] #[ORM\OneToOne(targetEntity: Geoloc::class, cascade: ['persist'], orphanRemoval: true)]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $geoloc; private $geoloc;
......
...@@ -45,7 +45,7 @@ class EtatPrestataire ...@@ -45,7 +45,7 @@ class EtatPrestataire
/** /**
* @var ArrayCollection|EtatPrestataire[] * @var ArrayCollection|EtatPrestataire[]
*/ */
#[ORM\ManyToMany(targetEntity: \Prestataire::class, inversedBy: 'etats', cascade: ['persist'])] #[ORM\ManyToMany(targetEntity: Prestataire::class, inversedBy: 'etats', cascade: ['persist'])]
#[ORM\JoinTable(name: 'etats_prestataires')] #[ORM\JoinTable(name: 'etats_prestataires')]
protected $prestataires; protected $prestataires;
......
...@@ -18,11 +18,11 @@ class ExternalAdherentData ...@@ -18,11 +18,11 @@ class ExternalAdherentData
#[ORM\CustomIdGenerator(class: UuidGenerator::class)] #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
private $id; private $id;
#[ORM\OneToOne(targetEntity: \Adherent::class, inversedBy: 'externalData')] #[ORM\OneToOne(targetEntity: Adherent::class, inversedBy: 'externalData')]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false, unique: true)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false, unique: true)]
private ?Adherent $adherent = null; private ?Adherent $adherent = null;
#[ORM\ManyToOne(targetEntity: \ExternalDataAgeGroup::class)] #[ORM\ManyToOne(targetEntity: ExternalDataAgeGroup::class)]
#[ORM\JoinColumn(name: 'external_data_age_group_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'external_data_age_group_id', referencedColumnName: 'id', nullable: true)]
private $externalDataAgeGroup; private $externalDataAgeGroup;
...@@ -41,7 +41,7 @@ class ExternalAdherentData ...@@ -41,7 +41,7 @@ class ExternalAdherentData
#[ORM\Column(type: 'string', length: 255, nullable: true)] #[ORM\Column(type: 'string', length: 255, nullable: true)]
private $cohort; private $cohort;
#[ORM\ManyToOne(targetEntity: \ExternalDataCCMemberStatus::class)] #[ORM\ManyToOne(targetEntity: ExternalDataCCMemberStatus::class)]
#[ORM\JoinColumn(name: 'external_data_cc_member_status_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'external_data_cc_member_status_id', referencedColumnName: 'id', nullable: true)]
private $externalDataCCMemberStatus; private $externalDataCCMemberStatus;
......
...@@ -61,7 +61,7 @@ class Faq ...@@ -61,7 +61,7 @@ class Faq
/** /**
* @var User|null * @var User|null
*/ */
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'faqs', cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'faqs', cascade: ['persist'])]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
private $user; private $user;
......
...@@ -47,7 +47,7 @@ abstract class Flux implements FluxInterface ...@@ -47,7 +47,7 @@ abstract class Flux implements FluxInterface
#[Groups(['read'])] #[Groups(['read'])]
protected $id; protected $id;
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'flux')] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'flux')]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
protected $operateur; protected $operateur;
......
...@@ -61,7 +61,7 @@ class Geoloc ...@@ -61,7 +61,7 @@ class Geoloc
/** /**
* @var Subterritory * @var Subterritory
*/ */
#[ORM\ManyToOne(targetEntity: \Subterritory::class)] #[ORM\ManyToOne(targetEntity: Subterritory::class)]
#[ORM\JoinColumn(name: 'subterritory_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'subterritory_id', referencedColumnName: 'id', nullable: true)]
#[Groups(['poi'])] #[Groups(['poi'])]
private $subterritory; private $subterritory;
......
...@@ -40,7 +40,7 @@ class GeolocPrestataire ...@@ -40,7 +40,7 @@ class GeolocPrestataire
/** /**
* @var Prestataire * @var Prestataire
*/ */
#[ORM\ManyToOne(targetEntity: \Prestataire::class, cascade: ['persist'], inversedBy: 'geolocs')] #[ORM\ManyToOne(targetEntity: Prestataire::class, cascade: ['persist'], inversedBy: 'geolocs')]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)]
private $prestataire; private $prestataire;
......
...@@ -52,48 +52,48 @@ class Groupe extends AccountableObject implements AccountableInterface ...@@ -52,48 +52,48 @@ class Groupe extends AccountableObject implements AccountableInterface
/** /**
* @var Siege * @var Siege
*/ */
#[ORM\ManyToOne(targetEntity: \Siege::class, inversedBy: 'groupes')] #[ORM\ManyToOne(targetEntity: Siege::class, inversedBy: 'groupes')]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id', nullable: false)]
private $siege; private $siege;
/** /**
* @var ArrayCollection|Comptoir[] * @var ArrayCollection|Comptoir[]
*/ */
#[ORM\OneToMany(targetEntity: \Comptoir::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')] #[ORM\OneToMany(targetEntity: Comptoir::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => 'ASC'])]
private $comptoirs; private $comptoirs;
/** /**
* @var ArrayCollection|Prestataire[] * @var ArrayCollection|Prestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \Prestataire::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')] #[ORM\OneToMany(targetEntity: Prestataire::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')]
#[ORM\OrderBy(['raison' => 'ASC'])] #[ORM\OrderBy(['raison' => 'ASC'])]
private $prestataires; private $prestataires;
/** /**
* @var ArrayCollection|Groupeprestataire[] * @var ArrayCollection|Groupeprestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \Groupeprestataire::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')] #[ORM\OneToMany(targetEntity: Groupeprestataire::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')]
#[ORM\OrderBy(['name' => 'ASC'])] #[ORM\OrderBy(['name' => 'ASC'])]
private $groupeprestataires; private $groupeprestataires;
/** /**
* @var ArrayCollection|Adherent[] * @var ArrayCollection|Adherent[]
*/ */
#[ORM\OneToMany(targetEntity: \Adherent::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')] #[ORM\OneToMany(targetEntity: Adherent::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')]
#[ORM\OrderBy(['updatedAt' => 'ASC'])] #[ORM\OrderBy(['updatedAt' => 'ASC'])]
private $adherents; private $adherents;
/** /**
* @var ArrayCollection|User[] * @var ArrayCollection|User[]
*/ */
#[ORM\ManyToMany(targetEntity: \User::class, inversedBy: 'groupesgeres', fetch: 'EXTRA_LAZY')] #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'groupesgeres', fetch: 'EXTRA_LAZY')]
private $gestionnaires; private $gestionnaires;
/** /**
* @var ArrayCollection|AccountGroupe[] * @var ArrayCollection|AccountGroupe[]
*/ */
#[ORM\OneToMany(targetEntity: \AccountGroupe::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')] #[ORM\OneToMany(targetEntity: AccountGroupe::class, mappedBy: 'groupe', fetch: 'EXTRA_LAZY')]
private $accounts; private $accounts;
public function __construct() public function __construct()
......
...@@ -61,13 +61,13 @@ class Groupeprestataire ...@@ -61,13 +61,13 @@ class Groupeprestataire
/** /**
* @var ArrayCollection|Prestataire[] * @var ArrayCollection|Prestataire[]
*/ */
#[ORM\ManyToMany(targetEntity: \Prestataire::class, inversedBy: 'groupeprestataires', cascade: ['persist'])] #[ORM\ManyToMany(targetEntity: Prestataire::class, inversedBy: 'groupeprestataires', cascade: ['persist'])]
protected $prestataires; protected $prestataires;
/** /**
* @var Groupe * @var Groupe
*/ */
#[ORM\ManyToOne(targetEntity: \Groupe::class, inversedBy: 'groupeprestataires')] #[ORM\ManyToOne(targetEntity: Groupe::class, inversedBy: 'groupeprestataires')]
private $groupe; private $groupe;
/** /**
......
...@@ -29,18 +29,18 @@ class HelloAsso ...@@ -29,18 +29,18 @@ class HelloAsso
/** /**
* @var User * @var User
*/ */
#[ORM\ManyToOne(targetEntity: \User::class, cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: User::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
private $user; private $user;
/** /**
* @var Prestataire * @var Prestataire
*/ */
#[ORM\ManyToOne(targetEntity: \Prestataire::class, cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: Prestataire::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: true)]
private $prestataire; private $prestataire;
#[ORM\ManyToOne(targetEntity: \Adherent::class, cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: Adherent::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)]
protected $adherent; protected $adherent;
......
...@@ -37,7 +37,7 @@ class Import ...@@ -37,7 +37,7 @@ class Import
/** /**
* @var User * @var User
*/ */
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'imports', cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'imports', cascade: ['persist'])]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: true)]
private $user; private $user;
......
...@@ -5,13 +5,14 @@ namespace App\Entity; ...@@ -5,13 +5,14 @@ namespace App\Entity;
use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiProperty;
use ApiPlatform\Metadata\ApiResource; use ApiPlatform\Metadata\ApiResource;
use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\GetCollection;
use ApiPlatform\OpenApi\Model;
use App\Controller\MapController; use App\Controller\MapController;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\Groups;
/** /**
*/ */
#[ApiResource(operations: [new GetCollection(controller: MapController::class, input: false, output: Map::class, paginationEnabled: false, uriTemplate: '/public/poi/all', read: false, normalizationContext: ['groups' => ['read', 'poi']], openapiContext: ['parameters' => [['name' => 'geoloc', 'in' => 'query', 'description' => '[Latitude, Longitude], exemple : [45.123,4.023]', 'required' => false, 'type' => 'string'], ['name' => 'distance', 'in' => 'query', 'description' => 'Distance in kilometers', 'required' => false, 'type' => 'string']]], security: 'is_granted(\'ROLE_ADMIN_PRESTATAIRE_GERER_LIST\') or is_granted(\'ROLE_API\')')])] #[ApiResource(operations: [new GetCollection(controller: MapController::class, input: false, output: Map::class, paginationEnabled: false, uriTemplate: '/public/poi/all', read: false, normalizationContext: ['groups' => ['read', 'poi']], openapi: new Model\Operation(parameters: [new Model\Parameter('geoloc', 'query', '[Latitude, Longitude], exemple : [45.123,4.023]', false, schema: ['type' => 'string']), new Model\Parameter('distance', 'query', 'Distance in kilometers', false, schema: ['type' => 'string'])]), security: 'is_granted(\'ROLE_ADMIN_PRESTATAIRE_GERER_LIST\') or is_granted(\'ROLE_API\')')])]
class Map class Map
{ {
/** /**
...@@ -68,14 +69,14 @@ class Map ...@@ -68,14 +69,14 @@ class Map
/** /**
* @var Rubrique[] * @var Rubrique[]
*/ */
#[ORM\OneToMany(targetEntity: \Rubrique::class)] #[ORM\OneToMany(targetEntity: Rubrique::class)]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $rubriques; private $rubriques;
/** /**
* @var Geoloc[] * @var Geoloc[]
*/ */
#[ORM\OneToMany(targetEntity: \Geoloc::class)] #[ORM\OneToMany(targetEntity: Geoloc::class)]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $geolocs; private $geolocs;
......
...@@ -58,7 +58,7 @@ class News ...@@ -58,7 +58,7 @@ class News
#[ORM\Column(type: 'boolean', name: 'visible_by_all_groups')] #[ORM\Column(type: 'boolean', name: 'visible_by_all_groups')]
private $visibleByAllGroups = true; private $visibleByAllGroups = true;
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'news')] #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'news')]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)]
private $user; private $user;
......
...@@ -72,7 +72,7 @@ class Page ...@@ -72,7 +72,7 @@ class Page
/** /**
* @var User * @var User
*/ */
#[ORM\ManyToOne(targetEntity: \User::class, cascade: ['persist'], inversedBy: 'pages')] #[ORM\ManyToOne(targetEntity: User::class, cascade: ['persist'], inversedBy: 'pages')]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)]
private $user; private $user;
......
...@@ -190,14 +190,14 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -190,14 +190,14 @@ class Prestataire extends AccountableObject implements AccountableInterface
/** /**
* @var TypePrestataire * @var TypePrestataire
*/ */
#[ORM\ManyToOne(targetEntity: \TypePrestataire::class, cascade: ['persist'], inversedBy: 'prestataires')] #[ORM\ManyToOne(targetEntity: TypePrestataire::class, cascade: ['persist'], inversedBy: 'prestataires')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $typeprestataire; private $typeprestataire;
/** /**
* @var SelfEvalPrestaQuiz * @var SelfEvalPrestaQuiz
*/ */
#[ORM\OneToOne(targetEntity: \SelfEvalPrestaQuiz::class, cascade: ['persist'])] #[ORM\OneToOne(targetEntity: SelfEvalPrestaQuiz::class, cascade: ['persist'])]
#[ORM\JoinColumn(name: 'selfevalprestaquiz_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'selfevalprestaquiz_id', referencedColumnName: 'id', nullable: true)]
protected $selfevalprestaquiz; protected $selfevalprestaquiz;
...@@ -214,7 +214,7 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -214,7 +214,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|Rubrique[] * @var ArrayCollection|Rubrique[]
*/ */
#[ORM\ManyToMany(targetEntity: \Rubrique::class, mappedBy: 'prestataires', cascade: ['persist'], fetch: 'EXTRA_LAZY')] #[ORM\ManyToMany(targetEntity: Rubrique::class, mappedBy: 'prestataires', cascade: ['persist'], fetch: 'EXTRA_LAZY')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $rubriques; private $rubriques;
...@@ -229,21 +229,21 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -229,21 +229,21 @@ class Prestataire extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|GeolocPrestataire[] * @var ArrayCollection|GeolocPrestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \GeolocPrestataire::class, cascade: ['persist'], mappedBy: 'prestataire', fetch: 'LAZY')] #[ORM\OneToMany(targetEntity: GeolocPrestataire::class, cascade: ['persist'], mappedBy: 'prestataire', fetch: 'LAZY')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $geolocs; private $geolocs;
/** /**
* @var ArrayCollection|ContactPrestataire[] * @var ArrayCollection|ContactPrestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \ContactPrestataire::class, cascade: ['persist'], mappedBy: 'prestataire')] #[ORM\OneToMany(targetEntity: ContactPrestataire::class, cascade: ['persist'], mappedBy: 'prestataire')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $contacts; private $contacts;
/** /**
* @var ArrayCollection|User[] * @var ArrayCollection|User[]
*/ */
#[ORM\ManyToMany(targetEntity: \User::class, inversedBy: 'prestataires', cascade: ['persist'])] #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'prestataires', cascade: ['persist'])]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
protected $users; protected $users;
...@@ -253,7 +253,7 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -253,7 +253,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
/** /**
* @var Groupe * @var Groupe
*/ */
#[ORM\ManyToOne(targetEntity: \Groupe::class, inversedBy: 'prestataires', cascade: ['persist'])] #[ORM\ManyToOne(targetEntity: Groupe::class, inversedBy: 'prestataires', cascade: ['persist'])]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $groupe; private $groupe;
...@@ -262,8 +262,7 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -262,8 +262,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
* *
* @var ArrayCollection|Groupeprestataire[] * @var ArrayCollection|Groupeprestataire[]
*/ */
#[ORM\ManyToMany(targetEntity: \Groupeprestataire::class, cascade: ['persist'], mappedBy: 'prestataires')] #[ORM\ManyToMany(targetEntity: Groupeprestataire::class, cascade: ['persist'], mappedBy: 'prestataires')]
#[ORM\JoinTable(name: 'groupesprestataires')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $groupeprestataires; private $groupeprestataires;
...@@ -272,7 +271,7 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -272,7 +271,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
* *
* @var ArrayCollection|EtatPrestataire[] * @var ArrayCollection|EtatPrestataire[]
*/ */
#[ORM\ManyToMany(targetEntity: \EtatPrestataire::class, cascade: ['persist'], mappedBy: 'prestataires', fetch: 'EXTRA_LAZY')] #[ORM\ManyToMany(targetEntity: EtatPrestataire::class, cascade: ['persist'], mappedBy: 'prestataires', fetch: 'EXTRA_LAZY')]
#[Groups(['read', 'write'])] #[Groups(['read', 'write'])]
private $etats; private $etats;
...@@ -297,7 +296,7 @@ class Prestataire extends AccountableObject implements AccountableInterface ...@@ -297,7 +296,7 @@ class Prestataire extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|AccountPrestataire[] * @var ArrayCollection|AccountPrestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \AccountPrestataire::class, mappedBy: 'prestataire')] #[ORM\OneToMany(targetEntity: AccountPrestataire::class, mappedBy: 'prestataire')]
private $accounts; private $accounts;
#[ORM\Column(name: 'comments', type: 'text', nullable: true)] #[ORM\Column(name: 'comments', type: 'text', nullable: true)]
......
...@@ -46,7 +46,7 @@ class ProfilDeCotisation ...@@ -46,7 +46,7 @@ class ProfilDeCotisation
/** /**
* @var ArrayCollection|Adherent[] * @var ArrayCollection|Adherent[]
*/ */
#[ORM\OneToMany(targetEntity: \Adherent::class, cascade: ['persist'], mappedBy: 'profilDeCotisation')] #[ORM\OneToMany(targetEntity: Adherent::class, cascade: ['persist'], mappedBy: 'profilDeCotisation')]
private $beneficiaires; private $beneficiaires;
public function __construct() public function __construct()
......
...@@ -18,11 +18,11 @@ class Reconversion extends Flux ...@@ -18,11 +18,11 @@ class Reconversion extends Flux
{ {
public const TYPE_RECONVERSION_PRESTATAIRE = 'reconversion_prestataire'; public const TYPE_RECONVERSION_PRESTATAIRE = 'reconversion_prestataire';
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -21,7 +21,7 @@ class Retrait extends Flux ...@@ -21,7 +21,7 @@ class Retrait extends Flux
public const TYPE_RETRAIT_ADHERENT = 'retrait_adherent'; public const TYPE_RETRAIT_ADHERENT = 'retrait_adherent';
public const TYPE_RETRAIT_PRESTATAIRE = 'retrait_prestataire'; public const TYPE_RETRAIT_PRESTATAIRE = 'retrait_prestataire';
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class RetraitComptoirAdherent extends Retrait class RetraitComptoirAdherent extends Retrait
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class RetraitComptoirPrestataire extends Retrait class RetraitComptoirPrestataire extends Retrait
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -36,7 +36,7 @@ class Rubrique ...@@ -36,7 +36,7 @@ class Rubrique
/** /**
* @var ArrayCollection|Prestataire[] * @var ArrayCollection|Prestataire[]
*/ */
#[ORM\ManyToMany(targetEntity: \Prestataire::class, inversedBy: 'rubriques', cascade: ['persist'], fetch: 'EXTRA_LAZY')] #[ORM\ManyToMany(targetEntity: Prestataire::class, inversedBy: 'rubriques', cascade: ['persist'], fetch: 'EXTRA_LAZY')]
private $prestataires; private $prestataires;
/** /**
......
...@@ -35,7 +35,7 @@ class Siege extends AccountableObject implements AccountableInterface ...@@ -35,7 +35,7 @@ class Siege extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|Groupe[] * @var ArrayCollection|Groupe[]
*/ */
#[ORM\OneToMany(targetEntity: \Groupe::class, mappedBy: 'siege')] #[ORM\OneToMany(targetEntity: Groupe::class, mappedBy: 'siege')]
private $groupes; private $groupes;
/** /**
...@@ -53,7 +53,7 @@ class Siege extends AccountableObject implements AccountableInterface ...@@ -53,7 +53,7 @@ class Siege extends AccountableObject implements AccountableInterface
/** /**
* @var ArrayCollection|AccountSiege[] * @var ArrayCollection|AccountSiege[]
*/ */
#[ORM\OneToMany(targetEntity: \AccountSiege::class, mappedBy: 'siege')] #[ORM\OneToMany(targetEntity: AccountSiege::class, mappedBy: 'siege')]
private $accounts; private $accounts;
public function __construct() public function __construct()
......
...@@ -44,11 +44,11 @@ class SolidoumeItem ...@@ -44,11 +44,11 @@ class SolidoumeItem
#[Gedmo\Versioned] #[Gedmo\Versioned]
private $isDonation; private $isDonation;
#[ORM\ManyToOne(targetEntity: \Adherent::class)] #[ORM\ManyToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false)]
private $adherent; private $adherent;
#[ORM\ManyToOne(targetEntity: \User::class)] #[ORM\ManyToOne(targetEntity: User::class)]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)]
#[Gedmo\Versioned] #[Gedmo\Versioned]
private $user; private $user;
......
...@@ -53,7 +53,7 @@ class SolidoumeParameter ...@@ -53,7 +53,7 @@ class SolidoumeParameter
#[ORM\Column(type: 'integer')] #[ORM\Column(type: 'integer')]
private $executionDate; private $executionDate;
#[ORM\ManyToOne(targetEntity: \User::class, inversedBy: 'news')] #[ORM\ManyToOne(targetEntity: User::class)]
#[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id', nullable: false)]
private $user; private $user;
......
...@@ -15,11 +15,11 @@ class TicketFix extends Flux ...@@ -15,11 +15,11 @@ class TicketFix extends Flux
public const TYPE_TICKET_FIX_PRINT = 'ticket_print'; public const TYPE_TICKET_FIX_PRINT = 'ticket_print';
public const TYPE_TICKET_FIX_DESTROY = 'ticket_destroy'; public const TYPE_TICKET_FIX_DESTROY = 'ticket_destroy';
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -13,12 +13,12 @@ use Symfony\Component\Validator\Constraints as Assert; ...@@ -13,12 +13,12 @@ use Symfony\Component\Validator\Constraints as Assert;
#[ORM\HasLifecycleCallbacks] #[ORM\HasLifecycleCallbacks]
class TransactionAdherentAdherent extends Transaction class TransactionAdherentAdherent extends Transaction
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_dest_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $destinataire; protected $destinataire;
......
...@@ -13,12 +13,12 @@ use Symfony\Component\Validator\Constraints as Assert; ...@@ -13,12 +13,12 @@ use Symfony\Component\Validator\Constraints as Assert;
#[ORM\HasLifecycleCallbacks] #[ORM\HasLifecycleCallbacks]
class TransactionAdherentPrestataire extends Transaction class TransactionAdherentPrestataire extends Transaction
{ {
#[ORM\ManyToOne(targetEntity: \Adherent::class)] #[ORM\ManyToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: false)]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $expediteur; protected $expediteur;
#[ORM\ManyToOne(targetEntity: \Prestataire::class)] #[ORM\ManyToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id', nullable: false)]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $destinataire; protected $destinataire;
...@@ -27,7 +27,7 @@ class TransactionAdherentPrestataire extends Transaction ...@@ -27,7 +27,7 @@ class TransactionAdherentPrestataire extends Transaction
* If the transaction is cancelled, cancellerFlux is the * If the transaction is cancelled, cancellerFlux is the
* opposite TransactionPrestataireAdherent flux. * opposite TransactionPrestataireAdherent flux.
*/ */
#[ORM\ManyToOne(targetEntity: \Flux::class)] #[ORM\ManyToOne(targetEntity: Flux::class)]
#[ORM\JoinColumn(name: 'cancellerflux_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'cancellerflux_id', referencedColumnName: 'id', nullable: true)]
protected $cancellerFlux; protected $cancellerFlux;
......
...@@ -12,12 +12,12 @@ use Symfony\Component\Validator\Constraints as Assert; ...@@ -12,12 +12,12 @@ use Symfony\Component\Validator\Constraints as Assert;
#[ORM\Entity] #[ORM\Entity]
class TransactionPrestataireAdherent extends Transaction class TransactionPrestataireAdherent extends Transaction
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $destinataire; protected $destinataire;
......
...@@ -12,12 +12,12 @@ use Symfony\Component\Validator\Constraints as Assert; ...@@ -12,12 +12,12 @@ use Symfony\Component\Validator\Constraints as Assert;
#[ORM\Entity] #[ORM\Entity]
class TransactionPrestatairePrestataire extends Transaction class TransactionPrestatairePrestataire extends Transaction
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_dest_id', referencedColumnName: 'id')]
#[Assert\NotBlank] #[Assert\NotBlank]
protected $destinataire; protected $destinataire;
......
...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class TransfertComptoirGroupe extends Transfert class TransfertComptoirGroupe extends Transfert
{ {
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Groupe::class)] #[ORM\OneToOne(targetEntity: Groupe::class)]
#[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class TransfertGroupeComptoir extends Transfert class TransfertGroupeComptoir extends Transfert
{ {
#[ORM\OneToOne(targetEntity: \Groupe::class)] #[ORM\OneToOne(targetEntity: Groupe::class)]
#[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class TransfertGroupeSiege extends Transfert class TransfertGroupeSiege extends Transfert
{ {
#[ORM\OneToOne(targetEntity: \Groupe::class)] #[ORM\OneToOne(targetEntity: Groupe::class)]
#[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,11 +11,11 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class TransfertSiegeGroupe extends Transfert class TransfertSiegeGroupe extends Transfert
{ {
#[ORM\OneToOne(targetEntity: \Siege::class)] #[ORM\OneToOne(targetEntity: Siege::class)]
#[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'siege_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
#[ORM\OneToOne(targetEntity: \Groupe::class)] #[ORM\OneToOne(targetEntity: Groupe::class)]
#[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -36,7 +36,7 @@ class TypePrestataire ...@@ -36,7 +36,7 @@ class TypePrestataire
/** /**
* @var ArrayCollection|Prestataire[] * @var ArrayCollection|Prestataire[]
*/ */
#[ORM\OneToMany(targetEntity: \Prestataire::class, mappedBy: 'typeprestataire')] #[ORM\OneToMany(targetEntity: Prestataire::class, mappedBy: 'typeprestataire')]
#[Groups('read')] #[Groups('read')]
private $prestataires; private $prestataires;
......
...@@ -71,46 +71,43 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial ...@@ -71,46 +71,43 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, \Serial
/** /**
* @var ArrayCollection|Document[] * @var ArrayCollection|Document[]
*/ */
#[ORM\OneToMany(targetEntity: \Document::class, mappedBy: 'user', cascade: ['persist'])] #[ORM\OneToMany(targetEntity: Document::class, mappedBy: 'user', cascade: ['persist'])]
private $documents; private $documents;
/** /**
* @var ArrayCollection|Faq[] * @var ArrayCollection|Faq[]
*/ */
#[ORM\OneToMany(targetEntity: \Faq::class, mappedBy: 'user', cascade: ['persist'])] #[ORM\OneToMany(targetEntity: Faq::class, mappedBy: 'user', cascade: ['persist'])]
private $faqs; private $faqs;
/** /**
* @var ArrayCollection|Import[] * @var ArrayCollection|Import[]
*/ */
#[ORM\OneToMany(targetEntity: \Import::class, mappedBy: 'user', cascade: ['persist'])] #[ORM\OneToMany(targetEntity: Import::class, mappedBy: 'user', cascade: ['persist'])]
private $imports; private $imports;
#[ORM\OneToMany(targetEntity: \Flux::class, mappedBy: 'operateur', cascade: ['persist'])] #[ORM\OneToMany(targetEntity: Flux::class, mappedBy: 'operateur', cascade: ['persist'])]
#[ORM\OrderBy(['createdAt' => 'DESC'])] #[ORM\OrderBy(['createdAt' => 'DESC'])]
protected $flux; protected $flux;
#[ORM\OneToMany(targetEntity: \EmailToken::class, mappedBy: 'user', cascade: ['persist', 'remove'])] #[ORM\OneToMany(targetEntity: EmailToken::class, mappedBy: 'user', cascade: ['persist', 'remove'])]
#[ORM\OrderBy(['expiredAt' => 'DESC'])] #[ORM\OrderBy(['expiredAt' => 'DESC'])]
private $emailTokens; private $emailTokens;
#[ORM\OneToOne(targetEntity: \Adherent::class, inversedBy: 'user', cascade: ['all'], fetch: 'EXTRA_LAZY')] #[ORM\OneToOne(targetEntity: Adherent::class, inversedBy: 'user', cascade: ['all'], fetch: 'EXTRA_LAZY')]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id', nullable: true)]
protected $adherent; protected $adherent;
#[ORM\ManyToMany(targetEntity: Prestataire::class, mappedBy: 'users', cascade: ['persist'], fetch: 'EAGER')] #[ORM\ManyToMany(targetEntity: Prestataire::class, mappedBy: 'users', cascade: ['persist'], fetch: 'EAGER')]
#[ORM\JoinTable(name: 'user_prestataire', joinColumns: [new ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id')], inverseJoinColumns: [new ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')])]
protected $prestataires; protected $prestataires;
#[ORM\OneToMany(targetEntity: Caissier::class, mappedBy: 'user', orphanRemoval: true)] #[ORM\OneToMany(targetEntity: Caissier::class, mappedBy: 'user', orphanRemoval: true)]
private $caissiers; private $caissiers;
#[ORM\ManyToMany(targetEntity: Groupe::class, mappedBy: 'gestionnaires', cascade: ['persist'], fetch: 'EAGER')] #[ORM\ManyToMany(targetEntity: Groupe::class, mappedBy: 'gestionnaires', cascade: ['persist'], fetch: 'EAGER')]
#[ORM\JoinTable(name: 'user_groupe', joinColumns: [new ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id')], inverseJoinColumns: [new ORM\JoinColumn(name: 'groupe_id', referencedColumnName: 'id')])]
private $groupesgeres; private $groupesgeres;
#[ORM\ManyToMany(targetEntity: Comptoir::class, mappedBy: 'gestionnaires', cascade: ['persist'], fetch: 'EAGER')] #[ORM\ManyToMany(targetEntity: Comptoir::class, mappedBy: 'gestionnaires', cascade: ['persist'], fetch: 'EAGER')]
#[ORM\JoinTable(name: 'user_comptoir', joinColumns: [new ORM\JoinColumn(name: 'user_id', referencedColumnName: 'id')], inverseJoinColumns: [new ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')])]
private $comptoirsgeres; private $comptoirsgeres;
#[ORM\Column(name: 'apiKey', type: 'string', length: 255, nullable: true)] #[ORM\Column(name: 'apiKey', type: 'string', length: 255, nullable: true)]
......
...@@ -20,7 +20,7 @@ class Vente extends Flux ...@@ -20,7 +20,7 @@ class Vente extends Flux
public const TYPE_VENTE_ADHERENT = 'vente_adherent'; public const TYPE_VENTE_ADHERENT = 'vente_adherent';
public const TYPE_VENTE_PRESTATAIRE = 'vente_prestataire'; public const TYPE_VENTE_PRESTATAIRE = 'vente_prestataire';
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class VenteComptoirAdherent extends Vente class VenteComptoirAdherent extends Vente
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class VenteComptoirPrestataire extends Vente class VenteComptoirPrestataire extends Vente
{ {
#[ORM\OneToOne(targetEntity: \Prestataire::class)] #[ORM\OneToOne(targetEntity: Prestataire::class)]
#[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'prestataire_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
...@@ -20,7 +20,7 @@ class VenteEmlc extends Flux ...@@ -20,7 +20,7 @@ class VenteEmlc extends Flux
public const TYPE_VENTE_EMLC_ADHERENT = 'vente_emlc_adherent'; public const TYPE_VENTE_EMLC_ADHERENT = 'vente_emlc_adherent';
public const TYPE_VENTE_EMLC_PRESTATAIRE = 'vente_emlc_prestataire'; public const TYPE_VENTE_EMLC_PRESTATAIRE = 'vente_emlc_prestataire';
#[ORM\OneToOne(targetEntity: \Comptoir::class)] #[ORM\OneToOne(targetEntity: Comptoir::class)]
#[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'comptoir_id', referencedColumnName: 'id')]
protected $expediteur; protected $expediteur;
......
...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM; ...@@ -11,7 +11,7 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity] #[ORM\Entity]
class VenteEmlcComptoirAdherent extends VenteEmlc class VenteEmlcComptoirAdherent extends VenteEmlc
{ {
#[ORM\OneToOne(targetEntity: \Adherent::class)] #[ORM\OneToOne(targetEntity: Adherent::class)]
#[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')] #[ORM\JoinColumn(name: 'adherent_id', referencedColumnName: 'id')]
protected $destinataire; protected $destinataire;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment