Merge branch '5.4' into 6.0

* 5.4: [FrameworkBundle] Only run Notifier bridge test in fullstack suites
symfony · Jul 4, 2021 · a5c66ee · a5c66ee
2 parents f786f45 + 3c48a52
commit a5c66ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1876,6 +1876,10 @@ public function testNotifierWithoutTransports()
 
     public function testIfNotifierTransportsAreKnownByFrameworkExtension()
     {
+        if (!class_exists(FullStack::class)) {
+            $this->markTestSkipped('This test can only run in fullstack test suites');
+        }
+
         $container = $this->createContainerFromFile('notifier');
 
         foreach ((new Finder())->in(\dirname(__DIR__, 4).'/Component/Notifier/Bridge')->directories()->depth(0)->exclude('Mercure') as $bridgeDirectory) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -50,41 +50,6 @@
         "symfony/messenger": "^5.4|^6.0",
         "symfony/mime": "^5.4|^6.0",
         "symfony/notifier": "^5.4|^6.0",
-        "symfony/allmysms-notifier": "^5.4|^6.0",
-        "symfony/clickatell-notifier": "^5.4|^6.0",
-        "symfony/discord-notifier": "^5.4|^6.0",
-        "symfony/esendex-notifier": "^5.4|^6.0",
-        "symfony/fake-chat-notifier": "^5.4|^6.0",
-        "symfony/fake-sms-notifier": "^5.4|^6.0",
-        "symfony/firebase-notifier": "^5.4|^6.0",
-        "symfony/free-mobile-notifier": "^5.4|^6.0",
-        "symfony/gatewayapi-notifier": "^5.4|^6.0",
-        "symfony/gitter-notifier": "^5.4|^6.0",
-        "symfony/google-chat-notifier": "^5.4|^6.0",
-        "symfony/infobip-notifier": "^5.4|^6.0",
-        "symfony/iqsms-notifier": "^5.4|^6.0",
-        "symfony/light-sms-notifier": "^5.4|^6.0",
-        "symfony/linked-in-notifier": "^5.4|^6.0",
-        "symfony/mailjet-notifier": "^5.4|^6.0",
-        "symfony/mattermost-notifier": "^5.4|^6.0",
-        "symfony/message-bird-notifier": "^5.4|^6.0",
-        "symfony/message-media-notifier": "^5.4|^6.0",
-        "symfony/microsoft-teams-notifier": "^5.4|^6.0",
-        "symfony/mobyt-notifier": "^5.4|^6.0",
-        "symfony/nexmo-notifier": "^5.4|^6.0",
-        "symfony/octopush-notifier": "^5.4|^6.0",
-        "symfony/ovh-cloud-notifier": "^5.4|^6.0",
-        "symfony/rocket-chat-notifier": "^5.4|^6.0",
-        "symfony/sendinblue-notifier": "^5.4|^6.0",
-        "symfony/sinch-notifier": "^5.4|^6.0",
-        "symfony/slack-notifier": "^5.4|^6.0",
-        "symfony/smsapi-notifier": "^5.4|^6.0",
-        "symfony/sms-biuras-notifier": "^5.4|^6.0",
-        "symfony/spot-hit-notifier": "^5.4|^6.0",
-        "symfony/telegram-notifier": "^5.4|^6.0",
-        "symfony/telnyx-notifier": "^5.4|^6.0",
-        "symfony/twilio-notifier": "^5.4|^6.0",
-        "symfony/zulip-notifier": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",
         "symfony/rate-limiter": "^5.4|^6.0",
         "symfony/security-bundle": "^5.4|^6.0",