From 6be8318c2191e1aa31b71b7ef2b6d4cf7d00f018 Mon Sep 17 00:00:00 2001 From: ArthurJCQ Date: Sat, 9 Dec 2023 16:54:46 +0100 Subject: [PATCH] Remove sensio bundle --- composer.json | 1 - composer.lock | 80 +-------------------- config/bundles.php | 1 - config/packages/sensio_framework_extra.yaml | 3 - config/routes.yaml | 1 - src/Api/Controller/MissionController.php | 2 +- src/Api/Controller/PlayerController.php | 2 +- src/Api/Controller/RoomController.php | 2 +- symfony.lock | 12 ---- 9 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 config/packages/sensio_framework_extra.yaml diff --git a/composer.json b/composer.json index fd34bf2..5f1ca0c 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "nelmio/cors-bundle": "^2.3", "phpdocumentor/reflection-docblock": "^5.3", "phpstan/phpdoc-parser": "^1.6", - "sensio/framework-extra-bundle": "^6.2", "symfony/console": "^6.1", "symfony/dotenv": "^6.1", "symfony/expression-language": "^6.2", diff --git a/composer.lock b/composer.lock index ff208b8..e49bf75 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "59dabd679cc943671b980f3703336b04", + "content-hash": "1efb574ea9530f78a6e32aea4df10f1c", "packages": [ { "name": "doctrine/annotations", @@ -2609,84 +2609,6 @@ }, "time": "2021-07-14T16:46:02+00:00" }, - { - "name": "sensio/framework-extra-bundle", - "version": "v6.2.10", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.0|^2.0", - "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0" - }, - "conflict": { - "doctrine/doctrine-cache-bundle": "<1.3.1", - "doctrine/persistence": "<1.3" - }, - "require-dev": { - "doctrine/dbal": "^2.10|^3.0", - "doctrine/doctrine-bundle": "^1.11|^2.0", - "doctrine/orm": "^2.5", - "symfony/browser-kit": "^4.4|^5.0|^6.0", - "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", - "symfony/dom-crawler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/monolog-bridge": "^4.0|^5.0|^6.0", - "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", - "symfony/security-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", - "twig/twig": "^1.34|^2.4|^3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "6.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/" - }, - "exclude-from-classmap": [ - "/tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle provides a way to configure your controllers with annotations", - "keywords": [ - "annotations", - "controllers" - ], - "support": { - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" - }, - "abandoned": "Symfony", - "time": "2023-02-24T14:57:12+00:00" - }, { "name": "symfony/cache", "version": "v6.4.0", diff --git a/config/bundles.php b/config/bundles.php index 71d0cd5..5b68e8b 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -6,7 +6,6 @@ Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Marvin255\RandomStringGenerator\Marvin255RandomStringGeneratorBundle::class => ['all' => true], Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true], Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true], diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml deleted file mode 100644 index 1821ccc..0000000 --- a/config/packages/sensio_framework_extra.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sensio_framework_extra: - router: - annotations: false diff --git a/config/routes.yaml b/config/routes.yaml index 975beff..ffef5bc 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,4 +1,3 @@ controllers: resource: ../src/Api/Controller/ - namespace: App\Api\Controller type: attribute diff --git a/src/Api/Controller/MissionController.php b/src/Api/Controller/MissionController.php index 821a9fd..c01aaf4 100644 --- a/src/Api/Controller/MissionController.php +++ b/src/Api/Controller/MissionController.php @@ -15,12 +15,12 @@ use App\Infrastructure\Persistence\PersistenceAdapterInterface; use App\Infrastructure\Security\Voters\MissionVoter; use App\Infrastructure\SSE\SseInterface; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; #[Route('/mission', format: 'json')] diff --git a/src/Api/Controller/PlayerController.php b/src/Api/Controller/PlayerController.php index b8f5bb0..54d09d6 100644 --- a/src/Api/Controller/PlayerController.php +++ b/src/Api/Controller/PlayerController.php @@ -24,7 +24,6 @@ use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerAwareTrait; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\JsonResponse; @@ -33,6 +32,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; diff --git a/src/Api/Controller/RoomController.php b/src/Api/Controller/RoomController.php index 51feea1..9df6b15 100644 --- a/src/Api/Controller/RoomController.php +++ b/src/Api/Controller/RoomController.php @@ -16,13 +16,13 @@ use App\Infrastructure\Persistence\PersistenceAdapterInterface; use App\Infrastructure\Security\Voters\RoomVoter; use App\Infrastructure\SSE\SseInterface; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Security\Http\Attribute\IsGranted; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer; diff --git a/symfony.lock b/symfony.lock index f207df5..a784d29 100644 --- a/symfony.lock +++ b/symfony.lock @@ -127,18 +127,6 @@ "tests/bootstrap.php" ] }, - "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" - ] - }, "squizlabs/php_codesniffer": { "version": "3.6", "recipe": {