Fix tests

parti-renaissance · Jan 30, 2025 · 9af5a17 · 9af5a17
1 parent ab78346
commit 9af5a17
Showing 16 changed files with 85 additions and 259 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -16,7 +16,6 @@
         '@PHP82Migration' => true,
         '@PHP80Migration:risky' => true,
         '@Symfony' => true,
-        '@DoctrineAnnotation' => true,
         'phpdoc_summary' => false,
         'no_unneeded_final_method' => false,
         'declare_strict_types' => false,

diff --git a/composer.json b/composer.json
@@ -41,20 +41,20 @@
         "a2lix/translation-form-bundle": "^3.2",
         "algolia/search-bundle": "^6.0",
         "api-platform/core": "^2.7",
-        "beberlei/doctrineextensions": "^1.2",
+        "beberlei/doctrineextensions": "^1.4",
         "cakephp/chronos": "^3.1",
         "cocur/slugify": "^4.0",
-        "doctrine/doctrine-bundle": "^2.8",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "~2.15.0",
+        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-migrations-bundle": "^3.4",
+        "doctrine/orm": "~2.15.4",
         "egulias/email-validator": "^4.0",
         "endroid/qr-code-bundle": "^6.0",
         "enmarche/majority-judgment": "^0.0.3",
         "exercise/htmlpurifier-bundle": "^5.0",
         "firebase/php-jwt": "^6.10",
         "friendsofsymfony/ckeditor-bundle": "^2.5",
         "fusonic/opengraph": "^3.0",
-        "gedmo/doctrine-extensions": "^3.14",
+        "gedmo/doctrine-extensions": "^3.17",
         "geocoder-php/google-maps-provider": "^4.5",
         "geoip2/geoip2": "^3.0",
         "giggsey/libphonenumber-for-php": "^8.13",
@@ -72,7 +72,7 @@
         "league/iso3166": "^4.3",
         "league/oauth2-server": "^8.2",
         "lexik/paybox-bundle": "dev-master",
-        "longitude-one/doctrine-spatial": "*",
+        "longitude-one/doctrine-spatial": "^4.0",
         "myclabs/php-enum": "^1.5",
         "nelmio/cors-bundle": "^2.2",
         "nyholm/psr7": "^1.5",
@@ -81,11 +81,10 @@
         "phpoffice/phpspreadsheet": "^3.3",
         "ramsey/uuid": "^4.1",
         "ramsey/uuid-doctrine": "^2.0",
-        "runroom-packages/sortable-behavior-bundle": "^0.17.1",
+        "runroom-packages/sortable-behavior-bundle": "^0.18.0",
         "sabre/dav": "^4.1",
         "scheb/2fa-bundle": "^6.3",
         "scheb/2fa-google-authenticator": "^6.3",
-        "sensio/framework-extra-bundle": "^6.0",
         "sentry/sentry-symfony": "^5.0",
         "sonata-project/admin-bundle": "^4.32",
         "sonata-project/doctrine-orm-admin-bundle": "^4.15",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -1,6 +1,7 @@
 framework:
     secret: '%env(SECRET)%'
     form: ~
+    annotations: false
     csrf_protection: ~
     serializer:
         name_converter: 'serializer.name_converter.camel_case_to_snake_case'

diff --git a/src/Controller/Admin/AdminCommitteeController.php b/src/Controller/Admin/AdminCommitteeController.php
@@ -22,7 +22,6 @@
 use App\Repository\CommitteeRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Cache\CacheItemPoolInterface;
-use DoctrineExtensions\Query\Mysql\Exp;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Controller/Api/AppLink/AuthenticatedAppLinkController.php b/src/Controller/Api/AppLink/AuthenticatedAppLinkController.php
@@ -3,8 +3,6 @@
 namespace App\Controller\Api\AppLink;
 
 use App\Controller\Renaissance\Adhesion\AdhesionController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use App\Entity\Adherent;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Controller/Api/Filter/GetCollectionFiltersController.php b/src/Controller/Api/Filter/GetCollectionFiltersController.php
@@ -9,10 +9,9 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[Route(path: '/v3/filters', name: 'app_collection_filters_get', methods: ['GET'])]
 #[Security("is_granted('REQUEST_SCOPE_GRANTED', ['contacts', 'messages'])")]
 class GetCollectionFiltersController extends AbstractController
 {
    public function __construct(

diff --git a/src/Controller/Api/Security/GetJWTTokenController.php b/src/Controller/Api/Security/GetJWTTokenController.php
@@ -8,10 +8,9 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[Route(path: '/v3/sso/jwt/{uuid}', name: 'api_security_get_jwt_token', methods: ['GET'])]
 #[Security("is_granted('REQUEST_SCOPE_GRANTED', 'featurebase')")]
 class GetJWTTokenController extends AbstractController
 {
    public function __invoke(Client $client, JWTTokenGenerator $tokenGenerator): Response

diff --git a/src/Controller/Api/UserController.php b/src/Controller/Api/UserController.php
@@ -23,7 +23,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;

diff --git a/src/Controller/EnMarche/CommitteeController.php b/src/Controller/EnMarche/CommitteeController.php
@@ -10,9 +10,6 @@
 use App\Mailchimp\Synchronisation\Command\AdherentChangeCommand;
 use App\Security\Http\Session\AnonymousFollowerSession;
 use App\Security\Voter\Committee\ChangeCommitteeVoter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Controller/Renaissance/MyCommittee/SaveCommitteeUpdateController.php b/src/Controller/Renaissance/MyCommittee/SaveCommitteeUpdateController.php
@@ -12,7 +12,6 @@
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted(new Expression('is_granted("ABLE_TO_CHANGE_COMMITTEE") or is_granted("IS_IMPERSONATOR")'))]

diff --git a/src/Controller/Renaissance/MyCommittee/ShowCommitteeListController.php b/src/Controller/Renaissance/MyCommittee/ShowCommitteeListController.php
@@ -8,7 +8,6 @@
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted(new Expression('is_granted("ABLE_TO_CHANGE_COMMITTEE") or is_granted("IS_IMPERSONATOR")'))]

diff --git a/src/Entity/EntityIdentityTrait.php b/src/Entity/EntityIdentityTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiProperty;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Attribute\Groups;

diff --git a/src/Entity/Event/BaseEventCategory.php b/src/Entity/Event/BaseEventCategory.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Event;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiProperty;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Symfony\Component\Serializer\Attribute\Groups;

diff --git a/src/Entity/Geo/GeoTrait.php b/src/Entity/Geo/GeoTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Geo;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiProperty;
 use App\Entity\GeoData;
 use App\Entity\GeoPointTrait;
 use Doctrine\ORM\Mapping as ORM;

diff --git a/symfony.lock b/symfony.lock
@@ -37,15 +37,6 @@
             "ref": "56eaa387b5e48ebcc7c95a893b47dfa1ad51449c"
         }
     },
-    "doctrine/annotations": {
-        "version": "2.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "1.10",
-            "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
-        }
-    },
     "doctrine/doctrine-bundle": {
         "version": "2.5",
         "recipe": {
@@ -253,18 +244,6 @@
             "config/routes/scheb_2fa.yaml"
         ]
     },
-    "sensio/framework-extra-bundle": {
-        "version": "6.2",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "5.2",
-            "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
-        },
-        "files": [
-            "config/packages/sensio_framework_extra.yaml"
-        ]
-    },
     "sentry/sentry-symfony": {
         "version": "4.3",
         "recipe": {