Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/common/composer-install/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ runs:

- name: Remove packages not compatible Symfony 7
if: ${{ inputs.symfony-version == '7.0.*' }}
run: composer remove --dev --no-update friendsofsymfony/rest-bundle sensio/framework-extra-bundle
run: composer remove --dev --no-update friendsofsymfony/rest-bundle
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DjordyKoert FYI https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/3.7.0 added support fro symfony 7 to friendsofsymfony/rest-bundle

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that #2257 already changed the CI config. Sorry for the noise.

shell: bash

- name: Install dependencies with Composer
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"symfony/deprecation-contracts": "^2.1|^3"
},
"require-dev": {
"sensio/framework-extra-bundle": "^5.4|^6.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",
Expand Down
13 changes: 0 additions & 13 deletions tests/Functional/TestKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraintsWithValidationGroups;
use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\NameConverter;
use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\VirtualTypeClassDoesNotExistsHandlerDefinedDescriber;
use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
use Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
Expand Down Expand Up @@ -67,10 +66,6 @@ public function registerBundles(): iterable
new TestBundle(),
];

if (class_exists(SensioFrameworkExtraBundle::class)) {
$bundles[] = new SensioFrameworkExtraBundle();
}

if (class_exists(FOSRestBundle::class)) {
$bundles[] = new FOSRestBundle();
}
Expand Down Expand Up @@ -156,14 +151,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
'exception_controller' => null,
]);

if (class_exists(SensioFrameworkExtraBundle::class)) {
$c->loadFromExtension('sensio_framework_extra', [
'router' => [
'annotations' => false,
],
]);
}

$c->loadFromExtension('api_platform', [
'mapping' => ['paths' => [
!class_exists(ApiProperty::class)
Expand Down