Reuse code from PR nelmio#2151

dfridrich · Dec 9, 2023 · f6706ac · f6706ac
1 parent b7a5722
commit f6706ac
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 30 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -34,6 +34,8 @@ jobs:
             symfony-require: "5.4.*"
           - php-version: 8.1
             symfony-require: "6.3.*"
+          - php-version: 8.2
+            symfony-require: "7.0.*"
 
     steps:
       - name: "Checkout"

diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -65,7 +65,7 @@ protected function configure(): void
     /**
      * @return int|void
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $area = $input->getOption('area');
         $format = $input->getOption('format');
@@ -87,6 +87,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $docs = $this->renderOpenApi->render($format, $area, $options);
         $output->writeln($docs, OutputInterface::OUTPUT_RAW);
 
-        return 0;
+        return Command::SUCCESS;
     }
 }
diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php
@@ -24,7 +24,6 @@
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\PrivateProtectedExposure;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraintsWithValidationGroups;
 use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\VirtualTypeClassDoesNotExistsHandlerDefinedDescriber;
-use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\TwigBundle\TwigBundle;
@@ -61,7 +60,6 @@ public function registerBundles(): iterable
         $bundles = [
             new FrameworkBundle(),
             new TwigBundle(),
-            new SensioFrameworkExtraBundle(),
             new ApiPlatformBundle(),
             new NelmioApiDocBundle(),
             new TestBundle(),
@@ -157,12 +155,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             'exception_controller' => null,
         ]);
 
-        $c->loadFromExtension('sensio_framework_extra', [
-            'router' => [
-                'annotations' => false,
-            ],
-        ]);
-
         $c->loadFromExtension('api_platform', [
             'mapping' => ['paths' => [
                 !class_exists(ApiProperty::class)

diff --git a/composer.json b/composer.json
@@ -21,32 +21,32 @@
         "psr/cache": "^1.0|^2.0|^3.0",
         "psr/container": "^1.0|^2.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/console": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
         "symfony/framework-bundle": "^5.4.24|^6.0",
-        "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/http-kernel": "^5.4|^6.0",
-        "symfony/options-resolver": "^5.4|^6.0",
-        "symfony/property-info": "^5.4|^6.0",
-        "symfony/routing": "^5.4|^6.0",
+        "symfony/http-foundation": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
+        "symfony/options-resolver": "^5.4|^6.0|^7.0",
+        "symfony/property-info": "^5.4|^6.0|^7.0",
+        "symfony/routing": "^5.4|^6.0|^7.0",
         "zircote/swagger-php": "^4.2.15",
         "phpdocumentor/reflection-docblock": "^3.1|^4.0|^5.0"
     },
     "require-dev": {
-        "sensio/framework-extra-bundle": "^5.4|^6.0",
-        "symfony/asset": "^5.4|^6.0",
-        "symfony/dom-crawler": "^5.4|^6.0",
-        "symfony/browser-kit": "^5.4|^6.0",
-        "symfony/cache": "^5.4|^6.0",
-        "symfony/form": "^5.4|^6.0",
+        "sensio/framework-extra-bundle": "^5.4|^6.0|^7.0",
+        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/dom-crawler": "^5.4|^6.0|^7.0",
+        "symfony/browser-kit": "^5.4|^6.0|^7.0",
+        "symfony/cache": "^5.4|^6.0|^7.0",
+        "symfony/form": "^5.4|^6.0|^7.0",
         "symfony/phpunit-bridge": "^6.3.2",
-        "symfony/property-access": "^5.4|^6.0",
-        "symfony/serializer": "^5.4|^6.0",
-        "symfony/stopwatch": "^5.4|^6.0",
-        "symfony/templating": "^5.4|^6.0",
-        "symfony/twig-bundle": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
+        "symfony/property-access": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^5.4|^6.0|^7.0",
+        "symfony/stopwatch": "^5.4|^6.0|^7.0",
+        "symfony/templating": "^5.4|^6.0|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+        "symfony/validator": "^5.4|^6.0|^7.0",
 
         "api-platform/core": "^2.7.0|^3",
         "symfony/deprecation-contracts": "^2.1|^3",